Skip to content

Commit 733343d

Browse files
rakitarakita
authored
chore: bump eest tests v5.3.0 (#3081)
1 parent 07d1143 commit 733343d

File tree

3 files changed

+26
-47
lines changed

3 files changed

+26
-47
lines changed

‎bins/revme/src/cmd/blockchaintest.rs‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -985,8 +985,19 @@ fn fork_to_spec_id(fork: ForkSpec) -> SpecId {
985985

986986
/// Check if a test should be skipped based on its filename
987987
fn skip_test(path: &Path) -> bool {
988-
let name = path.file_name().unwrap().to_str().unwrap();
988+
let path_str = path.to_str().unwrap_or_default();
989+
// blobs excess gas calculation is not supported or osaka BPO configuration
990+
if path_str.contains("paris/eip7610_create_collision")
991+
|| path_str.contains("cancun/eip4844_blobs")
992+
|| path_str.contains("prague/eip7251_consolidations")
993+
|| path_str.contains("prague/eip7685_general_purpose_el_requests")
994+
|| path_str.contains("prague/eip7002_el_triggerable_withdrawals")
995+
|| path_str.contains("osaka/eip7918_blob_reserve_price")
996+
{
997+
return true;
998+
}
989999

1000+
let name = path.file_name().unwrap().to_str().unwrap();
9901001
// Add any problematic tests here that should be skipped
9911002
matches!(
9921003
name,
@@ -1021,36 +1032,8 @@ fn skip_test(path: &Path) -> bool {
10211032
| "correct_increasing_blob_gas_costs.json"
10221033
| "correct_decreasing_blob_gas_costs.json"
10231034

1024-
// test-fixtures/main/develop/blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_negative_excess_blob_gas.json
1025-
| "invalid_negative_excess_blob_gas.json"
1026-
// test-fixtures/main/develop/blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_change.json
1027-
| "invalid_excess_blob_gas_change.json"
1028-
// test-fixtures/main/develop/blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_static_excess_blob_gas.json
1029-
| "invalid_static_excess_blob_gas.json"
1030-
// test-fixtures/main/develop/blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_target_blobs_increase_from_zero.json
1031-
| "invalid_excess_blob_gas_target_blobs_increase_from_zero.json"
1032-
// test-fixtures/main/develop/blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_zero_excess_blob_gas_in_header.json
1033-
| "invalid_zero_excess_blob_gas_in_header.json"
1034-
// test-fixtures/main/develop/blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_excess_blob_gas_above_target_change.json
1035-
| "invalid_excess_blob_gas_above_target_change.json"
1036-
// test-fixtures/main/develop/blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_non_multiple_excess_blob_gas.json
1037-
| "invalid_non_multiple_excess_blob_gas.json"
1038-
// test-fixtures/main/develop/blockchain_tests/cancun/eip4844_blobs/excess_blob_gas/invalid_static_excess_blob_gas_from_zero_on_blobs_above_target.json
1039-
| "invalid_static_excess_blob_gas_from_zero_on_blobs_above_target.json"
1040-
// test-fixtures/main/develop/blockchain_tests/prague/eip7251_consolidations/modified_consolidation_contract/system_contract_errors.json
1041-
| "system_contract_errors.json"
1042-
// test-fixtures/main/develop/blockchain_tests/prague/eip7251_consolidations/consolidations/consolidation_requests.json
1043-
| "consolidation_requests.json"
10441035
// test-fixtures/main/develop/blockchain_tests/prague/eip2935_historical_block_hashes_from_state/block_hashes/block_hashes_history.json
10451036
| "block_hashes_history.json"
1046-
// test-fixtures/main/develop/blockchain_tests/prague/eip7685_general_purpose_el_requests/multi_type_requests/valid_multi_type_request_from_same_tx.json
1047-
| "valid_multi_type_request_from_same_tx.json"
1048-
// test-fixtures/main/develop/blockchain_tests/prague/eip7685_general_purpose_el_requests/multi_type_requests/valid_multi_type_requests.json
1049-
| "valid_multi_type_requests.json"
1050-
// test-fixtures/main/develop/blockchain_tests/prague/eip7002_el_triggerable_withdrawals/modified_withdrawal_contract/system_contract_errors.json
1051-
//| "system_contract_errors.json"
1052-
// test-fixtures/main/develop/blockchain_tests/prague/eip7002_el_triggerable_withdrawals/withdrawal_requests/withdrawal_requests.json
1053-
| "withdrawal_requests.json"
10541037
)
10551038
}
10561039

‎bins/revme/src/cmd/statetest/runner.rs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,14 @@ pub fn find_all_json_tests(path: &Path) -> Vec<PathBuf> {
8686
/// Check if a test should be skipped based on its filename
8787
/// Some tests are known to be problematic or take too long
8888
fn skip_test(path: &Path) -> bool {
89-
let Some(name) = path.file_name().and_then(|s| s.to_str()) else {
90-
// Non-UTF file names or missing file name: do not skip by default.
91-
return false;
92-
};
89+
let path_str = path.to_str().unwrap_or_default();
90+
91+
// Skip tets that have storage for newly created account.
92+
if path_str.contains("paris/eip7610_create_collision") {
93+
return true;
94+
}
95+
96+
let name = path.file_name().unwrap().to_str().unwrap_or_default();
9397

9498
matches!(
9599
name,
@@ -107,6 +111,7 @@ fn skip_test(path: &Path) -> bool {
107111
| "create2collisionStorageParis.json"
108112
| "InitCollision.json"
109113
| "InitCollisionParis.json"
114+
| "test_init_collision_create_opcode.json"
110115

111116
// Malformed value.
112117
| "ValueOverflow.json"

‎scripts/run-tests.sh‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ set -eo pipefail
44
# Usage: ./scripts/run-tests.sh --help
55

66
# Version for the execution spec tests
7-
MAIN_VERSION="v4.5.0"
8-
DEVNET_VERSION="fusaka-devnet-5@v1.1.0"
7+
MAIN_VERSION="v5.3.0"
8+
DEVNET_VERSION="fusaka-devnet-5@v2.1.0"
99

1010
### Directories ###
1111
FIXTURES_DIR="test-fixtures"
1212

1313
MAIN_DIR="$FIXTURES_DIR/main"
1414
MAIN_STABLE_DIR="$MAIN_DIR/stable"
1515
MAIN_DEVELOP_DIR="$MAIN_DIR/develop"
16-
MAIN_STATIC_DIR="$MAIN_DIR/static"
1716

1817
DEVNET_DIR="$FIXTURES_DIR/devnet"
1918
DEVNET_DEVELOP_DIR="$DEVNET_DIR/develop"
@@ -25,7 +24,6 @@ FIXTURES_URL="https://github.com/ethereum/execution-spec-tests/releases/download
2524

2625
MAIN_STABLE_TAR="fixtures_stable.tar.gz"
2726
MAIN_DEVELOP_TAR="fixtures_develop.tar.gz"
28-
MAIN_STATIC_TAR="fixtures_static.tar.gz"
2927

3028
DEVNET_TAR="fixtures_fusaka-devnet-5.tar.gz"
3129

@@ -74,7 +72,7 @@ clean() {
7472

7573
# Check if all required fixture directories exist
7674
check_fixtures() {
77-
if [ -d "$MAIN_STABLE_DIR" ] && [ -d "$MAIN_DEVELOP_DIR" ] && [ -d "$MAIN_STATIC_DIR" ] && [ -d "$DEVNET_DIR" ] && [ -d "$LEGACY_DIR" ]; then
75+
if [ -d "$MAIN_STABLE_DIR" ] && [ -d "$MAIN_DEVELOP_DIR" ] && [ -d "$DEVNET_DIR" ] && [ -d "$LEGACY_DIR" ]; then
7876
return 0
7977
else
8078
return 1
@@ -102,15 +100,14 @@ download_and_extract() {
102100
# Download all fixtures
103101
download_fixtures() {
104102
echo "Creating fixtures directory structure..."
105-
mkdir -p "$MAIN_STABLE_DIR" "$MAIN_DEVELOP_DIR" "$MAIN_STATIC_DIR" "$DEVNET_DIR" "$LEGACY_DIR"
103+
mkdir -p "$MAIN_STABLE_DIR" "$MAIN_DEVELOP_DIR" "$DEVNET_DIR" "$LEGACY_DIR"
106104

107105
download_and_extract "$MAIN_STABLE_DIR" "$MAIN_STABLE_TAR" "main stable" "$MAIN_VERSION"
108106
download_and_extract "$MAIN_DEVELOP_DIR" "$MAIN_DEVELOP_TAR" "main develop" "$MAIN_VERSION"
109-
download_and_extract "$MAIN_STATIC_DIR" "$MAIN_STATIC_TAR" "main static" "$MAIN_VERSION"
110107
download_and_extract "$DEVNET_DIR" "$DEVNET_TAR" "devnet" "$DEVNET_VERSION"
111108

112109
echo "Cleaning up tar files..."
113-
rm "${FIXTURES_DIR}/${MAIN_STABLE_TAR}" "${FIXTURES_DIR}/${MAIN_DEVELOP_TAR}" "${FIXTURES_DIR}/${MAIN_STATIC_TAR}" "${FIXTURES_DIR}/${DEVNET_TAR}"
110+
rm "${FIXTURES_DIR}/${MAIN_STABLE_TAR}" "${FIXTURES_DIR}/${MAIN_DEVELOP_TAR}" "${FIXTURES_DIR}/${DEVNET_TAR}"
114111

115112
# Clone legacytests repository
116113
echo "Cloning legacytests repository..."
@@ -147,9 +144,6 @@ run_tests() {
147144

148145
echo "Running main develop statetests..."
149146
$RUST_RUNNER run $CARGO_OPTS -p revme -- statetest "$MAIN_DEVELOP_DIR/state_tests"
150-
151-
echo "Running main static statetests..."
152-
$RUST_RUNNER run $CARGO_OPTS -p revme -- statetest "$MAIN_STATIC_DIR/state_tests"
153147

154148
echo "Running devnet statetests..."
155149
$RUST_RUNNER run $CARGO_OPTS -p revme -- statetest "$DEVNET_DIR/state_tests"
@@ -160,9 +154,6 @@ run_tests() {
160154
echo "Running main develop blockchain tests..."
161155
$RUST_RUNNER run $CARGO_OPTS -p revme -- btest "$MAIN_DEVELOP_DIR/blockchain_tests"
162156

163-
echo "Running main static blockchain tests..."
164-
$RUST_RUNNER run $CARGO_OPTS -p revme -- btest "$MAIN_STATIC_DIR/blockchain_tests"
165-
166157
echo "Running main stable blockchain tests..."
167158
$RUST_RUNNER run $CARGO_OPTS -p revme -- btest "$MAIN_STABLE_DIR/blockchain_tests"
168159
}

0 commit comments

Comments
 (0)