owner -> owner() (#16785)

This commit is contained in:
Jeff Washington (jwash)
2021-04-23 15:59:13 -05:00
committed by GitHub
parent 1500011fc6
commit 1a4a7059af
4 changed files with 8 additions and 5 deletions

View File

@ -1610,7 +1610,10 @@ mod tests {
); );
let post_programdata_account = bank.get_account(&programdata_address).unwrap(); let post_programdata_account = bank.get_account(&programdata_address).unwrap();
assert_eq!(post_programdata_account.lamports, min_programdata_balance); assert_eq!(post_programdata_account.lamports, min_programdata_balance);
assert_eq!(post_programdata_account.owner, bpf_loader_upgradeable::id()); assert_eq!(
post_programdata_account.owner(),
&bpf_loader_upgradeable::id()
);
let state: UpgradeableLoaderState = post_programdata_account.state().unwrap(); let state: UpgradeableLoaderState = post_programdata_account.state().unwrap();
assert_eq!( assert_eq!(
state, state,

View File

@ -10910,7 +10910,7 @@ pub(crate) mod tests {
bank.get_balance(&inline_spl_token_v2_0::native_mint::id()), bank.get_balance(&inline_spl_token_v2_0::native_mint::id()),
4200000000 4200000000
); );
assert_eq!(native_mint_account.owner, inline_spl_token_v2_0::id()); assert_eq!(native_mint_account.owner(), &inline_spl_token_v2_0::id());
} }
#[test] #[test]

View File

@ -537,7 +537,7 @@ mod tests {
); );
assert_eq!(from_account.borrow().lamports, 50); assert_eq!(from_account.borrow().lamports, 50);
assert_eq!(to_account.borrow().lamports, 50); assert_eq!(to_account.borrow().lamports, 50);
assert_eq!(to_account.borrow().owner, new_owner); assert_eq!(to_account.borrow().owner(), &new_owner);
assert_eq!(to_account.borrow().data(), &[0, 0]); assert_eq!(to_account.borrow().data(), &[0, 0]);
} }
@ -688,7 +688,7 @@ mod tests {
let from_lamports = from_account.borrow().lamports; let from_lamports = from_account.borrow().lamports;
let to_lamports = to_account.borrow().lamports; let to_lamports = to_account.borrow().lamports;
let to_owner = to_account.borrow().owner; let to_owner = *to_account.borrow().owner();
assert_eq!(from_lamports, 100); assert_eq!(from_lamports, 100);
assert_eq!(to_lamports, 0); assert_eq!(to_lamports, 0);
assert_eq!(to_owner, new_owner); assert_eq!(to_owner, new_owner);

View File

@ -408,7 +408,7 @@ mod test {
&MockInvokeContext::new(vec![]), &MockInvokeContext::new(vec![]),
) )
.unwrap(); .unwrap();
let pubkey = nonce_account.account.borrow().owner; let pubkey = *nonce_account.account.borrow().owner();
let nonce_account = KeyedAccount::new(&pubkey, false, nonce_account.account); let nonce_account = KeyedAccount::new(&pubkey, false, nonce_account.account);
let state = AccountUtilsState::<Versions>::state(&nonce_account) let state = AccountUtilsState::<Versions>::state(&nonce_account)
.unwrap() .unwrap()