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

Fix/system instruction processor tests (#26338) 

* Make mock_process_instruction() stricter by invoking the verify() method.

* Fixes broken test cases.
This commit is contained in:
Alexander Meißner 2022-07-01 00:06:24 +02:00 committed by GitHub
parent f14922c204
commit 72a968fbe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
program-runtime/src/invoke_context.rs
View File

@ -1196,7 +1196,8 @@ pub fn mock_process_instruction(
&program_indices,
instruction_data,
)
.and_then(|_| process_instruction(1, &mut invoke_context));
.and_then(|_| process_instruction(1, &mut invoke_context))
.and_then(|_| invoke_context.verify(&preparation.instruction_accounts, &program_indices));
invoke_context.pop().unwrap();
assert_eq!(result, expected_result);
let mut transaction_accounts = transaction_context.deconstruct_without_keys().unwrap();

6
runtime/src/system_instruction_processor.rs
View File

@ -916,7 +916,7 @@ mod tests {
#[test]
fn test_request_more_than_allowed_data_length() {
let from = Pubkey::new_unique();
let from_account = AccountSharedData::new(100, 0, &Pubkey::new_unique());
let from_account = AccountSharedData::new(100, 0, &system_program::id());
let to = Pubkey::new_unique();
let to_account = AccountSharedData::new(0, 0, &Pubkey::default());
let instruction_accounts = vec![
@ -1359,7 +1359,7 @@ mod tests {
#[test]
fn test_transfer_lamports() {
let from = Pubkey::new_unique();
let from_account = AccountSharedData::new(100, 0, &Pubkey::new(&[2; 32])); // account owner should not matter
let from_account = AccountSharedData::new(100, 0, &system_program::id());
let to = Pubkey::new(&[3; 32]);
let to_account = AccountSharedData::new(1, 0, &to); // account owner should not matter
let transaction_accounts = vec![(from, from_account), (to, to_account)];
@ -1439,7 +1439,7 @@ mod tests {
let from_seed = "42".to_string();
let from_owner = system_program::id();
let from = Pubkey::create_with_seed(&base, from_seed.as_str(), &from_owner).unwrap();
let from_account = AccountSharedData::new(100, 0, &Pubkey::new(&[2; 32])); // account owner should not matter
let from_account = AccountSharedData::new(100, 0, &system_program::id());
let to = Pubkey::new(&[3; 32]);
let to_account = AccountSharedData::new(1, 0, &to); // account owner should not matter
let transaction_accounts =