ethereum/tests/pull/1125

erigontech · Jan 4, 2023 · 53c244b · 53c244b
1 parent 6a8ff43
commit 53c244b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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