Tweaks

Author: febo

program/src/entrypoint.rs

@@ -28,15 +28,16 @@ default_panic_handler!();
 /// - `9`:  `CloseAccount`
 /// - `18`: `InitializeAccount3`
 /// - `20`: `InitializeMint2`
+/// - `255`: `Batch`
 #[inline(always)]
 pub fn process_instruction(
     _program_id: &Pubkey,
     accounts: &[AccountInfo],
     instruction_data: &[u8],
 ) -> ProgramResult {
-    let (discriminator, instruction_data) = instruction_data
-        .split_first()
-        .ok_or(ProgramError::InvalidInstructionData)?;
+    let [discriminator, instruction_data @ ..] = instruction_data else {
+        return Err(ProgramError::InvalidInstructionData);
+    };
 
     match *discriminator {
         // 0 - InitializeMint

program/src/processor/batch.rs

@@ -13,13 +13,9 @@ pub fn process_batch(mut accounts: &[AccountInfo], mut instruction_data: &[u8])
     loop {
         // Validates the instruction data and accounts offset.
 
-        match instruction_data.len() {
-            0 => break,
-            n if n < IX_HEADER_SIZE => {
-                // The instruction data must have at least two bytes.
-                return Err(ProgramError::InvalidInstructionData);
-            }
-            _ => (),
+        if instruction_data.len() < IX_HEADER_SIZE {
+            // The instruction data must have at least two bytes.
+            return Err(ProgramError::InvalidInstructionData);
         }
 
         // SAFETY: The instruction data is guaranteed to have at least two bytes.
@@ -42,6 +38,11 @@ pub fn process_batch(mut accounts: &[AccountInfo], mut instruction_data: &[u8])
             &instruction_data[IX_HEADER_SIZE..data_offset],
         )?;
 
+        if data_offset == instruction_data.len() {
+            // The batch is complete.
+            break;
+        }
+
         accounts = &accounts[expected_accounts..];
         instruction_data = &instruction_data[data_offset..];
     }

program/tests/batch.rs

@@ -2,41 +2,36 @@
 
 mod setup;
 
-use std::{
-    collections::{BTreeMap, HashMap},
-    println,
-};
-
-use pinocchio::instruction;
-use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     instruction::{AccountMeta, Instruction},
     program_error::ProgramError,
     program_pack::Pack,
     pubkey::Pubkey,
     signature::{Keypair, Signer},
-    system_instruction, system_program,
+    system_instruction,
     transaction::Transaction,
 };
 
 fn batch_instruction(instructions: Vec<Instruction>) -> Result<Instruction, ProgramError> {
-    // Create a Vector of ordered, AccountMetas
+    // Create a `Vec` of ordered `AccountMeta`s
     let mut accounts: Vec<AccountMeta> = vec![];
-    // Start with the batch discriminator and a length byte
-
+    // Start with the batch discriminator
     let mut data: Vec<u8> = vec![0xff];
+
     for instruction in instructions {
-        // Error out on non-token IX
+        // Error out on non-token IX.
         if instruction.program_id.ne(&spl_token::ID) {
             return Err(ProgramError::IncorrectProgramId);
         }
 
-        data.extend_from_slice(&[instruction.accounts.len() as u8]);
-        data.extend_from_slice(&[instruction.data.len() as u8]);
+        data.push(instruction.accounts.len() as u8);
+        data.push(instruction.data.len() as u8);
+
         data.extend_from_slice(&instruction.data);
         accounts.extend_from_slice(&instruction.accounts);
     }
+
     Ok(Instruction {
         program_id: spl_token::ID,
         data,
@@ -102,7 +97,6 @@ async fn batch(token_program: Pubkey) {
     let owner_a = Keypair::new();
     let owner_b = Keypair::new();
     let owner_a_ta_a = Keypair::new();
-    let owner_a_ta_b = Keypair::new();
     let owner_b_ta_a = Keypair::new();
 
     let create_owner_a_ta_a = system_instruction::create_account(
@@ -126,13 +120,6 @@ async fn batch(token_program: Pubkey) {
         &owner_a.pubkey(),
     )
     .unwrap();
-    let intialize_owner_a_ta_b = spl_token::instruction::initialize_account3(
-        &token_program,
-        &owner_a_ta_b.pubkey(),
-        &mint_b.pubkey(),
-        &owner_a.pubkey(),
-    )
-    .unwrap();
     let intialize_owner_b_ta_a = spl_token::instruction::initialize_account3(
         &token_program,
         &owner_b_ta_a.pubkey(),