apollo_batcher: commitment manager input uses apollo committer types

Author: yoavGrs

crates/apollo_batcher/src/commitment_manager/commitment_manager_impl.rs

@@ -3,8 +3,8 @@
 use std::sync::Arc;
 
 use apollo_batcher_config::config::BatcherConfig;
-use apollo_committer_types::committer_types::CommitBlockResponse;
-use apollo_committer_types::communication::SharedCommitterClient;
+use apollo_committer_types::committer_types::{CommitBlockRequest, CommitBlockResponse};
+use apollo_committer_types::communication::{CommitterRequest, SharedCommitterClient};
 use starknet_api::block::BlockNumber;
 use starknet_api::block_hash::block_hash_calculator::{
     calculate_block_hash,
@@ -113,7 +113,11 @@ impl<S: StateCommitterTrait> CommitmentManager<S> {
             });
         }
         let commitment_task_input =
-            CommitmentTaskInput { height, state_diff, state_diff_commitment };
+            CommitmentTaskInput(CommitterRequest::CommitBlock(CommitBlockRequest {
+                height,
+                state_diff,
+                state_diff_commitment,
+            }));
         let error_message = format!(
             "Failed to send commitment task to state committer. Block: {height}, state diff \
              commitment: {state_diff_commitment:?}",

crates/apollo_batcher/src/commitment_manager/types.rs

@@ -1,18 +1,13 @@
 #![allow(dead_code)]
 
 use apollo_committer_types::committer_types::{CommitBlockResponse, RevertBlockResponse};
+use apollo_committer_types::communication::CommitterRequest;
 use apollo_committer_types::errors::CommitterClientResult;
 use starknet_api::block::{BlockHash, BlockNumber};
-use starknet_api::core::{GlobalRoot, StateDiffCommitment};
-use starknet_api::state::ThinStateDiff;
+use starknet_api::core::GlobalRoot;
 
 /// Input for commitment tasks.
-pub(crate) struct CommitmentTaskInput {
-    pub(crate) state_diff: ThinStateDiff,
-    pub(crate) height: BlockNumber,
-    // Field is optional because for old blocks, the state diff commitment might not be available.
-    pub(crate) state_diff_commitment: Option<StateDiffCommitment>,
-}
+pub(crate) struct CommitmentTaskInput(pub(crate) CommitterRequest);
 
 #[derive(Clone)]
 pub(crate) struct CommitmentTaskOutput {

crates/apollo_batcher/src/test_utils.rs

@@ -6,7 +6,11 @@ use apollo_batcher_config::config::{BatcherConfig, FirstBlockWithPartialBlockHas
 use apollo_batcher_types::batcher_types::{ProposalId, ProposeBlockInput};
 use apollo_class_manager_types::{EmptyClassManagerClient, SharedClassManagerClient};
 use apollo_committer_types::committer_types::CommitBlockResponse;
-use apollo_committer_types::communication::{MockCommitterClient, SharedCommitterClient};
+use apollo_committer_types::communication::{
+    CommitterRequest,
+    MockCommitterClient,
+    SharedCommitterClient,
+};
 use apollo_l1_provider_types::MockL1ProviderClient;
 use apollo_mempool_types::communication::MockMempoolClient;
 use apollo_mempool_types::mempool_types::CommitBlockArgs;
@@ -347,7 +351,10 @@ impl MockStateCommitter {
             let task = tasks_receiver.try_recv().unwrap();
             let result = CommitterTaskResult::Commit(Ok(CommitmentTaskOutput {
                 response: CommitBlockResponse { state_root: GlobalRoot::default() },
-                height: task.height,
+                height: match task.0 {
+                    CommitterRequest::CommitBlock(request) => request.height,
+                    CommitterRequest::RevertBlock(request) => request.height,
+                },
             }));
             results_sender.try_send(result).unwrap();
         }