Skip to content

Commit 566826f

Browse files
mpauluccimpaulucci
authored
ci(l1): migrate from eest to eels for hive tests. (#5160)
**Motivation** Get back results for `Consume Engine` and `Consume RLP` tests **Description** - Changes references from eest to eels - Uses `forks/osaka` branch
1 parent 8e3b945 commit 566826f

File tree

4 files changed

+56
-58
lines changed

4 files changed

+56
-58
lines changed

‎.github/workflows/daily_hive_report.yaml‎

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -47,48 +47,46 @@ jobs:
4747
simulation: ethereum/sync,
4848
limit: "",
4949
}
50-
# Migratation to EELS currently ongoing, see https://github.com/ethereum/execution-spec-tests/pull/2308#issuecomment-3421843487
51-
# When migration is complete, adapt these tests and reenable
52-
# - {
53-
# name: "Consume Engine tests (Rest)",
54-
# file_name: consume-engine-rest,
55-
# simulation: ethereum/eest/consume-engine,
56-
# limit: ".*fork_Paris.*|.*fork_Shanghai.*|.*fork_Cancun.*",
57-
# }
58-
# - {
59-
# name: "Consume Engine tests (Prague)",
60-
# file_name: consume-engine-prague,
61-
# simulation: ethereum/eest/consume-engine,
62-
# limit: ".*fork_Prague.*",
63-
# }
64-
# - {
65-
# name: "Consume Engine tests (Osaka)",
66-
# file_name: consume-engine-osaka,
67-
# simulation: ethereum/eest/consume-engine,
68-
# limit: ".*fork_Osaka.*",
69-
# }
70-
# - {
71-
# name: "Consume RLP tests (Rest)",
72-
# file_name: consume-rlp-rest,
73-
# simulation: ethereum/eest/consume-rlp,
74-
# limit: ".*fork_Paris.*|.*fork_Shanghai.*|.*fork_Cancun.*",
75-
# }
76-
# - {
77-
# name: "Consume RLP tests (Prague)",
78-
# file_name: consume-rlp-prague,
79-
# simulation: ethereum/eest/consume-rlp,
80-
# limit: ".*fork_Prague.*",
81-
# }
82-
# - {
83-
# name: "Consume RLP tests (Osaka)",
84-
# file_name: consume-rlp-osaka,
85-
# simulation: ethereum/eest/consume-rlp,
86-
# limit: ".*fork_Osaka.*",
87-
# }
50+
- {
51+
name: "Consume Engine tests (Rest)",
52+
file_name: consume-engine-rest,
53+
simulation: ethereum/eels/consume-engine,
54+
limit: ".*fork_Paris.*|.*fork_Shanghai.*|.*fork_Cancun.*",
55+
}
56+
- {
57+
name: "Consume Engine tests (Prague)",
58+
file_name: consume-engine-prague,
59+
simulation: ethereum/eels/consume-engine,
60+
limit: ".*fork_Prague.*",
61+
}
62+
- {
63+
name: "Consume Engine tests (Osaka)",
64+
file_name: consume-engine-osaka,
65+
simulation: ethereum/eels/consume-engine,
66+
limit: ".*fork_Osaka.*",
67+
}
68+
- {
69+
name: "Consume RLP tests (Rest)",
70+
file_name: consume-rlp-rest,
71+
simulation: ethereum/eels/consume-rlp,
72+
limit: ".*fork_Paris.*|.*fork_Shanghai.*|.*fork_Cancun.*",
73+
}
74+
- {
75+
name: "Consume RLP tests (Prague)",
76+
file_name: consume-rlp-prague,
77+
simulation: ethereum/eels/consume-rlp,
78+
limit: ".*fork_Prague.*",
79+
}
80+
- {
81+
name: "Consume RLP tests (Osaka)",
82+
file_name: consume-rlp-osaka,
83+
simulation: ethereum/eels/consume-rlp,
84+
limit: ".*fork_Osaka.*",
85+
}
8886
- {
8987
name: "Execute Blobs tests",
9088
file_name: execute-blobs,
91-
simulation: ethereum/eest/execute-blobs,
89+
simulation: ethereum/eels/execute-blobs,
9290
limit: "",
9391
}
9492

@@ -112,9 +110,9 @@ jobs:
112110
SIM_LIMIT: ${{ matrix.test.limit || '' }}
113111
run: |
114112
FLAGS='--sim.parallelism 4 --sim.loglevel 1'
115-
if [[ "$SIMULATION" == "ethereum/eest/consume-engine" || "$SIMULATION" == "ethereum/eest/consume-rlp" ]]; then
113+
if [[ "$SIMULATION" == "ethereum/eels/consume-engine" || "$SIMULATION" == "ethereum/eels/consume-rlp" ]]; then
116114
FLAGS+=" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/v5.3.0/fixtures_develop.tar.gz"
117-
FLAGS+=" --sim.buildarg branch=main"
115+
FLAGS+=" --sim.buildarg branch=forks/osaka"
118116
FLAGS+=" --client.checktimelimit=180s"
119117
fi
120118
if [[ -n "$SIM_LIMIT" ]]; then

‎Makefile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: build lint test clean run-image build-image clean-vectors \
22
setup-hive test-pattern-default run-hive run-hive-debug clean-hive-logs \
3-
load-test-fibonacci load-test-io run-hive-eest-blobs
3+
load-test-fibonacci load-test-io run-hive-eels-blobs
44

55
help: ## 📚 Show help for each of the Makefile recipes
66
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -126,19 +126,19 @@ run-hive-all: build-image setup-hive ## 🧪 Run all Hive testing suites
126126
run-hive-debug: build-image setup-hive ## 🐞 Run Hive testing suite in debug mode
127127
cd hive && ./hive --sim $(SIMULATION) --client-file $(HIVE_CLIENT_FILE) --client ethrex --sim.loglevel 4 --sim.limit "$(TEST_PATTERN)" --sim.parallelism "$(SIM_PARALLELISM)" --docker.output
128128

129-
# EEST Hive
130-
TEST_PATTERN_EEST ?= .*fork_Paris.*|.*fork_Shanghai.*|.*fork_Cancun.*|.*fork_Prague.*
131-
run-hive-eest: build-image setup-hive ## 🧪 Generic command for running Hive EEST tests. Specify EEST_SIM
132-
- cd hive && ./hive --client-file $(HIVE_CLIENT_FILE) --client ethrex --sim $(EEST_SIM) --sim.limit "$(TEST_PATTERN_EEST)" --sim.parallelism $(SIM_PARALLELISM) --sim.loglevel $(SIM_LOG_LEVEL) --sim.buildarg fixtures=$(shell cat tooling/ef_tests/blockchain/.fixtures_url)
129+
# EELS Hive
130+
TEST_PATTERN_EELS ?= .*fork_Paris.*|.*fork_Shanghai.*|.*fork_Cancun.*|.*fork_Prague.*
131+
run-hive-eels: build-image setup-hive ## 🧪 Generic command for running Hive EELS tests. Specify EELS_SIM
132+
- cd hive && ./hive --client-file $(HIVE_CLIENT_FILE) --client ethrex --sim $(EELS_SIM) --sim.limit "$(TEST_PATTERN_EELS)" --sim.parallelism $(SIM_PARALLELISM) --sim.loglevel $(SIM_LOG_LEVEL) --sim.buildarg fixtures=$(shell cat tooling/ef_tests/blockchain/.fixtures_url)
133133

134-
run-hive-eest-engine: ## Run hive EEST Engine tests
135-
$(MAKE) run-hive-eest EEST_SIM=ethereum/eest/consume-engine
134+
run-hive-eels-engine: ## Run hive EELS Engine tests
135+
$(MAKE) run-hive-eels EELS_SIM=ethereum/eels/consume-engine
136136

137-
run-hive-eest-rlp: ## Run hive EEST RLP tests
138-
$(MAKE) run-hive-eest EEST_SIM=ethereum/eest/consume-rlp
137+
run-hive-eels-rlp: ## Run hive EELS RLP tests
138+
$(MAKE) run-hive-eels EELS_SIM=ethereum/eels/consume-rlp
139139

140-
run-hive-eest-blobs: ## Run hive EEST Blobs tests
141-
$(MAKE) run-hive-eest EEST_SIM=ethereum/eest/execute-blobs
140+
run-hive-eels-blobs: ## Run hive EELS Blobs tests
141+
$(MAKE) run-hive-eels EELS_SIM=ethereum/eels/execute-blobs
142142

143143
clean-hive-logs: ## 🧹 Clean Hive logs
144144
rm -rf ./hive/workspace/logs

‎crates/vm/levm/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ There is a large amount of docs in comments inside the code. For more informatio
1818

1919
## Testing
2020

21-
We run `EEST`, `ethereum/tests` and `legacyTests` both in their [state](../../../tooling/ef_tests/state/README.md) and [blockchain](../../../tooling/ef_tests/blockchain/README.md) form. More info on each README.
21+
We run `EELS`, `ethereum/tests` and `legacyTests` both in their [state](../../../tooling/ef_tests/state/README.md) and [blockchain](../../../tooling/ef_tests/blockchain/README.md) form. More info on each README.
2222

2323
For running state tests from the current directory use:
2424
```

‎tooling/hive_report/src/main.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ impl HiveResult {
4545
"snap" => ("P2P", "Snap capability"),
4646
"rpc-compat" => ("RPC", "RPC API Compatibility"),
4747
"sync" => ("Sync", "Node Syncing"),
48-
"eest/consume-rlp" => ("EVM - Consume RLP", fork.as_str()),
49-
"eest/consume-engine" => ("EVM - Consume Engine", fork.as_str()),
50-
"eest/execute-blobs" => ("EVM - Execute Blobs", "Execute Blobs"),
48+
"eels/consume-rlp" => ("EVM - Consume RLP", fork.as_str()),
49+
"eels/consume-engine" => ("EVM - Consume Engine", fork.as_str()),
50+
"eels/execute-blobs" => ("EVM - Execute Blobs", "Execute Blobs"),
5151
other => {
5252
eprintln!("Warn: Unknown suite: {other}. Skipping");
5353
("", "")
@@ -160,8 +160,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
160160

161161
// Both of these simulators have only 1 suite where we can find tests for 3 different forks.
162162
// To get the total tests and the passed tests a filtes is done each time so we do not clone the test cases each time.
163-
if json_data.name.as_str() == "eest/consume-rlp"
164-
|| json_data.name.as_str() == "eest/consume-engine"
163+
if json_data.name.as_str() == "eels/consume-rlp"
164+
|| json_data.name.as_str() == "eels/consume-engine"
165165
{
166166
let result_paris = create_fork_result(&json_data, "Paris", "fork_Paris");
167167
// Shanghai

0 commit comments

Comments
 (0)