fix: lint

Author: prestwich

crates/evm/Cargo.toml

@@ -28,6 +28,8 @@ reth-db-common.workspace = true
 
 trevm = { workspace = true, features = ["test-utils"] }
 
+signet-types = { workspace = true, features = ["test-utils"] }
+signet-extract = { workspace = true, features = ["test-utils"] }
 
 [features]
 default = []

crates/evm/src/driver.rs

@@ -780,7 +780,10 @@ mod test {
     };
     use reth::primitives::{Block, RecoveredBlock, Transaction};
     use signet_extract::ExtractedEvent;
-    use signet_types::config::{HostConfig, PredeployTokens, RollupConfig};
+    use signet_types::{
+        config::{HostConfig, PredeployTokens, RollupConfig},
+        test_utils::*,
+    };
     use trevm::NoopCfg;
 
     /// Make a fake block with a specific number.

crates/evm/src/lib.rs

@@ -78,12 +78,9 @@ where
 /// Test utilities for the Signet EVM impl.
 #[cfg(any(test, feature = "test-utils"))]
 pub mod test_utils {
-    use alloy::primitives::Address;
+    
     use reth::revm::InMemoryDB;
-    use signet_types::{
-        config::{HostConfig, PredeployTokens, RollupConfig, SignetSystemConstants},
-        test_utils::*,
-    };
+    use signet_types::test_utils::*;
 
     /// Create a new Signet EVM with an in-memory database for testing.
     pub fn test_signet_evm() -> super::EvmNeedsCfg<'static, trevm::revm::db::InMemoryDB> {

crates/extract/src/test_utils/host_spec.rs

@@ -1,15 +1,12 @@
 use crate::test_utils::{
-    sign_tx_with_key_pair, simple_send, NotificationSpec, NotificationWithSidecars, RuBlockSpec,
+    NotificationSpec, NotificationWithSidecars, RuBlockSpec,
 };
 use alloy::{
     consensus::{
-        constants::GWEI_TO_WEI, BlobTransactionSidecar, SidecarBuilder, SimpleCoder, TxEip4844,
-        TxEnvelope,
+        constants::GWEI_TO_WEI, BlobTransactionSidecar, TxEip4844,
     },
-    eips::eip2718::Encodable2718,
-    primitives::{keccak256, Address, Bytes, FixedBytes, Log, LogData, Sealable, B256, U256},
-    rlp::Encodable,
-    signers::{local::PrivateKeySigner, Signature},
+    primitives::{Address, Bytes, FixedBytes, Log, LogData, Sealable, B256, U256},
+    signers::Signature,
 };
 use reth::{
     primitives::{
@@ -18,19 +15,13 @@ use reth::{
     },
     providers::{Chain, ExecutionOutcome},
 };
-use reth_exex::ExExNotification;
 use signet_types::config::SignetSystemConstants;
 use signet_zenith::{
     Passage, RollupOrders, Transactor,
-    Zenith::{self},
 };
 use std::{
     borrow::Borrow,
-    collections::BTreeMap,
-    sync::{
-        atomic::{AtomicU64, Ordering},
-        Arc,
-    },
+    sync::atomic::{AtomicU64, Ordering},
 };
 
 /// A block spec for the host chain.
@@ -66,7 +57,7 @@ impl Clone for HostBlockSpec {
 
 impl HostBlockSpec {
     /// Make a new block spec
-    pub fn new(constants: SignetSystemConstants) -> Self {
+    pub const fn new(constants: SignetSystemConstants) -> Self {
         Self {
             constants,
             receipts: vec![],

crates/extract/src/test_utils/notif_spec.rs

@@ -1,35 +1,10 @@
-use super::{sign_tx_with_key_pair, simple_send};
 use crate::test_utils::HostBlockSpec;
-use alloy::{
-    consensus::{
-        constants::GWEI_TO_WEI, BlobTransactionSidecar, SidecarBuilder, SimpleCoder, TxEip4844,
-        TxEnvelope,
-    },
-    eips::eip2718::Encodable2718,
-    primitives::{keccak256, Address, Bytes, FixedBytes, Log, LogData, Sealable, B256, U256},
-    rlp::Encodable,
-    signers::{local::PrivateKeySigner, Signature},
-};
-use reth::{
-    primitives::{
-        Block, BlockBody, Header, Receipt, RecoveredBlock, SealedBlock, SealedHeader, Transaction,
-        TransactionSigned, TxType,
-    },
-    providers::{Chain, ExecutionOutcome},
-};
+use alloy::consensus::BlobTransactionSidecar;
+use reth::primitives::TransactionSigned;
 use reth_exex::ExExNotification;
-use signet_types::config::SignetSystemConstants;
-use signet_zenith::{
-    Passage, RollupOrders, Transactor,
-    Zenith::{self},
-};
 use std::{
-    borrow::Borrow,
     collections::BTreeMap,
-    sync::{
-        atomic::{AtomicU64, Ordering},
-        Arc,
-    },
+    sync::Arc,
 };
 
 /// A notification spec.

crates/extract/src/test_utils/ru_spec.rs

@@ -1,35 +1,17 @@
 use super::{sign_tx_with_key_pair, simple_send};
 use alloy::{
     consensus::{
-        constants::GWEI_TO_WEI, BlobTransactionSidecar, SidecarBuilder, SimpleCoder, TxEip4844,
+        BlobTransactionSidecar, SidecarBuilder, SimpleCoder,
         TxEnvelope,
     },
     eips::eip2718::Encodable2718,
-    primitives::{keccak256, Address, Bytes, FixedBytes, Log, LogData, Sealable, B256, U256},
+    primitives::{keccak256, Address, Bytes, B256, U256},
     rlp::Encodable,
-    signers::{local::PrivateKeySigner, Signature},
+    signers::local::PrivateKeySigner,
 };
-use reth::{
-    primitives::{
-        Block, BlockBody, Header, Receipt, RecoveredBlock, SealedBlock, SealedHeader, Transaction,
-        TransactionSigned, TxType,
-    },
-    providers::{Chain, ExecutionOutcome},
-};
-use reth_exex::ExExNotification;
+use reth::primitives::TransactionSigned;
 use signet_types::config::SignetSystemConstants;
-use signet_zenith::{
-    Passage, RollupOrders, Transactor,
-    Zenith::{self},
-};
-use std::{
-    borrow::Borrow,
-    collections::BTreeMap,
-    sync::{
-        atomic::{AtomicU64, Ordering},
-        Arc,
-    },
-};
+use signet_zenith::Zenith::{self};
 
 /// A block spec for the Ru chain.
 #[derive(Debug, Clone)]
@@ -46,13 +28,13 @@ pub struct RuBlockSpec {
 
 impl RuBlockSpec {
     /// Builder method to set the gas limit.
-    pub fn with_gas_limit(mut self, gas_limit: u64) -> Self {
+    pub const fn with_gas_limit(mut self, gas_limit: u64) -> Self {
         self.gas_limit = Some(gas_limit);
         self
     }
 
     /// Builder method to set the reward address.
-    pub fn with_reward_address(mut self, reward_address: Address) -> Self {
+    pub const fn with_reward_address(mut self, reward_address: Address) -> Self {
         self.reward_address = Some(reward_address);
         self
     }