diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 5fff6721b85b..4a9992c7e0fc 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -81,7 +81,7 @@ jobs: uses: actions/checkout@v4 with: repository: ethereum/tests - ref: 1c23e3c27ac53b794de0844d2d5e19cd2495b9d8 + ref: 59781f1c6cce3d6c161751ab3512d79fa75d5597 path: testing/ef-tests/ethereum-tests submodules: recursive fetch-depth: 1 diff --git a/testing/ef-tests/src/cases/blockchain_test.rs b/testing/ef-tests/src/cases/blockchain_test.rs index a3c168cb54de..85e7eb9dc911 100644 --- a/testing/ef-tests/src/cases/blockchain_test.rs +++ b/testing/ef-tests/src/cases/blockchain_test.rs @@ -206,6 +206,18 @@ pub fn should_skip(path: &Path) -> bool { | "loopMul.json" | "CALLBlake2f_MaxRounds.json" | "shiftCombinations.json" + + // Skipped by revm as well: + | "RevertInCreateInInit_Paris.json" + | "RevertInCreateInInit.json" + | "dynamicAccountOverwriteEmpty.json" + | "dynamicAccountOverwriteEmpty_Paris.json" + | "RevertInCreateInInitCreate2Paris.json" + | "create2collisionStorage.json" + | "RevertInCreateInInitCreate2.json" + | "create2collisionStorageParis.json" + | "InitCollision.json" + | "InitCollisionParis.json" ) // Ignore outdated EOF tests that haven't been updated for Cancun yet. || path_contains(path_str, &["EIPTests", "stEOF"]) diff --git a/testing/ef-tests/tests/tests.rs b/testing/ef-tests/tests/tests.rs index 3aeb917a24c2..6b626d82c186 100644 --- a/testing/ef-tests/tests/tests.rs +++ b/testing/ef-tests/tests/tests.rs @@ -78,4 +78,14 @@ mod general_state_tests { general_state_test!(vm_tests, VMTests); } -// TODO: Add ValidBlocks and InvalidBlocks tests +macro_rules! blockchain_test { + ($test_name:ident, $dir:ident) => { + #[test] + fn $test_name() { + BlockchainTests::new(format!("{}", stringify!($dir))).run(); + } + }; +} + +blockchain_test!(valid_blocks, ValidBlocks); +// blockchain_test!(invalid_blocks, InvalidBlocks);