apollo_batcher: wait for revert result

Author: yoavGrs

crates/apollo_batcher/src/commitment_manager/commitment_manager_impl.rs

@@ -25,6 +25,7 @@ use crate::commitment_manager::types::{
     CommitmentTaskResult,
     CommitterTaskResult,
     FinalBlockCommitment,
+    RevertTaskResult,
 };
 
 pub(crate) const DEFAULT_TASKS_CHANNEL_SIZE: usize = 1000;
@@ -165,6 +166,26 @@ impl<S: StateCommitterTrait> CommitmentManager<S> {
         results
     }
 
+    /// Fetches all ready commitment results from the state committer, until a revert result is
+    /// received.
+    pub(crate) async fn wait_for_revert_results(
+        &mut self,
+    ) -> (Vec<CommitmentTaskResult>, RevertTaskResult) {
+        let mut commitment_results = Vec::new();
+        loop {
+            // Sleep until a message is sent or the channel is closed.
+            match self.results_receiver.recv().await {
+                Some(CommitterTaskResult::Commit(commitment_task_result)) => {
+                    commitment_results.push(commitment_task_result)
+                }
+                Some(CommitterTaskResult::Revert(revert_task_result)) => {
+                    return (commitment_results, revert_task_result);
+                }
+                None => panic!("Channel closed while waiting for revert results."),
+            }
+        }
+    }
+
     // Private methods.
 
     fn successfully_added_commitment_task(