From a33e8299aa0ba69ca1bd0d6e9d84ea7bf4a35522 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 16 Oct 2023 15:49:09 +0200
Subject: [PATCH] build: use develop-fixtures

---
 build/checksums.txt    | 2 +-
 build/ci.go            | 2 +-
 cmd/evm/blockrunner.go | 4 ++--
 tests/block_test.go    | 4 ----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build/checksums.txt b/build/checksums.txt
index fa873aa4b1..c752fb8ccd 100644
--- a/build/checksums.txt
+++ b/build/checksums.txt
@@ -3,7 +3,7 @@
 # version:spec-tests 1.0.5
 # https://github.com/ethereum/execution-spec-tests/releases
 # https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.5/
-322085c2c2e173069d38d79034518e91bd53b29eaafd92a56f0ef753b5336aa7  fixtures.tar.gz
+d4fd06a0e5f94beb970f3c68374b38ef9de82d4be77517d326bcf739c3cbf3a2  fixtures_develop.tar.gz
 
 # version:golang 1.21.3
 # https://go.dev/dl/
diff --git a/build/ci.go b/build/ci.go
index 869ca07d11..1ff3fb5bf8 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" // TODO(MariusVanDerWijden) rename once the version becomes part of the filename
+	base := "fixtures_develop" // 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 b319828f51..42be6726b5 100644
--- a/cmd/evm/blockrunner.go
+++ b/cmd/evm/blockrunner.go
@@ -63,8 +63,8 @@ func blockTestCmd(ctx *cli.Context) error {
 	}
 	// run them in order
 	var keys []string
-	for k, _ := range tests {
-		keys = append(keys, k)
+	for key := range tests {
+		keys = append(keys, key)
 	}
 	sort.Strings(keys)
 	for _, name := range keys {
diff --git a/tests/block_test.go b/tests/block_test.go
index 371e994bb5..5764ae33e4 100644
--- a/tests/block_test.go
+++ b/tests/block_test.go
@@ -63,10 +63,6 @@ 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)
 	})