fmt

Author: jonastheis

crates/chain-orchestrator/src/lib.rs

@@ -731,12 +731,11 @@ impl<
                             return Err(ChainOrchestratorError::DuplicateBatchCommit(
                                 BatchInfo::new(batch_clone.index, batch_clone.hash),
                             ));
-                        } else {
-                            // TODO: once batch reverts are implemented, we need to handle this
-                            // case.
-                            // If we have a batch at the same index in the DB this means we have
-                            // missed a batch revert event.
                         }
+                        // TODO: once batch reverts are implemented, we need to handle this
+                        // case.
+                        // If we have a batch at the same index in the DB this means we have
+                        // missed a batch revert event.
                     }
 
                     // remove any batches with an index greater than the previous batch.
@@ -833,8 +832,8 @@ impl<
                             )),
                             1,
                         )
-                        .await?
-                        .is_empty()
+                            .await?
+                            .is_empty()
                     {
                         return Err(ChainOrchestratorError::L1MessageQueueGap(
                             l1_message.transaction.queue_index,
@@ -859,17 +858,17 @@ impl<
                             return Err(ChainOrchestratorError::DuplicateL1Message(
                                 l1_message.transaction.queue_index,
                             ));
-                        } else {
-                            // This should not happen in normal operation as messages should be
-                            // deleted when a L1 reorg is handled, log warning.
-                            tracing::warn!(
+                        }
+
+                        // This should not happen in normal operation as messages should be
+                        // deleted when a L1 reorg is handled, log warning.
+                        tracing::warn!(
                                 target: "scroll::chain_orchestrator",
                                 "L1 message queue index {} already exists with different hash in DB {:?} vs {:?}",
                                 l1_message.transaction.queue_index,
                                 existing_message.transaction.tx_hash(),
                                 l1_message.transaction.tx_hash()
                             );
-                        }
                     }
 
                     tx.insert_l1_message(l1_message.clone()).await?;

crates/watcher/src/lib.rs

@@ -223,11 +223,7 @@ where
     pub async fn run(&mut self) {
         loop {
             // Determine sleep duration based on sync state
-            let sleep_duration = if self.is_synced {
-                SLOW_SYNC_INTERVAL
-            } else {
-                Duration::ZERO
-            };
+            let sleep_duration = if self.is_synced { SLOW_SYNC_INTERVAL } else { Duration::ZERO };
 
             // Select between receiving commands and sleeping
             select! {
@@ -919,7 +915,8 @@ mod tests {
     async fn test_should_match_unfinalized_tail() -> eyre::Result<()> {
         // Given
         let (finalized, latest, chain) = chain(10);
-        let (mut watcher, _, _) = l1_watcher(chain, vec![], vec![], finalized.clone(), latest.clone());
+        let (mut watcher, _, _) =
+            l1_watcher(chain, vec![], vec![], finalized.clone(), latest.clone());
 
         // When
         watcher.handle_latest_block(&finalized, &latest).await?;
@@ -1148,10 +1145,8 @@ mod tests {
 
         // Then: Send reset command - this should NOT deadlock
         let (new_tx, _new_rx) = mpsc::channel(2);
-        let reset_result = tokio::time::timeout(
-            Duration::from_secs(1),
-            handle.reset_to_block(100, new_tx),
-        ).await;
+        let reset_result =
+            tokio::time::timeout(Duration::from_secs(1), handle.reset_to_block(100, new_tx)).await;
 
         assert!(reset_result?.is_ok(), "Reset should succeed");
 
@@ -1162,4 +1157,4 @@ mod tests {
 
         Ok(())
     }
-}
+}