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

executable() (#16880)

Browse Source
This commit is contained in:
Jeff Washington (jwash) 2021-04-28 08:53:54 -05:00 committed by GitHub
parent 30e83a4a3c
commit 2021255f91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/bpf_loader/src/lib.rs
View File

@ -1022,7 +1022,7 @@ mod tests {
process_instruction(&bpf_loader::id(), &instruction_data, &mut invoke_context) process_instruction(&bpf_loader::id(), &instruction_data, &mut invoke_context)
); );
let keyed_accounts = invoke_context.get_keyed_accounts().unwrap(); let keyed_accounts = invoke_context.get_keyed_accounts().unwrap();
assert!(keyed_accounts[0].account.borrow().executable); assert!(keyed_accounts[0].account.borrow().executable());
program_account.borrow_mut().executable = false; // Un-finalize the account program_account.borrow_mut().executable = false; // Un-finalize the account

8
programs/bpf_loader/src/serialization.rs
View File

@ -423,7 +423,7 @@ mod tests {
assert_eq!(account.lamports, account_info.lamports()); assert_eq!(account.lamports, account_info.lamports());
assert_eq!(account.data(), &account_info.data.borrow()[..]); assert_eq!(account.data(), &account_info.data.borrow()[..]);
assert_eq!(account.owner(), account_info.owner); assert_eq!(account.owner(), account_info.owner);
assert_eq!(account.executable, account_info.executable); assert_eq!(account.executable(), account_info.executable);
assert_eq!(account.rent_epoch(), account_info.rent_epoch); assert_eq!(account.rent_epoch(), account_info.rent_epoch);
assert_eq!( assert_eq!(
@ -471,7 +471,7 @@ mod tests {
de_keyed_account.try_account_ref().unwrap().data() de_keyed_account.try_account_ref().unwrap().data()
); );
assert_eq!(*account.owner(), de_keyed_account.owner().unwrap()); assert_eq!(*account.owner(), de_keyed_account.owner().unwrap());
assert_eq!(account.executable, de_keyed_account.executable().unwrap()); assert_eq!(account.executable(), de_keyed_account.executable().unwrap());
assert_eq!(account.rent_epoch(), de_keyed_account.rent_epoch().unwrap()); assert_eq!(account.rent_epoch(), de_keyed_account.rent_epoch().unwrap());
} }
@ -495,7 +495,7 @@ mod tests {
assert_eq!(account.lamports, account_info.lamports()); assert_eq!(account.lamports, account_info.lamports());
assert_eq!(account.data(), &account_info.data.borrow()[..]); assert_eq!(account.data(), &account_info.data.borrow()[..]);
assert_eq!(account.owner(), account_info.owner); assert_eq!(account.owner(), account_info.owner);
assert_eq!(account.executable, account_info.executable); assert_eq!(account.executable(), account_info.executable);
assert_eq!(account.rent_epoch(), account_info.rent_epoch); assert_eq!(account.rent_epoch(), account_info.rent_epoch);
} }
@ -530,7 +530,7 @@ mod tests {
de_keyed_account.try_account_ref().unwrap().data() de_keyed_account.try_account_ref().unwrap().data()
); );
assert_eq!(*account.owner(), de_keyed_account.owner().unwrap()); assert_eq!(*account.owner(), de_keyed_account.owner().unwrap());
assert_eq!(account.executable, de_keyed_account.executable().unwrap()); assert_eq!(account.executable(), de_keyed_account.executable().unwrap());
assert_eq!(account.rent_epoch(), de_keyed_account.rent_epoch().unwrap()); assert_eq!(account.rent_epoch(), de_keyed_account.rent_epoch().unwrap());
} }
} }

4
runtime/src/bank.rs
View File

@ -9993,7 +9993,7 @@ pub(crate) mod tests {
assert_eq!(result, Ok(())); assert_eq!(result, Ok(()));
let account = bank.get_account(&solana_vote_program::id()).unwrap(); let account = bank.get_account(&solana_vote_program::id()).unwrap();
info!("account: {:?}", account); info!("account: {:?}", account);
assert!(account.executable); assert!(account.executable());
} }
#[test] #[test]
@ -10298,7 +10298,7 @@ pub(crate) mod tests {
} }
for (key, name) in &program_keys { for (key, name) in &program_keys {
let account = bank.get_account(key).unwrap(); let account = bank.get_account(key).unwrap();
assert!(account.executable); assert!(account.executable());
assert_eq!(account.data(), name); assert_eq!(account.data(), name);
} }
info!("result: {:?}", result); info!("result: {:?}", result);