apollo_batcher: comment out code that triggers the new comitter

Author: einat-starkware

crates/apollo_batcher/src/batcher.rs

@@ -183,7 +183,8 @@ pub struct Batcher {
     /// The proposal commitment of the previous height.
     /// This is returned by the decision_reached function.
     prev_proposal_commitment: Option<(BlockNumber, ProposalCommitment)>,
-
+    // TODO(Einat): Remove the allow(dead_code) when the committer should be enabled.
+    #[allow(dead_code)]
     commitment_manager: ApolloCommitmentManager,
 
     // Kept alive to maintain the server running.
@@ -717,6 +718,8 @@ impl Batcher {
             StorageCommitmentBlockHash::ParentHash(block_header_without_hash.parent_hash)
         };
 
+        // TODO(Einat): Remove allow(unused_variables) when the committer should be enabled.
+        #[allow(unused_variables)]
         let optional_state_diff_commitment = match &storage_commitment_block_hash {
             StorageCommitmentBlockHash::ParentHash(_) => None,
             StorageCommitmentBlockHash::Partial(PartialBlockHashComponents {
@@ -734,13 +737,13 @@ impl Batcher {
             storage_commitment_block_hash,
         )
         .await?;
-
-        self.write_commitment_results_and_add_new_task(
-            height,
-            state_diff,
-            optional_state_diff_commitment,
-        )
-        .await?;
+        // TODO(Einat): Uncomment when the committer should be enabled.
+        // self.write_commitment_results_and_add_new_task(
+        //     height,
+        //     state_diff,
+        //     optional_state_diff_commitment,
+        // )
+        // .await?;
 
         LAST_SYNCED_BLOCK_HEIGHT.set_lossy(block_number.0);
         SYNCED_TRANSACTIONS.increment(
@@ -781,6 +784,8 @@ impl Batcher {
         .expect("Number of reverted transactions should fit in u64");
         let partial_block_hash_components =
             block_execution_artifacts.partial_block_hash_components();
+        // TODO(Einat): Remove allow(unused_variables) when the committer should be enabled.
+        #[allow(unused_variables)]
         let state_diff_commitment =
             partial_block_hash_components.header_commitments.state_diff_commitment;
         let block_header_commitments = partial_block_hash_components.header_commitments.clone();
@@ -795,12 +800,13 @@ impl Batcher {
         )
         .await?;
 
-        self.write_commitment_results_and_add_new_task(
-            height,
-            state_diff.clone(), // TODO(Nimrod): Remove the clone here.
-            Some(state_diff_commitment),
-        )
-        .await?;
+        // TODO(Einat): Uncomment when the committer should be enabled.
+        // self.write_commitment_results_and_add_new_task(
+        //     height,
+        //     state_diff.clone(), // TODO(Nimrod): Remove the clone here.
+        //     Some(state_diff_commitment),
+        // )
+        // .await?;
 
         let execution_infos = block_execution_artifacts
             .execution_data
@@ -1275,7 +1281,8 @@ impl Batcher {
             })?;
         Ok(())
     }
-
+    // TODO(Einat): Remove the allow(dead_code) when the committer should be enabled.
+    #[allow(dead_code)]
     async fn write_commitment_results_and_add_new_task(
         &mut self,
         height: BlockNumber,
@@ -1625,14 +1632,15 @@ impl ComponentStarter for Batcher {
 
         register_metrics(storage_height, global_root_height);
 
-        self.commitment_manager
-            .add_missing_commitment_tasks(
-                storage_height,
-                &self.config,
-                self.storage_reader.clone(),
-                &mut self.storage_writer,
-            )
-            .await;
+        // TODO(Einat): Uncomment when the committer should be enabled.
+        // self.commitment_manager
+        //     .add_missing_commitment_tasks(
+        //         storage_height,
+        //         &self.config,
+        //         self.storage_reader.clone(),
+        //         &mut self.storage_writer,
+        //     )
+        //     .await;
     }
 }
 

crates/apollo_batcher/src/commitment_manager/commitment_manager_impl.rs

@@ -79,6 +79,7 @@ impl<S: StateCommitterTrait> CommitmentManager<S> {
         )
     }
 
+    #[allow(dead_code)]
     pub(crate) fn get_commitment_task_offset(&self) -> BlockNumber {
         self.commitment_task_offset
     }
@@ -354,6 +355,7 @@ impl<S: StateCommitterTrait> CommitmentManager<S> {
             self.commitment_task_offset.prev().expect("Can't revert before the genesis block.");
     }
 
+    #[allow(dead_code)]
     async fn read_commitment_input_and_add_task<
         R: BatcherStorageReader + ?Sized,
         W: BatcherStorageWriter + ?Sized,
@@ -403,6 +405,7 @@ impl<S: StateCommitterTrait> CommitmentManager<S> {
     /// Adds missing commitment tasks to the commitment manager. Missing tasks are caused by
     /// unfinished commitment tasks / results not written to storage when the sequencer is shut
     /// down.
+    #[allow(dead_code)]
     pub(crate) async fn add_missing_commitment_tasks<
         R: BatcherStorageReader + ?Sized,
         W: BatcherStorageWriter + ?Sized,

crates/apollo_batcher/src/commitment_manager/commitment_manager_test.rs

@@ -203,6 +203,8 @@ async fn test_create_commitment_manager(mut mock_dependencies: MockDependencies)
 }
 
 #[rstest]
+// TODO(Einat): Remove ignore when the committer should be enabled.
+#[ignore]
 #[tokio::test]
 async fn test_add_missing_commitment_tasks(mut mock_dependencies: MockDependencies) {
     let global_root_height = INITIAL_HEIGHT.prev().unwrap();