Skip to content

Commit 4632b7b

Browse files
authored
tests: update execution-spec-tests to 1.0.5 (#28337)
Updates execution-spec-tests to 1.0.5: https://github.com/ethereum/execution-spec-tests/releases/tag/v1.0.5, switching to develop which contains Cancun tests (which are also enabled in this change).
1 parent 509a64f commit 4632b7b

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

build/checksums.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# This file contains sha256 checksums of optional build dependencies.
22

3-
# version:spec-tests 1.0.2
3+
# version:spec-tests 1.0.5
44
# https://github.com/ethereum/execution-spec-tests/releases
5-
# https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.2/
6-
24bac679f3a2d8240d8e08e7f6a70b70c2dabf673317d924cf1d1887b9fe1f81 fixtures.tar.gz
5+
# https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.5/
6+
d4fd06a0e5f94beb970f3c68374b38ef9de82d4be77517d326bcf739c3cbf3a2 fixtures_develop.tar.gz
77

88
# version:golang 1.21.3
99
# https://go.dev/dl/

build/ci.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ func downloadSpecTestFixtures(csdb *build.ChecksumDB, cachedir string) string {
334334
log.Fatal(err)
335335
}
336336
ext := ".tar.gz"
337-
base := "fixtures" // TODO(MariusVanDerWijden) rename once the version becomes part of the filename
337+
base := "fixtures_develop" // TODO(MariusVanDerWijden) rename once the version becomes part of the filename
338338
url := fmt.Sprintf("https://github.com/ethereum/execution-spec-tests/releases/download/v%s/%s%s", executionSpecTestsVersion, base, ext)
339339
archivePath := filepath.Join(cachedir, base+ext)
340340
if err := csdb.DownloadFile(url, archivePath); err != nil {

cmd/evm/blockrunner.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"errors"
2222
"fmt"
2323
"os"
24+
"sort"
2425

2526
"github.com/ethereum/go-ethereum/core/rawdb"
2627
"github.com/ethereum/go-ethereum/core/vm"
@@ -60,9 +61,16 @@ func blockTestCmd(ctx *cli.Context) error {
6061
if err = json.Unmarshal(src, &tests); err != nil {
6162
return err
6263
}
63-
for i, test := range tests {
64+
// run them in order
65+
var keys []string
66+
for key := range tests {
67+
keys = append(keys, key)
68+
}
69+
sort.Strings(keys)
70+
for _, name := range keys {
71+
test := tests[name]
6472
if err := test.Run(false, rawdb.HashScheme, tracer); err != nil {
65-
return fmt.Errorf("test %v: %w", i, err)
73+
return fmt.Errorf("test %v: %w", name, err)
6674
}
6775
}
6876
return nil

tests/block_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ func TestExecutionSpec(t *testing.T) {
6363
}
6464
bt := new(testMatcher)
6565

66-
// cancun tests are not complete yet
67-
bt.skipLoad(`^cancun/`)
68-
bt.skipLoad(`-fork=Cancun`)
69-
7066
bt.walk(t, executionSpecDir, func(t *testing.T, name string, test *BlockTest) {
7167
execBlockTest(t, bt, test)
7268
})
@@ -75,14 +71,18 @@ func TestExecutionSpec(t *testing.T) {
7571
func execBlockTest(t *testing.T, bt *testMatcher, test *BlockTest) {
7672
if err := bt.checkFailure(t, test.Run(false, rawdb.HashScheme, nil)); err != nil {
7773
t.Errorf("test in hash mode without snapshotter failed: %v", err)
74+
return
7875
}
7976
if err := bt.checkFailure(t, test.Run(true, rawdb.HashScheme, nil)); err != nil {
8077
t.Errorf("test in hash mode with snapshotter failed: %v", err)
78+
return
8179
}
8280
if err := bt.checkFailure(t, test.Run(false, rawdb.PathScheme, nil)); err != nil {
8381
t.Errorf("test in path mode without snapshotter failed: %v", err)
82+
return
8483
}
8584
if err := bt.checkFailure(t, test.Run(true, rawdb.PathScheme, nil)); err != nil {
8685
t.Errorf("test in path mode with snapshotter failed: %v", err)
86+
return
8787
}
8888
}

0 commit comments

Comments
 (0)