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

owner -> owner() (#16782)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-04-23 17:49:47 -05:00
committed by GitHub
parent 1a4a7059af
commit ca14c18998
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1826,7 +1826,7 @@ fn get_upgradeable_executable(
program_account: &Rc<RefCell<AccountSharedData>>,
invoke_context: &Ref<&mut dyn InvokeContext>,
) -> Result<Option<(Pubkey, Rc<RefCell<AccountSharedData>>)>, EbpfError<BpfError>> {
if program_account.borrow().owner == bpf_loader_upgradeable::id() {
if program_account.borrow().owner() == &bpf_loader_upgradeable::id() {
match program_account.borrow().state() {
Ok(UpgradeableLoaderState::Program {
programdata_address,
@ -1992,7 +1992,7 @@ fn call<'a>(
if let Some(account_ref) = account_ref {
if message.is_writable(i, demote_sysvar_write_locks) && !account.executable {
*account_ref.lamports = account.lamports;
*account_ref.owner = account.owner;
*account_ref.owner = *account.owner();
if account_ref.data.len() != account.data().len() {
if !account_ref.data.is_empty() {
// Only support for `CreateAccount` at this time.

2
programs/budget/src/budget_processor.rs
View File

@ -572,7 +572,7 @@ mod tests {
&bob_pubkey,
&budget_pubkey,
&game_pubkey,
&game_account.owner,
game_account.owner(),
game_hash,
41,
);