clippy

Author: meyer9

crates/op-rbuilder/src/block_stm/db_adapter.rs

@@ -234,10 +234,11 @@ where
         // Check cache first
         {
             let cache = self.account_cache.lock().unwrap();
-            if let Some(cached) = cache.get(&address) {
-                if cached.info.is_some() {
-                    return Ok(cached.info.clone());
-                }
+            if let Some(CachedAccount {
+                info: Some(info), ..
+            }) = cache.get(&address)
+            {
+                return Ok(Some(info.clone()));
             }
         }
 

crates/op-rbuilder/src/block_stm/scheduler.rs

@@ -200,6 +200,7 @@ impl Scheduler {
     }
 
     /// Record execution completion for a transaction.
+    #[expect(clippy::too_many_arguments)]
     pub fn finish_execution(
         &self,
         txn_idx: TxnIndex,

crates/op-rbuilder/src/block_stm/view.rs

@@ -189,6 +189,7 @@ impl WriteSet {
     }
 
     /// Consume the write set and return both regular writes and balance deltas.
+    #[expect(clippy::type_complexity)]
     pub fn into_parts(self) -> (Vec<(EvmStateKey, EvmStateValue)>, Vec<(Address, U256)>) {
         (self.writes, self.balance_deltas)
     }

crates/op-rbuilder/src/builders/context.rs

@@ -103,7 +103,7 @@ impl<ExtraCtx: Debug + Default, EF> OpPayloadBuilderCtx<ExtraCtx, EF> {
         Self { cancel, ..self }
     }
 
-    pub(super) fn to_lazy_evm(self) -> OpPayloadBuilderCtx<ExtraCtx, OpLazyEvmFactory> {
+    pub(super) fn into_lazy_evm(self) -> OpPayloadBuilderCtx<ExtraCtx, OpLazyEvmFactory> {
         let OpPayloadBuilderCtx {
             evm_config,
             da_config,
@@ -908,13 +908,13 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx, OpLazyEvmFactory>
                                 let exec_result = match exec_result {
                                     Ok(res) => res,
                                     Err(err) => {
-                                        if let Some(err) = err.as_invalid_tx_err() {
-                                            if !err.is_nonce_too_low() {
-                                                shared_best_txs
-                                                    .lock()
-                                                    .unwrap()
-                                                    .mark_invalid(tx.signer(), tx.nonce());
-                                            }
+                                        if let Some(err) = err.as_invalid_tx_err()
+                                            && !err.is_nonce_too_low()
+                                        {
+                                            shared_best_txs
+                                                .lock()
+                                                .unwrap()
+                                                .mark_invalid(tx.signer(), tx.nonce());
                                         }
                                         // Get captured reads even on failure
                                         let captured_reads =
@@ -991,6 +991,7 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx, OpLazyEvmFactory>
 
                                 // Add writes only for values that actually changed
                                 for (addr, account) in state.iter() {
+                                    debug!("Account touched: {}", addr);
                                     if account.is_touched() {
                                         // Get original values from captured reads (if available)
                                         let original_balance = captured_reads.get_balance(*addr);

crates/op-rbuilder/src/builders/flashblocks/payload.rs

@@ -691,7 +691,7 @@ where
 
         // Use parallel execution only when parallel_threads > 1
         if ctx.parallel_threads > 1 {
-            let ctx = ctx.clone().to_lazy_evm();
+            let ctx = ctx.clone().into_lazy_evm();
             ctx.execute_best_transactions_parallel(
                 info,
                 state,

crates/op-rbuilder/src/builders/standard/payload.rs

@@ -420,7 +420,7 @@ impl<Txs: PayloadTxsBounds + Send> OpBuilder<'_, Txs> {
                 .transaction_pool_fetch_gauge
                 .set(transaction_pool_fetch_time);
 
-            let ctx = ctx.clone().to_lazy_evm();
+            let ctx = ctx.clone().into_lazy_evm();
             if ctx
                 .execute_best_transactions_parallel(
                     &mut info,