diff --git a/crates/ef-testing/src/models/case.rs b/crates/ef-testing/src/models/case.rs index a809abc6..f8835109 100644 --- a/crates/ef-testing/src/models/case.rs +++ b/crates/ef-testing/src/models/case.rs @@ -77,7 +77,7 @@ impl BlockchainTestCase { | "mulmod.json" // kakarot #695 | "divByZero.json" // kakarot #695 | "jumpi.json" // kakarot #693 - | "jump.json" // ef-tests #38 + | "jump.json" // ef-tests #38 | "jumpToPush.json" // ef-tests #61 | "signextend.json" // kakarot #677 | "mload.json" // ef-tests #31 @@ -88,6 +88,10 @@ impl BlockchainTestCase { | "suicide.json" // ef-tests #57 | "blockInfo.json" // ef-tests #67 | "envInfo.json" // ef-tests #63 + | "memCopySelf.json" // ef-tests #52 + | "bufferSrcOffset.json" // ef-tests #51 + | "buffer.json" // ef-tests #50 + | "oog.json" // ef-tests #49 ) } diff --git a/crates/ef-testing/src/utils/assert.rs b/crates/ef-testing/src/utils/assert.rs index 9a030e57..43cc5ad3 100644 --- a/crates/ef-testing/src/utils/assert.rs +++ b/crates/ef-testing/src/utils/assert.rs @@ -31,10 +31,7 @@ pub fn assert_contract_post_state( if actual_nonce != account_nonce { return Err(RunnerError::Other(format!( "{} expected nonce {} for {:#20x}, got {}", - test_name, - account_nonce.to_string(), - evm_address, - actual_nonce.to_string() + test_name, account_nonce, evm_address, actual_nonce ))); } @@ -70,10 +67,7 @@ pub fn assert_contract_post_storage( if actual_state_value != value { return Err(RunnerError::Other(format!( "{} expected storage value {} for {:#20x}, got {}", - test_name, - value.to_string(), - evm_address, - actual_state_value.to_string() + test_name, value, evm_address, actual_state_value ))); } } diff --git a/crates/ef-testing/tests/tests.rs b/crates/ef-testing/tests/tests.rs index 010d94bf..e11e2832 100644 --- a/crates/ef-testing/tests/tests.rs +++ b/crates/ef-testing/tests/tests.rs @@ -60,4 +60,5 @@ mod blockchain_tests { use super::*; blockchain_tests!(vm_tests, VMTests); + blockchain_tests!(memory_tests, stMemoryTest); }