Skip to content

Commit 1ca59e0

Browse files
committed
test: Recognize all official fork/revision names
This adds "Paris" and "Petersburg" to the names recognized by the testing utils.
1 parent dc641bf commit 1ca59e0

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

circle.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ jobs:
463463
branch: evmc-v11.0.0-alpha.1
464464
commit: evmc-v11.0.0-alpha.1
465465
- download_execution_tests:
466-
rev: v13
466+
rev: v13.1
467467
- run:
468468
name: "Silkworm-driven blockchain tests (Advanced)"
469469
working_directory: ~/build
@@ -500,7 +500,7 @@ jobs:
500500
bin/evmone-statetest ~/spec-tests/fixtures/state_tests
501501
502502
- download_execution_tests:
503-
rev: v13
503+
rev: v13.1
504504
- run:
505505
name: "State tests"
506506
working_directory: ~/build

test/utils/utils.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,16 @@ evmc_revision to_rev(std::string_view s)
2121
return EVMC_BYZANTIUM;
2222
if (s == "Constantinople")
2323
return EVMC_CONSTANTINOPLE;
24-
if (s == "ConstantinopleFix")
24+
if (s == "Petersburg" || s == "ConstantinopleFix")
2525
return EVMC_PETERSBURG;
2626
if (s == "Istanbul")
2727
return EVMC_ISTANBUL;
2828
if (s == "Berlin")
2929
return EVMC_BERLIN;
3030
if (s == "London" || s == "ArrowGlacier")
3131
return EVMC_LONDON;
32-
if (s == "Merge")
32+
if (s == "Paris" || s == "Merge")
3333
return EVMC_PARIS;
34-
if (s == "Merge+3855") // PUSH0
35-
return EVMC_SHANGHAI;
3634
if (s == "Shanghai")
3735
return EVMC_SHANGHAI;
3836
if (s == "Cancun")

0 commit comments

Comments
 (0)