Skip generating Copier files for failing tests

ethereum · May 21, 2024 · dcd2850 · dcd2850
1 parent 5081ad5
commit dcd2850
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/test/unittests/state_transition.cpp b/test/unittests/state_transition.cpp
@@ -147,7 +147,7 @@ void state_transition::TearDown()
         EXPECT_TRUE(expect.post.contains(addr)) << "unexpected account " << addr;
     }
 
-    if (!export_file_path.empty())
+    if (!export_file_path.empty() && !skip_generate_copier)
         export_state_test(res, state);
 }
 

diff --git a/test/unittests/state_transition.hpp b/test/unittests/state_transition.hpp
@@ -66,6 +66,7 @@ class state_transition : public ExportableFixture
         std::string_view trace;
     };
 
+    bool skip_generate_copier = false;
 
     evmc_revision rev = EVMC_SHANGHAI;
     uint64_t block_reward = 0;

diff --git a/test/unittests/state_transition_block_test.cpp b/test/unittests/state_transition_block_test.cpp
@@ -15,6 +15,9 @@ TEST_F(state_transition, block_apply_withdrawal)
     block.withdrawals = {{0, 0, withdrawal_address, 3}};
     tx.to = To;
     expect.post[withdrawal_address].balance = intx::uint256{3} * 1'000'000'000;
+
+    skip_generate_copier = true; // Skip ethereum test generation because the withdrawals are not available in
+                                 // retesteth.
 }
 
 TEST_F(state_transition, known_block_hash)
@@ -30,6 +33,9 @@ TEST_F(state_transition, known_block_hash)
         0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421_bytes32;
     expect.post[To].storage[0x01_bytes32] =
         0x0000000000000000000000000000000000000000000000000000000000000111_bytes32;
+
+    skip_generate_copier = true; // Skip generating test because the block hash is not available in
+                                 // retesteth.
 }
 
 TEST_F(state_transition, known_block_hash_fake)
@@ -41,6 +47,9 @@ TEST_F(state_transition, known_block_hash_fake)
         0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d_bytes32;
     expect.post[To].storage[0x01_bytes32] =
         0xc89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc6_bytes32;
+
+    skip_generate_copier = true; // Skip generating test because evmone-t8n does not return the
+                                 // fake block hash
 }
 
 TEST_F(state_transition, block_apply_ommers_reward)
@@ -59,6 +68,8 @@ TEST_F(state_transition, block_apply_ommers_reward)
 
     // Two ommers +1/32 * block_reward for each. +21000 cost of the tx goes to coinbase.
     expect.post[Coinbase].balance = 21000 + intx::uint256{block_reward} + block_reward / 16;
+
+    skip_generate_copier = true; // Skip ethereum test generation because the ommers are not available in ethereum state tests.
 }
 
 TEST_F(state_transition, eip7516_blob_base_fee)
@@ -70,4 +81,7 @@ TEST_F(state_transition, eip7516_blob_base_fee)
     pre.insert(*tx.to, {.code = sstore(0x4a, OP_BLOBBASEFEE)});
 
     expect.post[To].storage[0x4a_bytes32] = 0xabcd_bytes32;
+
+    skip_generate_copier = true; // Skip ethereum test generation because the blob base fee is not available in
+                                 // retesteth.
 }
diff --git a/test/unittests/state_transition_call_test.cpp b/test/unittests/state_transition_call_test.cpp
@@ -53,4 +53,6 @@ TEST_F(state_transition, delegatecall_static_legacy)
     // SSTORE failed.
     expect.post[callee1].storage[0x01_bytes32] = 0xdd_bytes32;
     expect.post[callee2].storage[0x01_bytes32] = 0xdd_bytes32;
+
+    skip_generate_copier = true;
 }
diff --git a/test/unittests/state_transition_eip663_test.cpp b/test/unittests/state_transition_eip663_test.cpp
@@ -19,6 +19,7 @@ TEST_F(state_transition, dupn)
         });
     expect.post[*tx.to].storage[0x00_bytes32] = 0x01_bytes32;
     expect.post[*tx.to].storage[0x01_bytes32] = 0x02_bytes32;
+    skip_generate_copier = true;
 }
 
 TEST_F(state_transition, swapn)
@@ -32,6 +33,8 @@ TEST_F(state_transition, swapn)
         });
     expect.post[*tx.to].storage[0x00_bytes32] = 0x01_bytes32;
     expect.post[*tx.to].storage[0x01_bytes32] = 0x02_bytes32;
+
+    skip_generate_copier = true;
 }
 
 TEST_F(state_transition, exchange)
@@ -46,4 +49,6 @@ TEST_F(state_transition, exchange)
     expect.post[*tx.to].storage[0x00_bytes32] = 0x03_bytes32;
     expect.post[*tx.to].storage[0x01_bytes32] = 0x01_bytes32;
     expect.post[*tx.to].storage[0x02_bytes32] = 0x02_bytes32;
+
+    skip_generate_copier = true;
 }