CI is green, so let's Cleanup

Author: snawaz

magicblock-committor-service/src/tasks/args_task.rs

@@ -89,9 +89,11 @@ impl BaseTask for ArgsTask {
     ) -> Result<Box<dyn BaseTask>, Box<dyn BaseTask>> {
         match self.task_type {
             ArgsTaskType::Commit(mut value) if value.is_commit_diff() => {
-                //TODO (snawaz): We do not currently support executing CommitDiff as BufferTask, which is why we're forcing CommitTask to use CommitState before converting this task into BufferTask
-                // Once CommitDiff is supported by BufferTask, we do not have to
-                // force_commit_state.
+                // TODO (snawaz): Currently, we do not support executing CommitDiff
+                // as BufferTask, which is why we're forcing CommitTask to use CommitState
+                // before converting this task into BufferTask Once CommitDiff is supported
+                // by BufferTask, we do not have to force_commit_state and we can remove
+                // force_commit_state stuff, as it's essentially a downgrade.
 
                 value.force_commit_state();
                 Ok(Box::new(BufferTask::new_preparation_required(

magicblock-committor-service/src/tasks/mod.rs

@@ -114,6 +114,8 @@ pub struct CommitTask {
 }
 
 impl CommitTask {
+    // Accounts larger than COMMIT_STATE_SIZE_THRESHOLD, use CommitDiff to
+    // reduce instruction size. Below this, commit is sent as CommitState.
     const COMMIT_STATE_SIZE_THRESHOLD: usize = 200;
 
     pub fn new(
@@ -124,8 +126,9 @@ impl CommitTask {
         let fetched_account = if committed_account.account.data.len()
             > CommitTask::COMMIT_STATE_SIZE_THRESHOLD
         {
-            // TODO (snawaz): it is the most ugliest piece of code as it is making network call,
-            // and I'll soon fix it in a separate PR that will use caching of base-accounts.
+            // TODO (snawaz): it is the most ugliest piece of code as it is making
+            // network call and that too, a blocking one, and I'll soon fix it in a
+            // separate PR that will use caching of base-accounts.
             use solana_rpc_client::rpc_client::RpcClient;
             use solana_sdk::commitment_config::CommitmentConfig;
 
@@ -146,8 +149,6 @@ impl CommitTask {
             None
         };
 
-        println!("fetched_account: {:#?}", fetched_account);
-
         Self {
             commit_id,
             allow_undelegation,
@@ -183,7 +184,6 @@ impl CommitTask {
             data: self.committed_account.account.data.clone(),
             allow_undelegation: self.allow_undelegation,
         };
-        println!("create_commit_state_ix, data: {}", args.data.len());
         dlp::instruction_builder::commit_state(
             *validator,
             self.committed_account.pubkey,
@@ -198,9 +198,6 @@ impl CommitTask {
         fetched_account: &Account,
     ) -> Instruction {
         if self.force_commit_state {
-            println!(
-                "force_commit_state is true, so call create_commit_state_ix"
-            );
             return self.create_commit_state_ix(validator);
         }
 
@@ -214,7 +211,6 @@ impl CommitTask {
             .to_vec(),
             allow_undelegation: self.allow_undelegation,
         };
-        println!("create_commit_diff_ix, diff: {}", args.diff.len());
 
         dlp::instruction_builder::commit_diff(
             *validator,

magicblock-committor-service/src/tasks/task_strategist.rs

@@ -95,7 +95,6 @@ impl TaskStrategist {
                 lookup_tables_keys,
             })
         } else {
-            println!("snawaz: inside build_strategy");
             Err(TaskStrategistError::FailedToFitError)
         }
     }
@@ -166,10 +165,7 @@ impl TaskStrategist {
                 &[],
             ) {
                 Ok(tx) => Ok(serialize_and_encode_base64(&tx).len()),
-                Err(TaskStrategistError::FailedToFitError) => {
-                    println!("snawaz: inside optimize_strategy");
-                    Ok(usize::MAX)
-                }
+                Err(TaskStrategistError::FailedToFitError) => Ok(usize::MAX),
                 Err(TaskStrategistError::SignerError(err)) => Err(err),
             }
         };

test-integration/test-committor-service/tests/test_delivery_preparator.rs

@@ -19,9 +19,7 @@ mod common;
 // # see the PR #575 for more context.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_prepare_10kb_buffer() {
-    println!("TestFixture::new()");
     let fixture = TestFixture::new().await;
-    println!("TestFixture::new() done");
     let preparator = fixture.create_delivery_preparator();
 
     let data = generate_random_bytes(10 * 1024);

test-integration/test-tools/src/integration_test_context.rs

@@ -166,6 +166,8 @@ impl IntegrationTestContext {
                 RpcTransactionConfig {
                     commitment: Some(self.commitment),
                     max_supported_transaction_version: if label == "chain" {
+                        // base chain cluster requires explicit v0 support,
+                        // while ephemeral uses default version handling
                         Some(0)
                     } else {
                         None