fix/remove merge-related issues

Author: snawaz

magicblock-committor-service/src/intent_execution_manager/intent_execution_engine.rs

@@ -823,25 +823,5 @@ mod tests {
         async fn cleanup(self) -> Result<(), BufferExecutionError> {
             Ok(())
         }
-
-        async fn fetch_rent_reimbursements(
-            &self,
-            pubkeys: &[Pubkey],
-        ) -> TaskInfoFetcherResult<Vec<Pubkey>> {
-            Ok(pubkeys.iter().map(|_| Pubkey::new_unique()).collect())
-        }
-
-        fn peek_commit_id(&self, _pubkey: &Pubkey) -> Option<u64> {
-            None
-        }
-
-        fn reset(&self, _: ResetType) {}
-
-        async fn get_base_account(
-            &self,
-            _pubkey: &Pubkey,
-        ) -> MagicBlockRpcClientResult<Option<Account>> {
-            Ok(None) // AccountNotFound
-        }
     }
 }

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

@@ -815,88 +815,3 @@ where
         try_join_all(cleanup_futs).await.map(|_| ())
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::{collections::HashMap, sync::Arc};
-
-    use magicblock_rpc_client::MagicBlockRpcClientResult;
-    use solana_account::Account;
-    use solana_pubkey::Pubkey;
-
-    use crate::{
-        intent_execution_manager::intent_scheduler::create_test_intent,
-        intent_executor::{
-            task_info_fetcher::{
-                ResetType, TaskInfoFetcher, TaskInfoFetcherResult,
-            },
-            IntentExecutorImpl,
-        },
-        persist::IntentPersisterImpl,
-        tasks::task_builder::{TaskBuilderImpl, TasksBuilder},
-        transaction_preparator::TransactionPreparatorImpl,
-    };
-
-    struct MockInfoFetcher;
-    #[async_trait::async_trait]
-    impl TaskInfoFetcher for MockInfoFetcher {
-        async fn fetch_next_commit_ids(
-            &self,
-            pubkeys: &[Pubkey],
-        ) -> TaskInfoFetcherResult<HashMap<Pubkey, u64>> {
-            Ok(pubkeys.iter().map(|pubkey| (*pubkey, 0)).collect())
-        }
-
-        async fn fetch_rent_reimbursements(
-            &self,
-            pubkeys: &[Pubkey],
-        ) -> TaskInfoFetcherResult<Vec<Pubkey>> {
-            Ok(pubkeys.iter().map(|_| Pubkey::new_unique()).collect())
-        }
-
-        fn peek_commit_id(&self, _pubkey: &Pubkey) -> Option<u64> {
-            Some(0)
-        }
-
-        fn reset(&self, _: ResetType) {}
-
-        async fn get_base_account(
-            &self,
-            _pubkey: &Pubkey,
-        ) -> MagicBlockRpcClientResult<Option<Account>> {
-            Ok(None) // AccountNotFound
-        }
-    }
-
-    #[tokio::test]
-    async fn test_try_unite() {
-        let pubkey = [Pubkey::new_unique()];
-        let intent = create_test_intent(0, &pubkey);
-
-        let info_fetcher = Arc::new(MockInfoFetcher);
-        let commit_task = TaskBuilderImpl::commit_tasks(
-            &info_fetcher,
-            &intent,
-            &None::<IntentPersisterImpl>,
-        )
-        .await
-        .unwrap();
-        let finalize_task =
-            TaskBuilderImpl::finalize_tasks(&info_fetcher, &intent)
-                .await
-                .unwrap();
-
-        let result = IntentExecutorImpl::<
-            TransactionPreparatorImpl,
-            MockInfoFetcher,
-        >::try_unite_tasks(
-            &commit_task,
-            &finalize_task,
-            &Pubkey::new_unique(),
-            &None::<IntentPersisterImpl>,
-        );
-
-        let strategy = result.unwrap().unwrap();
-        assert!(strategy.lookup_tables_keys.is_empty());
-    }
-}

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

@@ -1,9 +1,5 @@
-use dlp::{
-    args::{CallHandlerArgs, CommitDiffArgs, CommitStateArgs},
-    compute_diff,
-};
+use dlp::args::CallHandlerArgs;
 use magicblock_metrics::metrics::LabelValue;
-use solana_account::ReadableAccount;
 use solana_instruction::{AccountMeta, Instruction};
 use solana_pubkey::Pubkey;