Skip state tests with out of range values in json

ethereum · Dec 3, 2024 · 96a40ec · 96a40ec
1 parent f6198c0
commit 96a40ec
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 12 deletions.
diff --git a/test/blockchaintest/blockchaintest.cpp b/test/blockchaintest/blockchaintest.cpp
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "blockchaintest.hpp"
+#include "../statetest/statetest.hpp"
 #include <CLI/CLI.hpp>
 #include <evmone/evmone.h>
 #include <evmone/version.h>

diff --git a/test/blockchaintest/blockchaintest.hpp b/test/blockchaintest/blockchaintest.hpp
@@ -14,11 +14,6 @@
 
 namespace evmone::test
 {
-struct UnsupportedTestFeature : std::runtime_error
-{
-    using runtime_error::runtime_error;
-};
-
 // https://ethereum.org/en/developers/docs/blocks/
 struct BlockHeader
 {

diff --git a/test/statetest/statetest.cpp b/test/statetest/statetest.cpp
@@ -27,9 +27,16 @@ class StateTest : public testing::Test
     void TestBody() final
     {
         std::ifstream f{m_json_test_file};
-        const auto tests = evmone::test::load_state_tests(f);
-        for (const auto& test : tests)
-            evmone::test::run_state_test(test, m_vm, m_trace);
+        try
+        {
+            const auto tests = evmone::test::load_state_tests(f);
+            for (const auto& test : tests)
+                evmone::test::run_state_test(test, m_vm, m_trace);
+        }
+        catch (const evmone::test::UnsupportedTestFeature& ex)
+        {
+            GTEST_SKIP() << ex.what();
+        }
     }
 };
 

diff --git a/test/statetest/statetest.hpp b/test/statetest/statetest.hpp
@@ -13,6 +13,10 @@ namespace json = nlohmann;
 
 namespace evmone::test
 {
+struct UnsupportedTestFeature : std::runtime_error
+{
+    using runtime_error::runtime_error;
+};
 
 struct TestMultiTransaction : state::Transaction
 {

diff --git a/test/statetest/statetest_loader.cpp b/test/statetest/statetest_loader.cpp
@@ -128,13 +128,34 @@ state::AuthorizationList from_json<state::AuthorizationList>(const json::json& j
     for (const auto& a : j)
     {
         state::Authorization authorization{};
-        authorization.chain_id = from_json<uint64_t>(a.at("chainId"));
+        try
+        {
+            authorization.chain_id = from_json<uint64_t>(a.at("chainId"));
+        }
+        catch (const std::out_of_range&)
+        {
+            throw UnsupportedTestFeature("tests with out of range chainId are not supported");
+        }
         authorization.addr = from_json<address>(a.at("address"));
-        authorization.nonce = from_json<uint64_t>(a.at("nonce"));
+        try
+        {
+            authorization.nonce = from_json<uint64_t>(a.at("nonce"));
+        }
+        catch (const std::out_of_range&)
+        {
+            throw UnsupportedTestFeature("tests with out of range nonce are not supported");
+        }
         if (a.contains("signer"))
             authorization.signer = from_json<address>(a.at("signer"));
-        authorization.r = from_json<intx::uint256>(a.at("r"));
-        authorization.s = from_json<intx::uint256>(a.at("s"));
+        try
+        {
+            authorization.r = from_json<intx::uint256>(a.at("r"));
+            authorization.s = from_json<intx::uint256>(a.at("s"));
+        }
+        catch (const std::out_of_range&)
+        {
+            throw UnsupportedTestFeature("tests with out of range r and s are not supported");
+        }
         authorization.v = from_json<intx::uint256>(a.at("v"));
         o.emplace_back(authorization);
     }