try to run integ tests

Author: snawaz

Cargo.lock

@@ -124,10 +124,10 @@ magicblock-config = { path = "./magicblock-config" }
 magicblock-config-helpers = { path = "./magicblock-config-helpers" }
 magicblock-config-macro = { path = "./magicblock-config-macro" }
 magicblock-core = { path = "./magicblock-core" }
-magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "5fb8d20", features = [
-  "no-entrypoint",
-] }
-#magicblock-delegation-program = { path="../delegation-program", features = ["no-entrypoint"] }
+# magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "5fb8d20", features = [
+#   "no-entrypoint",
+# ] }
+magicblock-delegation-program = { path="../delegation-program", features = ["no-entrypoint"] }
 magicblock-geyser-plugin = { path = "./magicblock-geyser-plugin" }
 magicblock-ledger = { path = "./magicblock-ledger" }
 magicblock-metrics = { path = "./magicblock-metrics" }

Cargo.toml

@@ -119,7 +119,7 @@ impl TransactionStrategyExecutionError {
     ) -> Self {
         // There's always 2 budget instructions in front
         const OFFSET: u8 = 2;
-        const OUTDATED_SLOT: u32 = dlp::error::DlpError::OutdatedSlot as u32;
+        const OUTDATED_SLOT: u32 = dlp::error::DlpError::NonceOutOfOrder as u32;
 
         match err {
             // Filter CommitIdError by custom error code

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

@@ -48,31 +48,32 @@ impl TasksBuilder for TaskBuilderImpl {
         base_intent: &ScheduledBaseIntent,
         persister: &Option<P>,
     ) -> TaskBuilderResult<Vec<Box<dyn BaseTask>>> {
-        let (accounts, allow_undelegation) = match &base_intent.base_intent {
-            MagicBaseIntent::BaseActions(actions) => {
-                let tasks = actions
-                    .iter()
-                    .map(|el| {
-                        let task = BaseActionTask {
-                            context: Context::Standalone,
-                            action: el.clone(),
-                        };
-                        let task =
-                            ArgsTask::new(ArgsTaskType::BaseAction(task));
-                        Box::new(task) as Box<dyn BaseTask>
-                    })
-                    .collect();
-                return Ok(tasks);
-            }
-            MagicBaseIntent::Commit(t) => {
-                (t.get_committed_accounts(), false, t.is_commit_diff())
-            }
-            MagicBaseIntent::CommitAndUndelegate(t) => (
-                t.commit_action.get_committed_accounts(),
-                true,
-                t.commit_action.is_commit_diff(),
-            ),
-        };
+        let (accounts, allow_undelegation, commit_diff) =
+            match &base_intent.base_intent {
+                MagicBaseIntent::BaseActions(actions) => {
+                    let tasks = actions
+                        .iter()
+                        .map(|el| {
+                            let task = BaseActionTask {
+                                context: Context::Standalone,
+                                action: el.clone(),
+                            };
+                            let task =
+                                ArgsTask::new(ArgsTaskType::BaseAction(task));
+                            Box::new(task) as Box<dyn BaseTask>
+                        })
+                        .collect();
+                    return Ok(tasks);
+                }
+                MagicBaseIntent::Commit(t) => {
+                    (t.get_committed_accounts(), false, t.is_commit_diff())
+                }
+                MagicBaseIntent::CommitAndUndelegate(t) => (
+                    t.commit_action.get_committed_accounts(),
+                    true,
+                    t.commit_action.is_commit_diff(),
+                ),
+            };
 
         let committed_pubkeys = accounts
             .iter()