merge mian

Author: yiweichi

crates/node/src/args.rs

@@ -369,7 +369,9 @@ impl ScrollRollupNodeConfig {
         type L1WatcherMockOpt = Option<std::convert::Infallible>;
 
         let (_l1_watcher_mock, l1_watcher_handle): (L1WatcherMockOpt, Option<L1WatcherHandle>) =
-            if let Some(provider) = l1_provider.filter(|_| !self.test_args.test || self.blob_provider_args.anvil_url.is_some()) {
+            if let Some(provider) = l1_provider
+                .filter(|_| !self.test_args.test || self.blob_provider_args.anvil_url.is_some())
+            {
                 tracing::info!(target: "scroll::node::args", ?l1_block_startup_info, "Starting L1 watcher");
 
                 #[cfg(feature = "test-utils")]

crates/node/src/test_utils/reboot.rs

@@ -219,7 +219,7 @@ impl TestFixture {
             as Arc<dyn ScrollEngineApi + Send + Sync + 'static>;
 
         // Step 4: Get necessary handles from the new node
-        let l1_watcher_tx = new_node.inner.add_ons_handle.l1_watcher_tx.clone();
+        let l1_watcher_handle = new_node.inner.add_ons_handle.l1_watcher_handle.clone();
         let rollup_manager_handle = new_node.inner.add_ons_handle.rollup_manager_handle.clone();
 
         // Step 5: Restore ForkchoiceState from persisted ChainOrchestrator status

crates/watcher/tests/indexing.rs

@@ -59,7 +59,7 @@ async fn test_should_not_index_latest_block_multiple_times() -> eyre::Result<()>
     );
 
     // spawn the watcher and verify received notifications are consistent.
-    let (_, mut l1_watcher) = L1Watcher::spawn(
+    let l1_watcher = L1Watcher::spawn(
         mock_provider,
         L1BlockStartupInfo::None,
         Arc::new(config),

crates/watcher/tests/logs.rs

@@ -64,7 +64,7 @@ async fn test_should_not_miss_logs_on_reorg() -> eyre::Result<()> {
     );
 
     // spawn the watcher and verify received notifications are consistent.
-    let (_, mut l1_watcher) = L1Watcher::spawn(
+    let l1_watcher = L1Watcher::spawn(
         mock_provider,
         L1BlockStartupInfo::None,
         Arc::new(config),

crates/watcher/tests/reorg.rs

@@ -72,7 +72,7 @@ async fn test_should_detect_reorg() -> eyre::Result<()> {
     );
 
     // spawn the watcher and verify received notifications are consistent.
-    let (_, mut l1_watcher) = L1Watcher::spawn(
+    let l1_watcher = L1Watcher::spawn(
         mock_provider,
         L1BlockStartupInfo::None,
         Arc::new(config),
@@ -180,7 +180,7 @@ async fn test_should_fetch_gap_in_unfinalized_blocks() -> eyre::Result<()> {
     );
 
     // spawn the watcher and verify received notifications are consistent.
-    let (_, mut l1_watcher) = L1Watcher::spawn(
+    let l1_watcher = L1Watcher::spawn(
         mock_provider,
         L1BlockStartupInfo::None,
         Arc::new(config),