chore: remove ArbitraryTxBuilder

Author: greged93

crates/watcher/src/lib.rs

@@ -473,8 +473,10 @@ where
 mod tests {
     use super::*;
 
-    use crate::test_utils::{arbitrary::ArbitraryTxBuilder, provider::MockProvider};
-    use alloy_consensus::TxType;
+    use crate::test_utils::provider::MockProvider;
+    use alloy_consensus::{transaction::Recovered, Signed, TxEip1559};
+    use alloy_primitives::Address;
+    use alloy_rpc_types_eth::Transaction;
     use alloy_sol_types::{SolCall, SolEvent};
     use arbitrary::Arbitrary;
     use scroll_l1::abi::calls::commitBatchCall;
@@ -754,10 +756,19 @@ mod tests {
     async fn test_handle_batch_commits() -> eyre::Result<()> {
         // Given
         let (finalized, latest, chain) = chain(10);
-        let tx = ArbitraryTxBuilder::default()
-            .with_ty(TxType::Eip1559)
-            .with_input(random!(commitBatchCall).abi_encode().into())
-            .build();
+
+        // prepare the commit batch call transaction.
+        let mut inner = random!(Signed<TxEip1559>);
+        inner.tx_mut().input = random!(commitBatchCall).abi_encode().into();
+        let recovered = Recovered::new_unchecked(inner.into(), random!(Address));
+        let tx = Transaction {
+            inner: recovered,
+            block_hash: None,
+            block_number: None,
+            transaction_index: None,
+            effective_gas_price: None,
+        };
+
         let (watcher, mut receiver) =
             l1_watcher(chain, vec![], vec![tx.clone()], finalized.clone(), latest.clone());
 

crates/watcher/src/test_utils/arbitrary.rs

@@ -1,11 +1,3 @@
-use alloy_consensus::{
-    transaction::Recovered, Signed, TxEip1559, TxEip2930, TxEip4844, TxEip4844Variant, TxEip7702,
-    TxEnvelope, TxLegacy, TxType,
-};
-use alloy_primitives::Bytes;
-use alloy_rpc_types_eth::Transaction;
-use arbitrary::Arbitrary;
-
 /// Returns an arbitrary instance of the passed type.
 #[macro_export]
 macro_rules! random {
@@ -17,58 +9,3 @@ macro_rules! random {
         <$typ>::arbitrary(&mut u).unwrap()
     }};
 }
-
-/// Helper instance to build an arbitrary transaction.
-#[derive(Debug)]
-pub struct ArbitraryTxBuilder {
-    tx: Transaction,
-}
-
-impl Default for ArbitraryTxBuilder {
-    fn default() -> Self {
-        let recovered = random!(Recovered<TxEnvelope>);
-        Self {
-            tx: Transaction {
-                inner: recovered,
-                block_hash: None,
-                block_number: None,
-                transaction_index: None,
-                effective_gas_price: None,
-            },
-        }
-    }
-}
-
-impl ArbitraryTxBuilder {
-    /// Modifies the type of the random transaction.
-    pub fn with_ty(mut self, ty: TxType) -> Self {
-        match ty {
-            TxType::Legacy => *self.tx.inner.inner_mut() = random!(Signed<TxLegacy>).into(),
-            TxType::Eip2930 => *self.tx.inner.inner_mut() = random!(Signed<TxEip2930>).into(),
-            TxType::Eip1559 => *self.tx.inner.inner_mut() = random!(Signed<TxEip1559>).into(),
-            TxType::Eip4844 => *self.tx.inner.inner_mut() = random!(Signed<TxEip4844>).into(),
-            TxType::Eip7702 => *self.tx.inner.inner_mut() = random!(Signed<TxEip7702>).into(),
-        }
-        self
-    }
-
-    /// Modifies the input of the random transaction.
-    pub fn with_input(mut self, input: Bytes) -> Self {
-        match self.tx.inner.inner_mut() {
-            TxEnvelope::Legacy(ref mut tx) => tx.tx_mut().input = input,
-            TxEnvelope::Eip2930(ref mut tx) => tx.tx_mut().input = input,
-            TxEnvelope::Eip1559(ref mut tx) => tx.tx_mut().input = input,
-            TxEnvelope::Eip4844(ref mut tx) => match tx.tx_mut() {
-                TxEip4844Variant::TxEip4844(tx) => tx.input = input,
-                TxEip4844Variant::TxEip4844WithSidecar(tx) => tx.tx.input = input,
-            },
-            TxEnvelope::Eip7702(ref mut tx) => tx.tx_mut().input = input,
-        }
-        self
-    }
-
-    /// Returns the built transaction.
-    pub fn build(self) -> Transaction {
-        self.tx
-    }
-}

crates/watcher/tests/reorg.rs

@@ -11,7 +11,7 @@ use tracing::{subscriber::set_global_default, Level};
 
 fn setup() {
     let sub = tracing_subscriber::FmtSubscriber::builder().with_max_level(Level::TRACE).finish();
-    set_global_default(sub).expect("failed to set subscriber");
+    let _ = set_global_default(sub);
 }
 
 // Generate a set blocks that will be fed to the l1 watcher.