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.

Sign up for GitHub

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

Run all tests #1065

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Run all tests #1065

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5c433c
port EIP-7610 implementation from forks/prague
gurukamath Dec 20, 2024
6b28b92
run all tests for pre-cancun forks
gurukamath Dec 20, 2024
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
2 changes: 1 addition & 1 deletion tests/berlin/test_evm_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
)

ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/GeneralStateTests/"
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/GeneralStateTests/"
FORK_NAME = "Berlin"

run_evm_tools_test = partial(
Expand Down
2 changes: 1 addition & 1 deletion tests/berlin/test_state_transition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]

# Run state tests
test_dir = f"{ETHEREUM_TESTS_PATH}/BlockchainTests/"
test_dir = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/BlockchainTests/"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just confirming this should be "Cancun" in the berlin fork.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Frontier to Constantinople are under /LegacyTests/Constantinople and then Istanbul to Shanghai are under /LegacyTests/Cancun


# Every test below takes more than 60s to run and
# hence they've been marked as slow
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"ethereum_tests": {
"url": "https://github.com/ethereum/tests.git",
"commit_hash": "52ddcbc",
"commit_hash": "a0e8482",
"fixture_path": "tests/fixtures/ethereum_tests",
},
}
2 changes: 1 addition & 1 deletion tests/istanbul/test_evm_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
)

ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/GeneralStateTests/"
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/GeneralStateTests/"
FORK_NAME = "Istanbul"

run_evm_tools_test = partial(
Expand Down
2 changes: 1 addition & 1 deletion tests/istanbul/test_state_transition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]

# Run state tests
test_dir = f"{ETHEREUM_TESTS_PATH}/BlockchainTests/"
test_dir = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/BlockchainTests/"

# Every test below takes more than 60s to run and
# hence they've been marked as slow
Expand Down
2 changes: 1 addition & 1 deletion tests/london/test_evm_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
)

ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/GeneralStateTests/"
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/GeneralStateTests/"
FORK_NAME = "London"

run_evm_tools_test = partial(
Expand Down
2 changes: 1 addition & 1 deletion tests/london/test_state_transition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]

# Run state tests
test_dir = f"{ETHEREUM_TESTS_PATH}/BlockchainTests/"
test_dir = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/BlockchainTests/"

# Every test below takes more than 60s to run and
# hence they've been marked as slow
Expand Down
4 changes: 2 additions & 2 deletions tests/paris/test_evm_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
)

ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/GeneralStateTests/"
FORK_NAME = "Merge"
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/GeneralStateTests/"
FORK_NAME = "Paris"

run_evm_tools_test = partial(
load_evm_tools_test,
Expand Down
12 changes: 6 additions & 6 deletions tests/paris/test_state_transition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
run_blockchain_st_test,
)

fetch_paris_tests = partial(fetch_state_test_files, network="Merge")
fetch_paris_tests = partial(fetch_state_test_files, network="Paris")

FIXTURES_LOADER = Load("Merge", "paris")
FIXTURES_LOADER = Load("Paris", "paris")

run_paris_blockchain_st_tests = partial(
run_blockchain_st_test, load=FIXTURES_LOADER
Expand All @@ -27,7 +27,7 @@
ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]

# Run state tests
test_dir = f"{ETHEREUM_TESTS_PATH}/BlockchainTests/"
test_dir = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/BlockchainTests/"

# Every test below takes more than 60s to run and
# hence they've been marked as slow
Expand All @@ -37,8 +37,8 @@
"stTimeConsuming/static_Call50000_sha256.json",
"vmPerformance/loopExp.json",
"vmPerformance/loopMul.json",
"QuadraticComplexitySolidity_CallDataCopy_d0g1v0_Merge",
"CALLBlake2f_d9g0v0_Merge",
"QuadraticComplexitySolidity_CallDataCopy_d0g1v0_Paris",
"CALLBlake2f_d9g0v0_Paris",
"CALLCODEBlake2f_d9g0v0",
# GeneralStateTests
"stRandom/randomStatetest177.json",
Expand All @@ -61,7 +61,7 @@
# InvalidBlockTest
"bcForgedTest",
"bcMultiChainTest",
"GasLimitHigherThan2p63m1_Merge",
"GasLimitHigherThan2p63m1_Paris",
)

# All tests that recursively create a large number of frames (50000)
Expand Down
2 changes: 1 addition & 1 deletion tests/shanghai/test_evm_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
)

ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/GeneralStateTests/"
TEST_DIR = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/GeneralStateTests/"
FORK_NAME = "Shanghai"

run_evm_tools_test = partial(
Expand Down
2 changes: 1 addition & 1 deletion tests/shanghai/test_state_transition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@


# Run state tests
test_dir = f"{ETHEREUM_TESTS_PATH}/BlockchainTests/"
test_dir = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Cancun/BlockchainTests/"

SLOW_TESTS = (
# GeneralStateTests
Expand Down
Loading