gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix Instruction and CompiledInstruction field names (#4895)

Browse Source 
* s/program_ids_index/program_id for Instruction

* s/program_ids_index/program_id_index for CompiledInstruction
This commit is contained in:
TristanDebrunner
2019-07-01 18:34:22 -06:00
committed by GitHub
parent 417066ad30
commit 091999a17e
7 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/src/accounts.rs
View File

@ -236,11 +236,11 @@ impl Accounts {
.instructions
.iter()
.map(|ix| {
if message.account_keys.len() <= ix.program_ids_index as usize {
if message.account_keys.len() <= ix.program_id_index as usize {
error_counters.account_not_found += 1;
return Err(TransactionError::AccountNotFound);
}
let program_id = message.account_keys[ix.program_ids_index as usize];
let program_id = message.account_keys[ix.program_id_index as usize];
Self::load_executable_accounts(
storage,
ancestors,

2
runtime/src/bank.rs
View File

@ -2106,7 +2106,7 @@ mod tests {
system_transaction::transfer(&mint_keypair, &keypair.pubkey(), 1, genesis_block.hash());
let mut tx_invalid_program_index = tx.clone();
tx_invalid_program_index.message.instructions[0].program_ids_index = 42;
tx_invalid_program_index.message.instructions[0].program_id_index = 42;
assert_eq!(
bank.process_transaction(&tx_invalid_program_index),
Err(TransactionError::InvalidAccountIndex)

2
runtime/src/message_processor.rs
View File

@ -260,7 +260,7 @@ impl MessageProcessor {
) -> Result<(), TransactionError> {
for (instruction_index, instruction) in message.instructions.iter().enumerate() {
let executable_index = message
.program_position(instruction.program_ids_index as usize)
.program_position(instruction.program_id_index as usize)
.ok_or(TransactionError::InvalidAccountIndex)?;
let executable_accounts = &mut loaders[executable_index];
let mut program_accounts = get_subset_unchecked_mut(accounts, &instruction.accounts)