From eb03fc486769396a8d04a156228717bff2dbd25a Mon Sep 17 00:00:00 2001
From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com>
Date: Fri, 10 Nov 2023 12:27:53 -0600
Subject: [PATCH] Revert "tests: update execution-spec-tests to 1.0.5 (#28337)"

This reverts commit 077f13f68ad468bc9a71c3aad24511082f4765c5.
---
 build/checksums.txt    |  6 +++---
 build/ci.go            |  2 +-
 cmd/evm/blockrunner.go | 12 ++----------
 tests/block_test.go    |  8 ++++----
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/build/checksums.txt b/build/checksums.txt
index c752fb8ccd..a15cf09b46 100644
--- a/build/checksums.txt
+++ b/build/checksums.txt
@@ -1,9 +1,9 @@
 # This file contains sha256 checksums of optional build dependencies.
 
-# version:spec-tests 1.0.5
+# version:spec-tests 1.0.2
 # https://github.com/ethereum/execution-spec-tests/releases
-# https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.5/
-d4fd06a0e5f94beb970f3c68374b38ef9de82d4be77517d326bcf739c3cbf3a2  fixtures_develop.tar.gz
+# https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.2/
+24bac679f3a2d8240d8e08e7f6a70b70c2dabf673317d924cf1d1887b9fe1f81  fixtures.tar.gz
 
 # version:golang 1.21.3
 # https://go.dev/dl/
diff --git a/build/ci.go b/build/ci.go
index 1ff3fb5bf8..869ca07d11 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -334,7 +334,7 @@ func downloadSpecTestFixtures(csdb *build.ChecksumDB, cachedir string) string {
 		log.Fatal(err)
 	}
 	ext := ".tar.gz"
-	base := "fixtures_develop" // TODO(MariusVanDerWijden) rename once the version becomes part of the filename
+	base := "fixtures" // TODO(MariusVanDerWijden) rename once the version becomes part of the filename
 	url := fmt.Sprintf("https://github.com/ethereum/execution-spec-tests/releases/download/v%s/%s%s", executionSpecTestsVersion, base, ext)
 	archivePath := filepath.Join(cachedir, base+ext)
 	if err := csdb.DownloadFile(url, archivePath); err != nil {
diff --git a/cmd/evm/blockrunner.go b/cmd/evm/blockrunner.go
index 42be6726b5..6612680dc4 100644
--- a/cmd/evm/blockrunner.go
+++ b/cmd/evm/blockrunner.go
@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"sort"
 
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/vm"
@@ -61,16 +60,9 @@ func blockTestCmd(ctx *cli.Context) error {
 	if err = json.Unmarshal(src, &tests); err != nil {
 		return err
 	}
-	// run them in order
-	var keys []string
-	for key := range tests {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	for _, name := range keys {
-		test := tests[name]
+	for i, test := range tests {
 		if err := test.Run(false, rawdb.HashScheme, tracer); err != nil {
-			return fmt.Errorf("test %v: %w", name, err)
+			return fmt.Errorf("test %v: %w", i, err)
 		}
 	}
 	return nil
diff --git a/tests/block_test.go b/tests/block_test.go
index 5764ae33e4..645b4b702d 100644
--- a/tests/block_test.go
+++ b/tests/block_test.go
@@ -63,6 +63,10 @@ func TestExecutionSpec(t *testing.T) {
 	}
 	bt := new(testMatcher)
 
+	// cancun tests are not complete yet
+	bt.skipLoad(`^cancun/`)
+	bt.skipLoad(`-fork=Cancun`)
+
 	bt.walk(t, executionSpecDir, func(t *testing.T, name string, test *BlockTest) {
 		execBlockTest(t, bt, test)
 	})
@@ -71,18 +75,14 @@ func TestExecutionSpec(t *testing.T) {
 func execBlockTest(t *testing.T, bt *testMatcher, test *BlockTest) {
 	if err := bt.checkFailure(t, test.Run(false, rawdb.HashScheme, nil)); err != nil {
 		t.Errorf("test in hash mode without snapshotter failed: %v", err)
-		return
 	}
 	if err := bt.checkFailure(t, test.Run(true, rawdb.HashScheme, nil)); err != nil {
 		t.Errorf("test in hash mode with snapshotter failed: %v", err)
-		return
 	}
 	if err := bt.checkFailure(t, test.Run(false, rawdb.PathScheme, nil)); err != nil {
 		t.Errorf("test in path mode without snapshotter failed: %v", err)
-		return
 	}
 	if err := bt.checkFailure(t, test.Run(true, rawdb.PathScheme, nil)); err != nil {
 		t.Errorf("test in path mode with snapshotter failed: %v", err)
-		return
 	}
 }