Skip to content

Commit f6332f6

Browse files
authored
Added execution-spec-tests v4.3.0 (Vltava). Added fixes for testscases (#88)
1 parent fcaac7f commit f6332f6

2 files changed

Lines changed: 17 additions & 4 deletions

File tree

.github/workflows/rust.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ env:
99
CARGO_TERM_COLOR: always
1010
ETHTESTS_VERSION: v17.0
1111
ETHEREUM_SPEC_TESTS_URL: https://github.com/ethereum/execution-spec-tests/releases/download/pectra-devnet-6%40v1.0.0/fixtures_pectra-devnet-6.tar.gz
12+
ETHEREUM_SPEC_TESTS2_URL: https://github.com/ethereum/execution-spec-tests/releases/download/v4.3.0/fixtures_stable.tar.gz
1213

1314
jobs:
1415
unit-tests:
@@ -60,12 +61,19 @@ jobs:
6061
mkdir ethereum-spec-tests
6162
tar -xzf ethereum-spec-tests.tar.gz -C ethereum-spec-tests
6263
64+
- name: Download Ethereum spec tests 2 fixtures
65+
run: |
66+
curl -L ${{ env.ETHEREUM_SPEC_TESTS2_URL }} -o ethereum-spec-tests2.tar.gz
67+
mkdir ethereum-spec-tests2
68+
tar -xzf ethereum-spec-tests2.tar.gz -C ethereum-spec-tests2
69+
6370
- name: Run Ethereum state tests
6471
run: |
6572
cargo run -r -p evm-jsontests -F enable-slow-tests -- state -f \
6673
ethtests/GeneralStateTests/ \
6774
ethtests/LegacyTests/Cancun/GeneralStateTests/ \
68-
ethereum-spec-tests/fixtures/state_tests/
75+
ethereum-spec-tests/fixtures/state_tests/ \
76+
ethereum-spec-tests2/fixtures/state_tests/
6977
7078
- name: Run Ethereum vm tests
7179
run: |
@@ -111,11 +119,15 @@ jobs:
111119
export PATH="$PATH:$HOME/.cargo/bin"
112120
curl -L ${{ env.ETHEREUM_SPEC_TESTS_URL }} -o ethereum-spec-tests.tar.gz
113121
mkdir ethereum-spec-tests
114-
tar -xzf ethereum-spec-tests.tar.gz -C ethereum-spec-tests
122+
tar -xzf ethereum-spec-tests.tar.gz -C ethereum-spec-tests
123+
curl -L ${{ env.ETHEREUM_SPEC_TESTS2_URL }} -o ethereum-spec-tests2.tar.gz
124+
mkdir ethereum-spec-tests2
125+
tar -xzf ethereum-spec-tests2.tar.gz -C ethereum-spec-tests2
115126
cargo run -r -p evm-jsontests -F enable-slow-tests -- state -f \
116127
ethtests/GeneralStateTests/ \
117128
ethtests/LegacyTests/Cancun/GeneralStateTests/ \
118-
ethereum-spec-tests/fixtures/state_tests/
129+
ethereum-spec-tests/fixtures/state_tests/ \
130+
ethereum-spec-tests2/fixtures/state_tests/
119131
120132
cargo run -r -p evm-jsontests -F enable-slow-tests -- vm -f \
121133
ethtests/LegacyTests/Constantinople/VMTests/vmArithmeticTest \

evm-tests/jsontests/src/state.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,8 @@ fn check_validate_exit_reason(
10961096
}
10971097
InvalidTxReason::TooManyBlobs => {
10981098
let check_result = exception == "TR_BLOBLIST_OVERSIZE"
1099-
|| exception == "TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED";
1099+
|| exception == "TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED"
1100+
|| exception == "TransactionException.TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED|TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED";
11001101
assert!(
11011102
check_result,
11021103
"unexpected exception {exception:?} for TooManyBlobs for test: [{spec:?}] {name}"

0 commit comments

Comments
 (0)