all bitwise tests now passing, 624 tests in total checked

max-wickham · Mar 30, 2024 · 1336710 · 1336710
1 parent a481743
commit 1336710
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/evm_logic/evm/call.rs b/src/evm_logic/evm/call.rs
@@ -248,6 +248,7 @@ pub fn make_call(
             }
         }},
         ExecutionResult::Success(success) => {
+            println!("Merging context");
             runtime.merge_context();
             match success {
             ExecutionSuccess::Return(result) => {

diff --git a/src/evm_logic/evm/decoder.rs b/src/evm_logic/evm/decoder.rs
@@ -33,7 +33,7 @@ pub fn decode_instruction(
 
     // Provides debug data around each branches block
     if evm.program_counter > evm.program.len() - 1 {
-        return ExecutionResult::Error(ExecutionError::Halted);
+        return ExecutionResult::Success(ExecutionSuccess::Stop);
     }
 
     let opcode: u8 = evm.program[evm.program_counter];

diff --git a/test_gen/src/lib.rs b/test_gen/src/lib.rs
@@ -154,7 +154,7 @@ pub fn generate_official_tests_from_folder(input: TokenStream) -> TokenStream {
 
         for i in 0..num_tests {
             let test_name = Ident::new(
-                format!("run_test_{}_{}",test_name.replace("+", "pos").replace("-", "min"), i).as_str(),
+                format!("run_test_{}_{}_{}",folder_name_lit.value().replace("/", "_").replace(".", ""), test_name.replace("+", "pos").replace("-", "min"), i).as_str(),
                 proc_macro2::Span::call_site(),
             );
             tests.push(quote! {

diff --git a/tests/official_tests/official_tests.rs b/tests/official_tests/official_tests.rs
@@ -158,3 +158,6 @@ generate_official_tests_from_folder!(
 generate_official_tests_from_file!(
     "./tests/official_tests/tests/GeneralStateTests/stMemoryTest/buffer.json"
 );
+generate_official_tests_from_folder!(
+    "./tests/official_tests/tests/GeneralStateTests/VMTests/vmBitwiseLogicOperation"
+);