fix(l1, l2): cargo test compilation at workspace level

.github/workflows/pr_perf_build_block_bench.yml

@@ -5,7 +5,7 @@ name: Benchmark Block building
 on:
   workflow_dispatch:
   #pull_request:
-    #branches: ["**"]
+  #branches: ["**"]
 
 permissions:
   pull-requests: write
@@ -23,7 +23,7 @@ jobs:
       - name: Benchmarks
         uses: boa-dev/criterion-compare-action@v3
         with:
-          cwd: "cmd/ethrex/bench"
+          cwd: "benches/benches"
           benchName: "build_block_benchmark"
           branchName: ${{ github.base_ref }}
           token: ${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]
 members = [
+  "benches",
   "cmd/ethrex",
   "crates/blockchain",
   "crates/blockchain/dev",

Dockerfile

@@ -17,6 +17,7 @@ WORKDIR /ethrex
 # This layer is fast and will be invalidated on any source change.
 FROM chef AS planner
 
+COPY benches ./benches
 COPY crates ./crates
 COPY tooling ./tooling
 COPY metrics ./metrics
@@ -39,6 +40,7 @@ RUN cargo chef cook --release --recipe-path recipe.json
 RUN curl -L -o /usr/bin/solc https://github.com/ethereum/solidity/releases/download/v0.8.29/solc-static-linux \
     && chmod +x /usr/bin/solc
 
+COPY benches ./benches
 COPY crates ./crates
 COPY cmd ./cmd
 COPY metrics ./metrics

benches/Cargo.toml

@@ -0,0 +1,31 @@
+[package]
+name = "ethrex-benches"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+documentation.workspace = true
+
+[dependencies]
+ethrex.workspace = true
+ethrex-blockchain.workspace = true
+ethrex-common.workspace = true
+ethrex-config.workspace = true
+ethrex-storage.workspace = true
+
+bytes.workspace = true
+tokio.workspace = true
+serde_json.workspace = true
+
+[dev-dependencies]
+criterion = { version = "0.5.1", features = [
+    "html_reports",
+    "async_futures",
+    "async_tokio",
+] }
+secp256k1.workspace = true
+tempfile.workspace = true
+ethrex-l2-rpc.workspace = true
+
+[[bench]]
+name = "build_block_benchmark"
+harness = false

cmd/ethrex/bench/build_block_benchmark.rs → benches/benches/build_block_benchmark.rs

@@ -103,7 +103,7 @@ impl ValueFormatter for GasMeasurementFormatter {
 }
 
 fn read_private_keys() -> Vec<SecretKey> {
-    let file = include_str!("../../../fixtures/keys/private_keys_l1.txt");
+    let file = include_str!("../../fixtures/keys/private_keys_l1.txt");
     file.lines()
         .map(|line| {
             let line = line.trim().strip_prefix("0x").unwrap();
@@ -122,7 +122,7 @@ async fn setup_genesis(accounts: &Vec<Address>) -> (Store, Genesis) {
     if std::fs::exists(&storage_path).unwrap_or(false) {
         std::fs::remove_dir_all(&storage_path).unwrap();
     }
-    let genesis_file = include_bytes!("../../../fixtures/genesis/l1-dev.json");
+    let genesis_file = include_bytes!("../../fixtures/genesis/l1-dev.json");
     let mut genesis: Genesis = serde_json::from_slice(genesis_file).unwrap();
     let store = Store::new(storage_path, EngineType::RocksDB).unwrap();
     for address in accounts {

cmd/ethrex/Cargo.toml

@@ -27,7 +27,10 @@ ethrex-storage.workspace = true
 ethrex-storage-rollup = { workspace = true, optional = true }
 ethrex-vm.workspace = true
 
-tikv-jemallocator = { version = "0.6.0", optional = true, features = ["stats", "unprefixed_malloc_on_supported_platforms"] }
+tikv-jemallocator = { version = "0.6.0", optional = true, features = [
+  "stats",
+  "unprefixed_malloc_on_supported_platforms",
+] }
 bytes.workspace = true
 hex.workspace = true
 tracing.workspace = true
@@ -55,7 +58,11 @@ url.workspace = true
 tui-logger = { workspace = true, optional = true }
 
 [target.'cfg(linux)'.dependencies]
-tikv-jemallocator = { version = "0.6.0", optional = true, features = ["stats", "unprefixed_malloc_on_supported_platforms", "background_threads"] }
+tikv-jemallocator = { version = "0.6.0", optional = true, features = [
+  "stats",
+  "unprefixed_malloc_on_supported_platforms",
+  "background_threads",
+] }
 
 [[bin]]
 name = "ethrex"
@@ -102,33 +109,11 @@ l2 = [
   "dep:serde_json",
   "dep:hex",
 ]
-l2-sql = [
-  "ethrex-storage-rollup/sql",
-]
+l2-sql = ["ethrex-storage-rollup/sql"]
 sp1 = ["ethrex-prover/sp1"]
 gpu = ["ethrex-prover/gpu"]
 risc0 = ["ethrex-prover/risc0"]
 
-[dev-dependencies]
-criterion = { version = "0.5.1", features = [
-  "html_reports",
-  "async_futures",
-  "async_tokio",
-] }
-secp256k1.workspace = true
-tempfile.workspace = true
-ethrex-l2-rpc.workspace = true
-
-[[bench]]
-path = "./bench/import_blocks_benchmark.rs"
-name = "import_blocks_benchmark"
-harness = false
-
-[[bench]]
-path = "./bench/build_block_benchmark.rs"
-name = "build_block_benchmark"
-harness = false
-
 [build-dependencies]
 vergen-git2 = { version = "1.0.7", features = ["rustc"] }
 ethrex-sdk = { workspace = true, optional = true }