Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: Recognize all official fork/revision names #830

Merged
merged 1 commit into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ jobs:
branch: evmc-v11.0.0-alpha.1
commit: evmc-v11.0.0-alpha.1
- download_execution_tests:
# TODO: Fix failures and upgrade to v13.1
rev: v13
- run:
name: "Silkworm-driven blockchain tests (Advanced)"
Expand Down Expand Up @@ -500,7 +501,7 @@ jobs:
bin/evmone-statetest ~/spec-tests/fixtures/state_tests

- download_execution_tests:
rev: v13
rev: v13.1
- run:
name: "State tests"
working_directory: ~/build
Expand Down
6 changes: 2 additions & 4 deletions test/utils/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,16 @@ evmc_revision to_rev(std::string_view s)
return EVMC_BYZANTIUM;
if (s == "Constantinople")
return EVMC_CONSTANTINOPLE;
if (s == "ConstantinopleFix")
if (s == "Petersburg" || s == "ConstantinopleFix")
return EVMC_PETERSBURG;
if (s == "Istanbul")
return EVMC_ISTANBUL;
if (s == "Berlin")
return EVMC_BERLIN;
if (s == "London" || s == "ArrowGlacier")
return EVMC_LONDON;
if (s == "Merge")
if (s == "Paris" || s == "Merge")
return EVMC_PARIS;
if (s == "Merge+3855") // PUSH0
return EVMC_SHANGHAI;
if (s == "Shanghai")
return EVMC_SHANGHAI;
if (s == "Cancun")
Expand Down