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

Fix handling of invoked ix accounts in program-test (#16170)

This commit is contained in:
Justin Starry 2021-03-29 08:42:11 +08:00 committed by GitHub
parent e50f598449
commit 27ab415ecc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
program-test/src/lib.rs
View File

@ -233,18 +233,17 @@ impl program_stubs::SyscallStubs for SyscallStubs {
let logger = invoke_context.get_logger();
let caller = *invoke_context.get_caller().expect("get_caller");
if instruction.accounts.len() + 1 != account_infos.len() {
panic!(
"Instruction accounts mismatch. Instruction contains {} accounts, with {}
AccountInfos provided",
instruction.accounts.len(),
account_infos.len()
);
}
let message = Message::new(&[instruction.clone()], None);
let program_id_index = message.instructions[0].program_id_index as usize;
let program_id = message.account_keys[program_id_index];
let program_account_info = &account_infos[program_id_index];
let program_account_info = || {
for account_info in account_infos {
if account_info.unsigned_key() == &program_id {
return account_info;
}
}
panic!("Program id {} wasn't found in account_infos", program_id);
};
// TODO don't have the caller's keyed_accounts so can't validate writer or signer escalation or deescalation yet
let caller_privileges = message
.account_keys
@ -266,18 +265,19 @@ impl program_stubs::SyscallStubs for SyscallStubs {
}
let executables = vec![(
program_id,
Rc::new(RefCell::new(ai_to_a(program_account_info))),
Rc::new(RefCell::new(ai_to_a(program_account_info()))),
)];
// Convert AccountInfos into Accounts
let mut accounts = vec![];
for key in &message.account_keys {
'outer: for key in &message.account_keys {
for account_info in account_infos {
if account_info.unsigned_key() == key {
accounts.push(Rc::new(RefCell::new(ai_to_a(account_info))));
break;
continue 'outer;
}
}
panic!("Account {} wasn't found in account_infos", key);
}
assert_eq!(
accounts.len(),