chore(levm): improve organization of new levm test runner (#3958)

JereSalo · web-flow · commit 6aac0d0ac0d0 · 2025-08-19T18:09:41.000Z
**Motivation** - this runner was inside the same folder as the other runner and also the internal structure wasn't the most organized **Description** - move files - improve makefile - improve files structure <img width="290" height="416" alt="image" src="https://github.com/user-attachments/assets/7d4f6583-2af1-4b3f-b77b-dcf355dee897" />
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,7 @@
 members = [
   "cmd/ef_tests/blockchain",
   "cmd/ef_tests/state",
+  "cmd/ef_tests/state_v2",
   "cmd/ethrex",
   "cmd/ethrex_replay",
   "crates/blockchain",
diff --git a/cmd/ef_tests/state/Cargo.toml b/cmd/ef_tests/state/Cargo.toml
@@ -49,8 +49,3 @@ blst = ["ethrex-vm/blst"]
 [[test]]
 name = "all"
 harness = false
-
-[[test]]
-name = "new_runner"
-harness = false
-path = "./runner_v2/run.rs"
diff --git a/cmd/ef_tests/state/Makefile b/cmd/ef_tests/state/Makefile
@@ -159,7 +159,3 @@ samply-benchmarks: ## ⚡️ Run benchmarks and create samply profiling file
 	$(call run_samply,ERC20Approval,REPETITIONS_SLOW,BENCH_APPROVAL_ITERATIONS)
 	$(call run_samply,ERC20Transfer,REPETITIONS_SLOW,BENCH_TRANSFER_ITERATIONS)
 	$(call run_samply,ERC20Mint,REPETITIONS_SLOW,BENCH_MINT_ITERATIONS)
-
-## New EF state tests runner
-run-new-runner:
-	cargo test --package ef_tests-state --test new_runner --release -- $(flags)
diff --git a/cmd/ef_tests/state/lib.rs b/cmd/ef_tests/state/lib.rs
@@ -2,6 +2,5 @@ mod deserialize;
 pub mod parser;
 mod report;
 pub mod runner;
-pub mod runner_v2;
 pub mod types;
 mod utils;
diff --git a/cmd/ef_tests/state_v2/.gitignore b/cmd/ef_tests/state_v2/.gitignore
@@ -0,0 +1,4 @@
+./success_report.txt
+./failure_report.txt
+# vectors is not yet part of this folder but will be soon.
+./vectors
diff --git a/cmd/ef_tests/state_v2/Cargo.toml b/cmd/ef_tests/state_v2/Cargo.toml
@@ -0,0 +1,32 @@
+[package]
+name = "ef_tests-statev2"
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+ethrex-blockchain.workspace = true
+ethrex-common.workspace = true
+ethrex-storage.workspace = true
+ethrex-rlp.workspace = true
+ethrex-vm.workspace = true
+ethrex-levm.workspace = true
+
+serde.workspace = true
+serde_json.workspace = true
+bytes.workspace = true
+hex.workspace = true
+keccak-hash.workspace = true
+thiserror.workspace = true
+clap.workspace = true
+clap_complete.workspace = true
+tokio = { workspace = true, features = ["full"] }
+colored = "2.1.0"
+alloy-rlp = "0.3.12"
+
+[dev-dependencies]
+hex = "0.4.3"
+
+[features]
+default = ["c-kzg", "blst"]
+c-kzg = ["ethrex-vm/c-kzg", "ethrex-levm/c-kzg", "ethrex-common/c-kzg"]
+blst = ["ethrex-vm/blst"]
diff --git a/cmd/ef_tests/state_v2/Makefile b/cmd/ef_tests/state_v2/Makefile
@@ -0,0 +1,8 @@
+.PHONY: help run-tests
+
+help: ## 📚 Show help for each of the Makefile recipes
+	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+run-tests: ## 🧪 Run all tests with optional flags. Usage: make run-tests flags="--flag1 --flag2"
+	cargo test --package ef_tests-statev2 --test all --release -- $(flags)
+
diff --git a/cmd/ef_tests/state_v2/README.md b/cmd/ef_tests/state_v2/README.md
@@ -27,7 +27,7 @@ make run-new-runner
 
 This will parse and execute everything in the `./vectors` directory by default.
 
-> You can also run `cargo test --package ef_tests-state --test new_runner --release`
+> You can also run `cargo run --package ef_tests-statev2 --release`
 
 ## Execution options
 In case you do not want to parse and execute everything in the `vectors/` directory there are three flags that can be used to specify files to be run:
@@ -64,9 +64,9 @@ make run-new-runner flags="--skip-files chainId.json,transStorageReset.json"
 
 ## Reports
 For tests that succeded, a report can be found at:
-`cmd/ef_tests/state/runner_v2/success_report.txt`
+`cmd/ef_tests/state_v2/success_report.txt`
 
 For tests that failed, a report can be found at:
-`cmd/ef_tests/state/runner_v2/failure_report.txt`
+`cmd/ef_tests/state_v2/failure_report.txt`
 
 If none of the tests failed the report will not get generated at all. In case any of the tests did fail, the report will show the differences with the expected post state for each failing test case.
diff --git a/cmd/ef_tests/state_v2/src/lib.rs b/cmd/ef_tests/state_v2/src/lib.rs
@@ -0,0 +1 @@
+pub mod modules;
diff --git a/cmd/ef_tests/state_v2/src/main.rs b/cmd/ef_tests/state_v2/src/main.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use ef_tests_state::runner_v2::{
+use ef_tests_statev2::modules::{
     error::RunnerError,
     parser::{RunnerOptions, parse_tests},
     runner::run_tests,
@@ -17,8 +17,8 @@ pub async fn main() -> Result<(), RunnerError> {
     run_tests(tests).await?;
     println!(
         "\nTests finished running.
-    Find successful tests (if any) report at: './runner_v2/success_report.txt'.
-    Find failing    tests (if any) report at: './runner_v2/failure_report.txt'.
+    Find successful tests (if any) report at: './success_report.txt'.
+    Find failing    tests (if any) report at: './failure_report.txt'.
     "
     );
     Ok(())
diff --git a/cmd/ef_tests/state_v2/src/modules/deserialize.rs b/cmd/ef_tests/state_v2/src/modules/deserialize.rs
@@ -1,4 +1,4 @@
-use crate::runner_v2::types::{
+use crate::modules::types::{
     AccessListItem, AuthorizationListTuple, RawPostValue, TransactionExpectedException,
 };
 
diff --git a/cmd/ef_tests/state_v2/src/modules/error.rs b/cmd/ef_tests/state_v2/src/modules/error.rs
diff --git a/cmd/ef_tests/state_v2/src/modules/mod.rs b/cmd/ef_tests/state_v2/src/modules/mod.rs
diff --git a/cmd/ef_tests/state_v2/src/modules/parser.rs b/cmd/ef_tests/state_v2/src/modules/parser.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use crate::runner_v2::{
+use crate::modules::{
     error::RunnerError,
     types::{Test, Tests},
 };
@@ -11,7 +11,8 @@ use clap::Parser;
 #[derive(Parser, Debug)]
 pub struct RunnerOptions {
     /// For running tests in a specific file (could be either a directory or a .json)
-    #[arg(short, long, value_name = "PATH", default_value = "./vectors")]
+    //TODO: Change default path to ./vectors when the other EFTests are replaced by this runner
+    #[arg(short, long, value_name = "PATH", default_value = "../state/vectors")]
     pub path: PathBuf,
     /// For running tests in specific .json files. If this is not empty, "path" flag will be ignored.
     #[arg(short, long, value_name = "JSON_FILES", value_delimiter = ',')]
@@ -21,18 +22,19 @@ pub struct RunnerOptions {
     pub skip_files: Vec<PathBuf>,
 }
 
+//TODO: Use this constant, improve it.
 const IGNORED_TESTS: [&str; 12] = [
     "static_Call50000_sha256.json", // Skip because it takes longer to run than some tests, but not a huge deal.
     "CALLBlake2f_MaxRounds.json",   // Skip because it takes extremely long to run, but passes.
     "ValueOverflow.json",           // Skip because it tries to deserialize number > U256::MAX
     "ValueOverflowParis.json",      // Skip because it tries to deserialize number > U256::MAX
     "loopMul.json",                 // Skip because it takes too long to run
-    "dynamicAccountOverwriteEmpty_Paris.json", // Skip because it fails on REVM
-    "RevertInCreateInInitCreate2Paris.json", // Skip because it fails on REVM. See https://github.com/lambdaclass/ethrex/issues/1555
-    "RevertInCreateInInit_Paris.json", // Skip because it fails on REVM. See https://github.com/lambdaclass/ethrex/issues/1555
-    "create2collisionStorageParis.json", // Skip because it fails on REVM
-    "InitCollisionParis.json",         // Skip because it fails on REVM
-    "InitCollision.json",              // Skip because it fails on REVM
+    "dynamicAccountOverwriteEmpty_Paris.json",
+    "RevertInCreateInInitCreate2Paris.json",
+    "RevertInCreateInInit_Paris.json",
+    "create2collisionStorageParis.json",
+    "InitCollisionParis.json",
+    "InitCollision.json",
     "contract_create.json", // Skip for now as it requires special transaction type handling
 ];
 
diff --git a/cmd/ef_tests/state_v2/src/modules/report.rs b/cmd/ef_tests/state_v2/src/modules/report.rs
@@ -1,6 +1,6 @@
 use std::{fmt, fs::OpenOptions, io::Write, path::PathBuf};
 
-use crate::runner_v2::{error::RunnerError, result_check::PostCheckResult, types::Test};
+use crate::modules::{error::RunnerError, result_check::PostCheckResult, types::Test};
 
 pub fn add_test_to_report(test_result: (&Test, Vec<PostCheckResult>)) -> Result<(), RunnerError> {
     let (test, failed_test_cases) = test_result;
@@ -12,7 +12,7 @@ pub fn add_test_to_report(test_result: (&Test, Vec<PostCheckResult>)) -> Result<
     Ok(())
 }
 pub fn write_passing_test_to_report(test: &Test) {
-    let successful_report_path = PathBuf::from("./runner_v2/success_report.txt");
+    let successful_report_path = PathBuf::from("./success_report.txt");
     let mut report = OpenOptions::new()
         .append(true)
         .create(true)
@@ -22,7 +22,7 @@ pub fn write_passing_test_to_report(test: &Test) {
     report.write_all(content.as_bytes()).unwrap()
 }
 pub fn write_failing_test_to_report(test: &Test, failing_test_cases: Vec<PostCheckResult>) {
-    let failing_report_path = PathBuf::from("./runner_v2/failure_report.txt");
+    let failing_report_path = PathBuf::from("./failure_report.txt");
     let mut report = OpenOptions::new()
         .append(true)
         .create(true)
diff --git a/cmd/ef_tests/state_v2/src/modules/result_check.rs b/cmd/ef_tests/state_v2/src/modules/result_check.rs
@@ -15,7 +15,7 @@ use ethrex_storage::Store;
 use ethrex_vm::backends;
 use keccak_hash::{H256, keccak};
 
-use crate::runner_v2::{
+use crate::modules::{
     error::RunnerError,
     types::{AccountState, TestCase, TransactionExpectedException},
 };
diff --git a/cmd/ef_tests/state_v2/src/modules/runner.rs b/cmd/ef_tests/state_v2/src/modules/runner.rs
@@ -11,7 +11,7 @@ use ethrex_common::{
 };
 use ethrex_levm::{EVMConfig, Environment, tracing::LevmCallTracer, vm::VM, vm::VMType};
 
-use crate::runner_v2::{
+use crate::modules::{
     error::RunnerError,
     report::add_test_to_report,
     result_check::check_test_case_results,
@@ -22,9 +22,9 @@ use crate::runner_v2::{
 /// Runs all the tests that have been parsed.
 pub async fn run_tests(tests: Vec<Test>) -> Result<(), RunnerError> {
     // Remove previous report if it exists.
-    let successful_report_path = PathBuf::from("./runner_v2/success_report.txt");
+    let successful_report_path = PathBuf::from("./success_report.txt");
     let _ = fs::remove_file(&successful_report_path);
-    let _ = fs::remove_file("./runner_v2/failure_report.txt");
+    let _ = fs::remove_file("./failure_report.txt");
 
     let mut success_report = OpenOptions::new()
         .append(true)
diff --git a/cmd/ef_tests/state_v2/src/modules/types.rs b/cmd/ef_tests/state_v2/src/modules/types.rs
@@ -1,4 +1,4 @@
-use crate::runner_v2::{
+use crate::modules::{
     deserialize::{
         deserialize_access_lists, deserialize_authorization_lists,
         deserialize_ef_post_value_indexes, deserialize_post,
diff --git a/cmd/ef_tests/state_v2/src/modules/utils.rs b/cmd/ef_tests/state_v2/src/modules/utils.rs
@@ -7,7 +7,7 @@ use keccak_hash::H256;
 
 use std::sync::Arc;
 
-use crate::runner_v2::{
+use crate::modules::{
     error::RunnerError,
     types::{Env, Test, TestCase},
 };
diff --git a/crates/vm/Cargo.toml b/crates/vm/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 ethrex-common.workspace = true
-ethrex-levm ={ path = "./levm", default-features = false}
+ethrex-levm = { path = "./levm", default-features = false }
 ethrex-trie.workspace = true
 ethrex-rlp.workspace = true
 
diff --git a/crates/vm/levm/Cargo.toml b/crates/vm/levm/Cargo.toml
@@ -30,11 +30,11 @@ ripemd = "0.1.3"
 malachite = "0.6.1"
 lambdaworks-math = "0.11.0"
 bls12_381 = { git = "https://github.com/lambdaclass/bls12_381", branch = "expose-fp-struct", features = [
-    "groups",
-    "bits",
-    "pairings",
-    "alloc",
-    "experimental",
+  "groups",
+  "bits",
+  "pairings",
+  "alloc",
+  "experimental",
 ] }
 ark-bn254 = "0.5.0"
 ark-ec = "0.5.0"
