tests: update, enable legacy tests, remove vm tests (ethereum#23350)

* tests: update, enable legacy tests, remove vm tests * tests: minor fixes
racerole · Aug 17, 2021 · fb4007b · fb4007b
1 parent 0a68558
commit fb4007b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 301 deletions.
diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go
diff --git a/tests/init_test.go b/tests/init_test.go
@@ -34,12 +34,11 @@ import (
 )
 
 var (
-	baseDir      = filepath.Join(".", "testdata")
-	blockTestDir = filepath.Join(baseDir, "BlockchainTests")
-	stateTestDir = filepath.Join(baseDir, "GeneralStateTests")
-	//legacyStateTestDir = filepath.Join(baseDir, "LegacyTests", "Constantinople", "GeneralStateTests")
+	baseDir            = filepath.Join(".", "testdata")
+	blockTestDir       = filepath.Join(baseDir, "BlockchainTests")
+	stateTestDir       = filepath.Join(baseDir, "GeneralStateTests")
+	legacyStateTestDir = filepath.Join(baseDir, "LegacyTests", "Constantinople", "GeneralStateTests")
 	transactionTestDir = filepath.Join(baseDir, "TransactionTests")
-	vmTestDir          = filepath.Join(baseDir, "VMTests")
 	rlpTestDir         = filepath.Join(baseDir, "RLPTests")
 	difficultyTestDir  = filepath.Join(baseDir, "BasicTests")
 )

diff --git a/tests/state_test.go b/tests/state_test.go
@@ -45,8 +45,7 @@ func TestState(t *testing.T) {
 
 	// Uses 1GB RAM per tested fork
 	st.skipLoad(`^stStaticCall/static_Call1MB`)
-	// Un-skip this when https://github.com/ethereum/tests/issues/908 is closed
-	st.skipLoad(`^stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopy`)
+
 	// Broken tests:
 	// Expected failures:
 	//st.fails(`^stRevertTest/RevertPrecompiledTouch(_storage)?\.json/Byzantium/0`, "bug in test")
@@ -59,9 +58,7 @@ func TestState(t *testing.T) {
 	// For Istanbul, older tests were moved into LegacyTests
 	for _, dir := range []string{
 		stateTestDir,
-		// legacy state tests are disabled, due to them not being
-		// regenerated for the no-sender-eoa change.
-		//legacyStateTestDir,
+		legacyStateTestDir,
 	} {
 		st.walk(t, dir, func(t *testing.T, name string, test *StateTest) {
 			for _, subtest := range test.Subtests() {

diff --git a/tests/state_test_util.go b/tests/state_test_util.go
@@ -358,3 +358,7 @@ func rlpHash(x interface{}) (h common.Hash) {
 	hw.Sum(h[:0])
 	return h
 }
+
+func vmTestBlockHash(n uint64) common.Hash {
+	return common.BytesToHash(crypto.Keccak256([]byte(big.NewInt(int64(n)).String())))
+}
diff --git a/tests/testdata b/tests/testdata
diff --git a/tests/vm_test.go b/tests/vm_test.go
diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go