refactor: Simplify Task types

magicblock-committor-service/README.md

@@ -23,18 +23,18 @@ IntentExecutor - responsible for execution of Intent. Calls  **TransactionPrepar
 TransactionPreparator - is an entity that handles all of the above "Transaction preparation" calling **TaskBuilderV1**,  **TaskStrategist**, **DeliveryPreparator** and then assempling it all and passing to **MessageExecutor**
 
 ## DeliveryPreparator
-After our **BaseTask**s are ready we need to prepare eveything for their successful execution. **DeliveryPreparator** - handles ALTs and commit buffers
+After our **Task**s are ready we need to prepare eveything for their successful execution. **DeliveryPreparator** - handles ALTs and commit buffers
 
 ## TaskBuilder
 First, lets build atomic tasks from scheduled message/intent.
 
-High level: TaskBuilder responsible for creating BaseTasks(to be renamed...) from ScheduledBaseIntent(to be renamed...).
+High level: TaskBuilder responsible for creating Tasks(to be renamed...) from ScheduledBaseIntent(to be renamed...).
 Details: To do that is requires additional information from DelegationMetadata, it is provided **CommitIdFetcher**
 
-### BaseTask
-High level: BaseTask - is an atomic operation that is to be performed on the Base layer, like: Commit, Undelegate, Finalize, Action.
+### Task
+High level: Task - is an atomic operation that is to be performed on the Base layer, like: Commit, Undelegate, Finalize, Action.
 
-Details: There's to implementation of BaseTask: ArgsTask, BufferTask. ArgsTask - gives instruction using args. BufferTask - gives instruction using buffer. BufferTask at the moment supports only commits
+Details: There's to implementation of Task: ArgsTask, BufferTask. ArgsTask - gives instruction using args. BufferTask - gives instruction using buffer. BufferTask at the moment supports only commits
 
 ### TaskInfoFetcher
 High level: for account to be accepted by `dlp` it needs to have incremental commit ids. TaskInfoFetcher provides a user with the correct ids/nonces for set of committees

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

@@ -12,7 +12,7 @@ use solana_sdk::{
 use crate::{
     tasks::{
         task_builder::TaskBuilderError, task_strategist::TaskStrategistError,
-        BaseTask, TaskType,
+        Task, TaskType,
     },
     transaction_preparator::error::TransactionPreparatorError,
 };
@@ -138,7 +138,7 @@ impl TransactionStrategyExecutionError {
     pub fn try_from_transaction_error(
         err: TransactionError,
         signature: Option<Signature>,
-        tasks: &[Box<dyn BaseTask>],
+        tasks: &[Task],
     ) -> Result<Self, TransactionError> {
         // There's always 2 budget instructions in front
         const OFFSET: u8 = 2;
@@ -196,7 +196,7 @@ impl TransactionStrategyExecutionError {
 }
 
 pub(crate) struct IntentTransactionErrorMapper<'a> {
-    pub tasks: &'a [Box<dyn BaseTask>],
+    pub tasks: &'a [Task],
 }
 impl TransactionErrorMapper for IntentTransactionErrorMapper<'_> {
     type ExecutionError = TransactionStrategyExecutionError;

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

@@ -53,7 +53,7 @@ use crate::{
             TaskStrategist, TaskStrategistError, TransactionStrategy,
         },
         task_visitors::utility_visitor::TaskVisitorUtils,
-        BaseTask, TaskType,
+        Task, TaskType,
     },
     transaction_preparator::{
         error::TransactionPreparatorError, TransactionPreparator,
@@ -127,8 +127,8 @@ where
     /// Checks if it is possible to unite Commit & Finalize stages in 1 transaction
     /// Returns corresponding `TransactionStrategy` if possible, otherwise `None`
     fn try_unite_tasks<P: IntentPersister>(
-        commit_tasks: &[Box<dyn BaseTask>],
-        finalize_task: &[Box<dyn BaseTask>],
+        commit_tasks: &[Task],
+        finalize_task: &[Task],
         authority: &Pubkey,
         persister: &Option<P>,
     ) -> Result<Option<TransactionStrategy>, SignerError> {
@@ -179,7 +179,7 @@ where
         }
 
         // Build tasks for commit stage
-        let commit_tasks = TaskBuilderImpl::commit_tasks(
+        let commit_tasks = TaskBuilderImpl::create_commit_tasks(
             &self.task_info_fetcher,
             &base_intent,
             persister,
@@ -626,7 +626,7 @@ where
     async fn execute_message_with_retries(
         &self,
         prepared_message: VersionedMessage,
-        tasks: &[Box<dyn BaseTask>],
+        tasks: &[Task],
     ) -> IntentExecutorResult<Signature, TransactionStrategyExecutionError>
     {
         struct IntentErrorMapper<TxMap> {
@@ -837,7 +837,7 @@ mod tests {
         let intent = create_test_intent(0, &pubkey);
 
         let info_fetcher = Arc::new(MockInfoFetcher);
-        let commit_task = TaskBuilderImpl::commit_tasks(
+        let commit_task = TaskBuilderImpl::create_commit_tasks(
             &info_fetcher,
             &intent,
             &None::<IntentPersisterImpl>,