test: Ensure exported state tests have all fields (#993)

Co-authored-by: Paweł Bylica <pawel@ethereum.org>
ethereum · Sep 11, 2024 · 35b7475 · 35b7475
1 parent ad04d4e
commit 35b7475
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/test/statetest/statetest_export.cpp b/test/statetest/statetest_export.cpp
@@ -8,7 +8,7 @@ namespace evmone::test
 {
 json::json to_json(const TestState& state)
 {
-    json::json j;
+    json::json j = json::json::object();
     for (const auto& [addr, acc] : state)
     {
         auto& j_acc = j[hex0x(addr)];

diff --git a/test/statetest/statetest_loader.cpp b/test/statetest/statetest_loader.cpp
@@ -273,6 +273,7 @@ template <>
 TestState from_json<TestState>(const json::json& j)
 {
     TestState o;
+    assert(j.is_object());
     for (const auto& [j_addr, j_acc] : j.items())
     {
         auto& acc =

diff --git a/test/unittests/state_transition.cpp b/test/unittests/state_transition.cpp
@@ -180,6 +180,7 @@ void state_transition::export_state_test(
     jenv["currentGasLimit"] = hex0x(block.gas_limit);
     jenv["currentCoinbase"] = hex0x(block.coinbase);
     jenv["currentBaseFee"] = hex0x(block.base_fee);
+    jenv["currentRandom"] = hex0x(block.prev_randao);
 
     jt["pre"] = to_json(pre);
 
@@ -204,6 +205,10 @@ void state_transition::export_state_test(
     jtx["gasLimit"][0] = hex0x(tx.gas_limit);
     jtx["value"][0] = hex0x(tx.value);
 
+    // Force `accessLists` output even if empty.
+    if (tx.type >= Transaction::Type::access_list)
+        jtx["accessLists"][0] = json::json::array();
+
     if (!tx.access_list.empty())
     {
         auto& ja = jtx["accessLists"][0];