blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nit: better rust (#21058)

This commit is contained in:
Jack May 2021-10-28 17:13:42 -07:00 committed by GitHub
parent 3140d7741c
commit e16c060abf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/bpf/rust/invoke/src/processor.rs
View File

@ -396,9 +396,9 @@ fn process_instruction(
);
// put the relavant account at the end of a larger account list
let mut reordered_accounts = accounts.to_vec();
let ai = reordered_accounts.remove(FROM_INDEX);
let account_info = reordered_accounts.remove(FROM_INDEX);
reordered_accounts.push(accounts[0].clone());
reordered_accounts.push(ai);
reordered_accounts.push(account_info);
invoke(&instruction, &reordered_accounts)?;
}
}

19
programs/bpf_loader/src/syscalls.rs
View File

@ -2041,18 +2041,14 @@ where
// index starts at first instruction account
index - keyed_accounts.len().saturating_sub(orig_data_lens.len())
})
.and_then(|index| {
if index >= orig_data_lens.len() {
None
} else {
Some(index)
}
})
{
if orig_data_len_index >= orig_data_lens.len() {
ic_msg!(
invoke_context,
"Internal error: index mismatch for account {}",
account_key
);
return Err(SyscallError::InstructionError(
InstructionError::MissingAccount,
)
.into());
}
caller_account.original_data_len = orig_data_lens[orig_data_len_index];
} else {
ic_msg!(
@ -2065,6 +2061,7 @@ where
)
.into());
}
Some(caller_account)
} else {
None