From 53c244b22ace5857c8e381012c6ddff4e80f17b5 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Wed, 4 Jan 2023 13:10:58 +0100 Subject: [PATCH] ethereum/tests/pull/1125 --- .gitmodules | 3 ++- tests/block_test.go | 4 ++++ tests/state_test.go | 2 +- tests/testdata | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 32bdb3b6e5a..079b118fb2c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "tests"] path = tests/testdata - url = https://github.com/ethereum/tests + url = https://github.com/ipsilon/tests + branch = eip-3860-fix diff --git a/tests/block_test.go b/tests/block_test.go index c9b7fa017fc..174755fa7cd 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -38,6 +38,10 @@ func TestBlockchain(t *testing.T) { // For speedier CI-runs those are skipped. bt.skipLoad(`^GeneralStateTests/`) + // MergeToShanghaiAt5 is not supported since Shanghai is based on time rather than block number + // TODO(yperbasis): revisit + bt.skipLoad(`^TransitionTests/bcMergeToShanghai/shanghaiBeforeTransition\.json`) + // Currently it fails because SpawnStageHeaders doesn't accept any PoW blocks after PoS transition // TODO(yperbasis): make it work bt.skipLoad(`^TransitionTests/bcArrowGlacierToMerge/powToPosBlockRejection\.json`) diff --git a/tests/state_test.go b/tests/state_test.go index a8e123f3681..a8c79b2c441 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -44,7 +44,7 @@ func TestState(t *testing.T) { st := new(testMatcher) // EOF is not implemented yet - st.skipLoad(`^stEIP3540/`) + st.skipLoad(`^EIPTests/stEOF/`) // Very time consuming st.skipLoad(`^stTimeConsuming/`) diff --git a/tests/testdata b/tests/testdata index 9e058e565e6..274f667eb00 160000 --- a/tests/testdata +++ b/tests/testdata @@ -1 +1 @@ -Subproject commit 9e058e565e664ae2ba93f9a25c4beb105df07480 +Subproject commit 274f667eb0070f479d5cc5e9ce41684b56dfbb00