Use unordered_set for accessed code sections, update unit test

Author: hugo-dc

lib/evmone/eof.cpp

@@ -13,7 +13,7 @@
 #include <limits>
 #include <numeric>
 #include <ostream>
-#include <set>
+#include <unordered_set>
 #include <span>
 #include <stack>
 #include <variant>
@@ -215,7 +215,7 @@ std::variant<std::vector<EOFCodeType>, EOFValidationError> validate_types(
 }
 
 EOFValidationError validate_instructions(evmc_revision rev, const EOF1Header& header,
-    size_t code_idx, bytes_view container, std::set<uint16_t>& accessed_code_sections) noexcept
+    size_t code_idx, bytes_view container, std::unordered_set<uint16_t>& accessed_code_sections) noexcept
 {
     const bytes_view code{header.get_code(container, code_idx)};
     assert(!code.empty());  // guaranteed by EOF headers validation
@@ -519,7 +519,7 @@ std::variant<EOF1Header, EOFValidationError> validate_eof1(
         offset += code_size;
     }
 
-    std::set<uint16_t> accessed_code_sections = {0};
+    std::unordered_set<uint16_t> accessed_code_sections = {0};
     EOF1Header header{container[2], code_sizes, code_offsets, data_size, types};
 
     for (size_t code_idx = 0; code_idx < header.code_sizes.size(); ++code_idx)

test/unittests/eof_validation_test.cpp

@@ -8,7 +8,6 @@
 #include <test/utils/bytecode.hpp>
 #include <test/utils/utils.hpp>
 
-using namespace std;
 using namespace evmone;
 
 namespace
@@ -313,18 +312,28 @@ TEST(eof_validation, EOF1_invalid_section_0_type)
 TEST(eof_validation, EOF1_too_many_code_sections)
 {
     std::string code_sections_1024;
-    for (int i = 0; i < 1024; ++i)
+    std::string code_sections_1025;
+    for (int i = 0; i < 1025; ++i)
         if (i < 1023)
+        {
             code_sections_1024 += "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
-        else
+            code_sections_1025 += "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
+        }
+        else if (i == 1023)
+        {
             code_sections_1024 += "5B5B00";
+            code_sections_1025 += "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
+        }
+        else
+            code_sections_1025 += "5B5B00";
+
 
     const auto valid = "EF0001 011000" + bytecode{"020400"} + 0x400 * bytecode{"0003"} +
                        "040000 00" + 0x400 * bytecode{"00800000"} + code_sections_1024;
     EXPECT_EQ(validate_eof(valid), EOFValidationError::success);
 
     const auto invalid = "EF0001 011002" + bytecode{"020401"} + 0x401 * bytecode{"0001"} +
-                         "040000 00" + 0x401 * bytecode{"00800000"} + 0x401 * bytecode{"FE"};
+                         "040000 00" + 0x401 * bytecode{"00800000"} + code_sections_1025;
     EXPECT_EQ(validate_eof(invalid), EOFValidationError::too_many_code_sections);
 }