Create test-utils crate.

twittner · twittner · commit 0d52ad46aa69 · 2025-09-04T11:14:02.000+02:00
To speed up compilation of test tools.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,6 +10,7 @@ members = [
     "sailfish-rbc",
     "sailfish-types",
     "tests",
+    "test-utils",
     "timeboost",
     "timeboost-builder",
     "timeboost-config",
@@ -94,7 +95,7 @@ thiserror = "2.0"
 tokio = { version = "1", default-features = false, features = ["full"] }
 tokio-stream = "0.1.17"
 tokio-tungstenite = { version = "0.27.0", features = ["rustls-tls-webpki-roots", "url"] }
-tokio-util = { version = "0.7.15", features = ["compat"] }
+tokio-util = { version = "0.7.15", features = ["compat", "rt"] }
 toml = "0.9"
 toml_edit = "0.22"
 tonic = "0.14.1"
diff --git a/justfile b/justfile
@@ -22,8 +22,8 @@ build-contracts:
   forge build
 
 [private]
-build-tools:
-  cargo build --release --features bin --bin run --bin port-alloc
+build-test-utils:
+  cargo build --release -p test-utils --features ports
 
 ####################
 ###CHECK COMMANDS###
@@ -126,25 +126,25 @@ mkconfig_nitro DATETIME *ARGS:
     --output "test-configs/nitro-ci-committee" {{ARGS}}
 
 verify_blocks *ARGS:
-  cargo run --release --bin block-verifier --features bin {{ARGS}}
+  cargo run --release --bin block-verifier --features verifier {{ARGS}}
 
 ####################
 ####TEST COMMANDS###
 ####################
-test *ARGS: build-tools
+test *ARGS: build-test-utils
   target/release/run --with target/release/port-alloc cargo nextest run {{ARGS}}
   @if [ "{{ARGS}}" == "" ]; then cargo test --doc; fi
 
 test-contracts: build-contracts
   forge test
 
-test_ci *ARGS: build-tools
+test_ci *ARGS: build-test-utils
   env {{LOG_LEVELS}} NO_COLOR=1 target/release/run \
     --with target/release/port-alloc \
     -- cargo nextest run --workspace {{ARGS}}
   env {{LOG_LEVELS}} NO_COLOR=1 cargo test --doc {{ARGS}}
 
-test-individually: build-tools
+test-individually: build-test-utils
   @for pkg in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[].name'); do \
     echo "Testing $pkg"; \
     target/release/run \
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "test-utils"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+
+[features]
+ports = ["dep:minicbor", "dep:minicbor-io", "dep:tokio-util"]
+verifier = ["dep:alloy", "dep:timeboost-utils"]
+
+[dependencies]
+anyhow = { workspace = true }
+clap = { workspace = true }
+futures = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+# optional
+alloy = { workspace = true, optional = true }
+minicbor = { workspace = true, optional = true }
+minicbor-io = { workspace = true, optional = true }
+tokio-util = { workspace = true, optional = true }
+timeboost-utils = { path = "../timeboost-utils", optional = true }
+
+[[bin]]
+name = "block-verifier"
+path = "src/binaries/block-verifier.rs"
+required-features = ["verifier"]
+
+[[bin]]
+name = "run"
+path = "src/binaries/run.rs"
+
+[[bin]]
+name = "port-alloc"
+path = "src/binaries/port-alloc.rs"
+required-features = ["ports"]
diff --git a/test-utils/src/binaries/block-verifier.rs b/test-utils/src/binaries/block-verifier.rs
diff --git a/test-utils/src/binaries/port-alloc.rs b/test-utils/src/binaries/port-alloc.rs
@@ -8,7 +8,7 @@ use std::{
 
 use anyhow::{Context, Result};
 use minicbor_io::{AsyncReader, AsyncWriter};
-use timeboost_utils::ports::{ALLOCATOR_PORT, Request, Response};
+use test_utils::ports::{ALLOCATOR_PORT, Request, Response};
 use tokio::net::{TcpListener, TcpStream};
 use tokio_util::{
     compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt},
diff --git a/test-utils/src/binaries/run.rs b/test-utils/src/binaries/run.rs
diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
@@ -0,0 +1,2 @@
+#[cfg(feature = "ports")]
+pub mod ports;
diff --git a/test-utils/src/ports.rs b/test-utils/src/ports.rs
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -21,6 +21,7 @@ rand = { workspace = true }
 sailfish = { path = "../sailfish", features = ["test"] }
 sailfish-types = { path = "../sailfish-types" }
 serde = { workspace = true }
+test-utils = { path = "../test-utils", features = ["ports"]}
 timeboost = { path = "../timeboost" }
 timeboost-utils = { path = "../timeboost-utils" }
 tokio = { workspace = true }
@@ -29,25 +30,3 @@ tokio-util = { workspace = true }
 tracing = { workspace = true }
 turmoil = { workspace = true }
 url = { workspace = true }
-# optional:
-anyhow = { workspace = true, optional = true }
-clap = { workspace = true, optional = true }
-minicbor-io = { workspace = true, optional = true }
-
-[features]
-bin = ["dep:anyhow", "dep:clap", "dep:minicbor-io"]
-
-[[bin]]
-name = "block-verifier"
-path = "src/binaries/block-verifier.rs"
-required-features = ["bin"]
-
-[[bin]]
-name = "run"
-path = "src/binaries/run.rs"
-required-features = ["bin"]
-
-[[bin]]
-name = "port-alloc"
-path = "src/binaries/port-alloc.rs"
-required-features = ["bin"]
diff --git a/tests/src/lib.rs b/tests/src/lib.rs
@@ -2,7 +2,8 @@ use std::net::{Ipv4Addr, SocketAddr};
 
 use multisig::{Committee, Keypair, PublicKey, x25519};
 use sailfish_types::UNKNOWN_COMMITTEE_ID;
-use timeboost_utils::{ports::alloc_port, unsafe_zero_dh_keypair, unsafe_zero_keypair};
+use test_utils::ports::alloc_port;
+use timeboost_utils::{unsafe_zero_dh_keypair, unsafe_zero_keypair};
 
 #[cfg(test)]
 mod tests;
diff --git a/tests/src/tests/rbc.rs b/tests/src/tests/rbc.rs
@@ -6,7 +6,7 @@ use multisig::{Committee, Keypair, PublicKey, x25519};
 use sailfish::Coordinator;
 use sailfish::rbc::{Rbc, RbcConfig};
 use sailfish::types::UNKNOWN_COMMITTEE_ID;
-use timeboost_utils::ports::alloc_ports_blocking;
+use test_utils::ports::alloc_ports_blocking;
 use timeboost_utils::types::logging::init_logging;
 use tokio::time::timeout;
 
diff --git a/tests/src/tests/timeboost.rs b/tests/src/tests/timeboost.rs
@@ -11,14 +11,14 @@ use cliquenet::{Address, AddressableCommittee};
 use multisig::Keypair;
 use multisig::{Committee, x25519};
 use sailfish_types::UNKNOWN_COMMITTEE_ID;
+use test_utils::ports::alloc_ports;
 use timeboost::builder::CertifierConfig;
 use timeboost::config::{ChainConfig, ParentChain};
 use timeboost::crypto::prelude::DkgDecKey;
 use timeboost::sequencer::SequencerConfig;
 use timeboost::types::BundleVariant;
 use timeboost::types::{DecryptionKeyCell, KeyStore};
 use timeboost_utils::load_generation::make_bundle;
-use timeboost_utils::ports::alloc_ports;
 use tokio::sync::broadcast;
 use tokio::time::{Duration, sleep};
 use tracing::warn;
diff --git a/tests/src/tests/timeboost/handover.rs b/tests/src/tests/timeboost/handover.rs
@@ -14,11 +14,11 @@ use sailfish::consensus::Consensus;
 use sailfish::rbc::Rbc;
 use sailfish::types::{ConsensusTime, RoundNumber, Timestamp};
 use sailfish::{Coordinator, Event};
+use test_utils::ports::alloc_ports;
 use timeboost::config::{ChainConfig, ParentChain};
 use timeboost::crypto::prelude::DkgDecKey;
 use timeboost::sequencer::SequencerConfig;
 use timeboost::types::{DecryptionKeyCell, KeyStore};
-use timeboost_utils::ports::alloc_ports;
 use timeboost_utils::types::logging::init_logging;
 use tokio::select;
 use tokio::sync::{broadcast, mpsc};
diff --git a/timeboost-sequencer/Cargo.toml b/timeboost-sequencer/Cargo.toml
@@ -29,7 +29,8 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
-timeboost-utils = { path = "../timeboost-utils" }
 ark-std = { workspace = true }
 bs58 = { workspace = true }
 futures = { workspace = true }
+test-utils = { path = "../test-utils", features = ["ports"]}
+timeboost-utils = { path = "../timeboost-utils" }
diff --git a/timeboost-sequencer/src/decrypt.rs b/timeboost-sequencer/src/decrypt.rs
@@ -1530,8 +1530,9 @@ mod tests {
         sync::Arc,
         time::Instant,
     };
+    use test_utils::ports::alloc_port;
 
-    use timeboost_utils::{ports::alloc_port, types::logging};
+    use timeboost_utils::types::logging;
 
     use cliquenet::AddressableCommittee;
     use multisig::{Committee, KeyId, Keypair, SecretKey, Signed, VoteAccumulator, x25519};
diff --git a/timeboost-utils/Cargo.toml b/timeboost-utils/Cargo.toml
@@ -17,15 +17,12 @@ bytes = { workspace = true }
 cliquenet = { path = "../cliquenet" }
 ethereum_ssz = { workspace = true }
 futures = { workspace = true }
-minicbor = { workspace = true }
-minicbor-io = { workspace = true }
 multisig = { path = "../multisig" }
 rand = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true }
 timeboost-crypto = { path = "../timeboost-crypto" }
 timeboost-types = { path = "../timeboost-types", features = ["arbitrary"] }
 tokio = { workspace = true }
-tokio-util = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
diff --git a/timeboost-utils/src/lib.rs b/timeboost-utils/src/lib.rs
@@ -1,5 +1,4 @@
 pub mod load_generation;
-pub mod ports;
 pub mod types;
 pub mod until;
 
diff --git a/timeboost/Cargo.toml b/timeboost/Cargo.toml
@@ -51,3 +51,6 @@ tower = { workspace = true }
 tower-http = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
+
+[dev-dependencies]
+test-utils = { path = "../test-utils", features = ["ports"]}
diff --git a/timeboost/src/forwarder/nitro_forwarder/worker.rs b/timeboost/src/forwarder/nitro_forwarder/worker.rs
@@ -51,14 +51,15 @@ mod tests {
 
     use multisig::Keypair;
     use prost::{Message, bytes::Bytes};
+    use test_utils::ports::alloc_port;
     use timeboost_proto::{
         forward::{
             forward_api_client::ForwardApiClient,
             forward_api_server::{ForwardApi, ForwardApiServer},
         },
         inclusion::{InclusionList, Transaction},
     };
-    use timeboost_utils::{ports::alloc_port, types::logging::init_logging};
+    use timeboost_utils::types::logging::init_logging;
     use tokio::{
         sync::mpsc::channel,
         time::{sleep, timeout},

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#[cfg(feature = "ports")]`
	`2`	`+pub mod ports;`