Remove parameter from constructor

ledger-tool/src/program.rs

@@ -408,7 +408,7 @@ pub fn program(ledger_path: &Path, matches: &ArgMatches<'_>) {
                 pubkey,
                 AccountSharedData::new(0, allocation_size, &Pubkey::new_unique()),
             ));
-            instruction_accounts.push(InstructionAccount::new(0, 0, false, true));
+            instruction_accounts.push(InstructionAccount::new(0, false, true));
             vec![]
         }
         Err(_) => {
@@ -480,7 +480,6 @@ pub fn program(ledger_path: &Path, matches: &ArgMatches<'_>) {
                         idx
                     };
                     InstructionAccount::new(
-                        txn_acct_index as IndexOfAccount,
                         txn_acct_index as IndexOfAccount,
                         account_info.is_signer.unwrap_or(false),
                         account_info.is_writable.unwrap_or(false),

program-runtime/src/invoke_context.rs

@@ -334,8 +334,7 @@ impl<'a> InvokeContext<'a> {
             let instruction_context = self.transaction_context.get_current_instruction_context()?;
             debug_assert!(instruction.accounts.len() <= u8::MAX as usize);
 
-            for (instruction_account_index, account_meta) in instruction.accounts.iter().enumerate()
-            {
+            for account_meta in instruction.accounts.iter() {
                 let index_in_transaction = self
                     .transaction_context
                     .find_index_of_account(&account_meta.pubkey)
@@ -371,7 +370,6 @@ impl<'a> InvokeContext<'a> {
                     *index_in_callee = instruction_accounts.len() as u8;
                     instruction_accounts.push(InstructionAccount::new(
                         index_in_transaction,
-                        instruction_account_index as IndexOfAccount,
                         account_meta.is_signer,
                         account_meta.is_writable,
                     ));
@@ -498,7 +496,6 @@ impl<'a> InvokeContext<'a> {
             let index_in_transaction = *index_in_transaction as usize;
             instruction_accounts.push(InstructionAccount::new(
                 index_in_transaction as IndexOfAccount,
-                *index_in_callee as IndexOfAccount,
                 message.is_signer(index_in_transaction),
                 message.is_writable(index_in_transaction),
             ));
@@ -883,23 +880,14 @@ pub fn mock_process_instruction_with_feature_set<
 ) -> Vec<AccountSharedData> {
     let mut instruction_accounts: Vec<InstructionAccount> =
         Vec::with_capacity(instruction_account_metas.len());
-    for (instruction_account_index, account_meta) in instruction_account_metas.iter().enumerate() {
+    for account_meta in instruction_account_metas.iter() {
         let index_in_transaction = transaction_accounts
             .iter()
             .position(|(key, _account)| *key == account_meta.pubkey)
             .unwrap_or(transaction_accounts.len())
             as IndexOfAccount;
-        let index_in_callee = instruction_accounts
-            .get(0..instruction_account_index)
-            .unwrap()
-            .iter()
-            .position(|instruction_account| {
-                instruction_account.index_in_transaction == index_in_transaction
-            })
-            .unwrap_or(instruction_account_index) as IndexOfAccount;
         instruction_accounts.push(InstructionAccount::new(
             index_in_transaction,
-            index_in_callee,
             account_meta.is_signer,
             account_meta.is_writable,
         ));
@@ -1017,12 +1005,7 @@ mod tests {
             let program_id = instruction_context.get_last_program_key(transaction_context)?;
             let instruction_accounts = (0..4)
                 .map(|instruction_account_index| {
-                    InstructionAccount::new(
-                        instruction_account_index,
-                        instruction_account_index,
-                        false,
-                        false,
-                    )
+                    InstructionAccount::new(instruction_account_index, false, false)
                 })
                 .collect::<Vec<_>>();
             assert_eq!(
@@ -1126,7 +1109,6 @@ mod tests {
             ));
             instruction_accounts.push(InstructionAccount::new(
                 index as IndexOfAccount,
-                instruction_accounts.len() as IndexOfAccount,
                 false,
                 true,
             ));
@@ -1137,7 +1119,6 @@ mod tests {
                 AccountSharedData::new(1, 1, &solana_pubkey::Pubkey::default()),
             ));
             instruction_accounts.push(InstructionAccount::new(
-                index as IndexOfAccount,
                 index as IndexOfAccount,
                 false,
                 false,
@@ -1214,7 +1195,6 @@ mod tests {
         let instruction_accounts = (0..4)
             .map(|instruction_account_index| {
                 InstructionAccount::new(
-                    instruction_account_index,
                     instruction_account_index,
                     false,
                     instruction_account_index < 2,
@@ -1271,7 +1251,6 @@ mod tests {
         let instruction_accounts = (0..4)
             .map(|instruction_account_index| {
                 InstructionAccount::new(
-                    instruction_account_index,
                     instruction_account_index,
                     false,
                     instruction_account_index < 2,
@@ -1361,8 +1340,8 @@ mod tests {
             (program_key, program_account),
         ];
         let instruction_accounts = vec![
-            InstructionAccount::new(0, 0, false, true),
-            InstructionAccount::new(1, 1, false, false),
+            InstructionAccount::new(0, false, true),
+            InstructionAccount::new(1, false, false),
         ];
         with_mock_invoke_context!(invoke_context, transaction_context, transaction_accounts);
         let mut program_cache_for_tx_batch = ProgramCacheForTxBatch::default();

program-runtime/src/serialization.rs

@@ -624,15 +624,8 @@ mod tests {
             .iter()
             .enumerate()
             .map(|(index_in_instruction, index_in_transaction)| {
-                let index_in_callee = transaction_indexes
-                    .get(0..index_in_instruction)
-                    .unwrap()
-                    .iter()
-                    .position(|account_index| account_index == index_in_transaction)
-                    .unwrap_or(index_in_instruction);
                 InstructionAccount::new(
                     *index_in_transaction,
-                    index_in_callee as IndexOfAccount,
                     false,
                     is_writable(index_in_instruction),
                 )

programs/bpf_loader/benches/serialization.rs

@@ -5,7 +5,7 @@ use {
     solana_pubkey::Pubkey,
     solana_rent::Rent,
     solana_sdk_ids::{bpf_loader, bpf_loader_deprecated},
-    solana_transaction_context::{IndexOfAccount, InstructionAccount, TransactionContext},
+    solana_transaction_context::{InstructionAccount, TransactionContext},
 };
 
 fn create_inputs(owner: Pubkey, num_instruction_accounts: usize) -> TransactionContext {
@@ -89,13 +89,8 @@ fn create_inputs(owner: Pubkey, num_instruction_accounts: usize) -> TransactionC
         .take(num_instruction_accounts)
         .enumerate()
     {
-        let index_in_callee = instruction_accounts
-            .iter()
-            .position(|account| account.index_in_transaction == index_in_transaction)
-            .unwrap_or(instruction_account_index) as IndexOfAccount;
         instruction_accounts.push(InstructionAccount::new(
             index_in_transaction,
-            index_in_callee,
             false,
             instruction_account_index >= 4,
         ));

programs/sbf/benches/bpf_loader.rs

@@ -61,7 +61,7 @@ macro_rules! with_mock_invoke_context {
                 AccountSharedData::new(2, $account_size, &program_key),
             ),
         ];
-        let instruction_accounts = vec![InstructionAccount::new(2, 0, false, true)];
+        let instruction_accounts = vec![InstructionAccount::new(2, false, true)];
         solana_program_runtime::with_mock_invoke_context!(
             $invoke_context,
             transaction_context,

programs/system/src/system_instruction.rs

@@ -294,8 +294,8 @@ mod test {
                 (system_program::id(), AccountSharedData::default()),
             ];
             let $instruction_accounts = vec![
-                InstructionAccount::new(0, 0, true, true),
-                InstructionAccount::new(1, 1, false, true),
+                InstructionAccount::new(0, true, true),
+                InstructionAccount::new(1, false, true),
             ];
             with_mock_invoke_context!($invoke_context, transaction_context, transaction_accounts);
         };

programs/vote/src/vote_state/mod.rs

@@ -1169,7 +1169,7 @@ mod tests {
         let mut instruction_context = InstructionContext::default();
         instruction_context.configure_for_tests(
             vec![0],
-            vec![InstructionAccount::new(1, 0, false, true)],
+            vec![InstructionAccount::new(1, false, true)],
             &[],
         );
 
@@ -1318,7 +1318,7 @@ mod tests {
         let mut instruction_context = InstructionContext::default();
         instruction_context.configure_for_tests(
             vec![0],
-            vec![InstructionAccount::new(1, 0, false, true)],
+            vec![InstructionAccount::new(1, false, true)],
             &[],
         );
 

syscalls/src/cpi.rs

@@ -1309,11 +1309,9 @@ mod tests {
             let instruction_data = $instruction_data;
             let instruction_accounts = $instruction_accounts
                 .iter()
-                .enumerate()
-                .map(|(index_in_callee, index_in_transaction)| {
+                .map(|index_in_transaction| {
                     InstructionAccount::new(
                         *index_in_transaction as IndexOfAccount,
-                        index_in_callee as IndexOfAccount,
                         false,
                         $transaction_accounts[*index_in_transaction as usize].2,
                     )
@@ -1857,8 +1855,8 @@ mod tests {
             .configure_for_tests(
                 vec![0],
                 vec![
-                    InstructionAccount::new(1, 0, false, true),
-                    InstructionAccount::new(1, 0, false, true),
+                    InstructionAccount::new(1, false, true),
+                    InstructionAccount::new(1, false, true),
                 ],
                 &[],
             );

syscalls/src/lib.rs

@@ -4448,7 +4448,6 @@ mod tests {
             {
                 let instruction_accounts = vec![InstructionAccount::new(
                     index_in_trace.saturating_add(1) as IndexOfAccount,
-                    0,
                     false,
                     false,
                 )];

transaction-context/src/lib.rs

@@ -69,7 +69,6 @@ pub struct InstructionAccount {
 impl InstructionAccount {
     pub fn new(
         index_in_transaction: IndexOfAccount,
-        _index_in_callee: IndexOfAccount,
         is_signer: bool,
         is_writable: bool,
     ) -> InstructionAccount {