apollo_l1_provider: add reset_bootstrapper function (#10513)

* apollo_l1_provider: check for uninitialized instead of bootstrapping+sync started

* apollo_l1_provider: add reset_bootstrapper function

Author: guy-starkware

crates/apollo_l1_provider/src/l1_provider.rs

@@ -72,6 +72,13 @@ impl L1Provider {
             start_height: None,
         }
     }
+    pub fn reset_bootstrapper(&mut self) {
+        self.bootstrapper = Bootstrapper::new(
+            self.bootstrapper.l1_provider_client.clone(),
+            self.bootstrapper.sync_client.clone(),
+            self.config.startup_sync_sleep_retry_interval_seconds,
+        );
+    }
     // Functions Called by the scraper.
 
     // Start the provider, get first-scrape events, start L2 sync.
@@ -323,6 +330,7 @@ impl L1Provider {
 
     /// Go from current state to Bootstrap state and start the L2 sync.
     pub fn start_bootstrapping(&mut self, target_height: BlockNumber) {
+        self.reset_bootstrapper();
         self.state = ProviderState::Bootstrap;
         self.bootstrapper.start_l2_sync(self.current_height, target_height);
     }

crates/apollo_l1_provider/src/l1_provider_tests.rs

@@ -375,7 +375,8 @@ async fn commit_block_backlog() {
         .build_into_l1_provider();
 
     l1_provider.initialize(STARTUP_HEIGHT, vec![]).await.expect("l1 provider initialize failed");
-    commit_block_expect_error_just_to_start_bootstrapping(&mut l1_provider, TARGET_HEIGHT);
+    l1_provider.state = ProviderState::Bootstrap;
+    l1_provider.bootstrapper.start_l2_sync(STARTUP_HEIGHT, TARGET_HEIGHT);
 
     // Test.
     // Commit height is below target height. Doesn't trigger backlog.