add tests

Author: snawaz

test-integration/programs/schedulecommit/src/api.rs

@@ -10,7 +10,7 @@ use solana_program::{
 
 use crate::{
     BookUpdate, DelegateCpiArgs, DelegateOrderBookArgs, ScheduleCommitCpiArgs,
-    ScheduleCommitInstruction,
+    ScheduleCommitInstruction, ScheduleCommitType,
 };
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
@@ -212,11 +212,12 @@ pub fn update_order_book_instruction(
     )
 }
 
-pub fn schedule_commit_diff_instruction_for_order_book(
+pub fn schedule_commit_instruction_for_order_book(
     payer: Pubkey,
     order_book: Pubkey,
     magic_program_id: Pubkey,
     magic_context_id: Pubkey,
+    commit_type: ScheduleCommitType,
 ) -> Instruction {
     let program_id = crate::id();
     let account_metas = vec![
@@ -228,7 +229,7 @@ pub fn schedule_commit_diff_instruction_for_order_book(
 
     Instruction::new_with_borsh(
         program_id,
-        &ScheduleCommitInstruction::ScheduleCommitForOrderBook,
+        &ScheduleCommitInstruction::ScheduleCommitForOrderBook(commit_type),
         account_metas,
     )
 }

test-integration/programs/schedulecommit/src/lib.rs

@@ -160,7 +160,14 @@ pub enum ScheduleCommitInstruction {
     UpdateOrderBook(BookUpdate),
 
     /// ScheduleCommitDiffCpi
-    ScheduleCommitForOrderBook,
+    ScheduleCommitForOrderBook(ScheduleCommitType),
+}
+
+#[derive(BorshSerialize, BorshDeserialize, Debug, Clone)]
+pub enum ScheduleCommitType {
+    CommitAndUndelegate,
+    CommitFinalize,
+    CommitFinalizeAndUndelegate,
 }
 
 pub fn process_instruction<'a>(
@@ -217,8 +224,8 @@ pub fn process_instruction<'a>(
         }
         DelegateOrderBook(args) => process_delegate_order_book(accounts, args),
         UpdateOrderBook(args) => process_update_order_book(accounts, args),
-        ScheduleCommitForOrderBook => {
-            process_schedulecommit_for_orderbook(accounts)
+        ScheduleCommitForOrderBook(commit_type) => {
+            process_schedulecommit_for_orderbook(accounts, commit_type)
         }
     }
 }
@@ -451,6 +458,7 @@ fn process_update_order_book<'a>(
 // -----------------
 pub fn process_schedulecommit_for_orderbook(
     accounts: &[AccountInfo],
+    commit_type: ScheduleCommitType,
 ) -> Result<(), ProgramError> {
     msg!("Processing schedulecommit (for orderbook) instruction");
 
@@ -461,12 +469,32 @@ pub fn process_schedulecommit_for_orderbook(
 
     assert_is_signer(payer, "payer")?;
 
-    commit_finalize_and_undelegate_accounts(
-        payer,
-        vec![order_book_account],
-        magic_context,
-        magic_program,
-    )?;
+    match commit_type {
+        ScheduleCommitType::CommitAndUndelegate => {
+            commit_and_undelegate_accounts(
+                payer,
+                vec![order_book_account],
+                magic_context,
+                magic_program,
+            )?;
+        }
+        ScheduleCommitType::CommitFinalize => {
+            commit_finalize_accounts(
+                payer,
+                vec![order_book_account],
+                magic_context,
+                magic_program,
+            )?;
+        }
+        ScheduleCommitType::CommitFinalizeAndUndelegate => {
+            commit_finalize_and_undelegate_accounts(
+                payer,
+                vec![order_book_account],
+                magic_context,
+                magic_program,
+            )?;
+        }
+    };
 
     Ok(())
 }
@@ -578,19 +606,14 @@ pub fn process_schedulecommit_cpi(
 
     if args.undelegate {
         // TODO (snawaz): temporary change. UNDO THIS
-        commit_finalize_and_undelegate_accounts(
+        commit_and_undelegate_accounts(
             payer,
             committees,
             magic_context,
             magic_program,
         )?;
     } else {
-        commit_finalize_accounts(
-            payer,
-            committees,
-            magic_context,
-            magic_program,
-        )?;
+        commit_accounts(payer, committees, magic_context, magic_program)?;
     }
 
     Ok(())