make AccountSharedData.data private to abstract storage (#16091)
* format * 2 more tests * use
This commit is contained in:
parent
43a116a84e
commit
66c42f62d8
|
@ -22,7 +22,7 @@ use solana_runtime::{
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use solana_sdk::{
|
use solana_sdk::{
|
||||||
account::AccountSharedData,
|
account::{AccountSharedData, ReadableAccount},
|
||||||
bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,
|
bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,
|
||||||
client::SyncClient,
|
client::SyncClient,
|
||||||
clock::{DEFAULT_SLOTS_PER_EPOCH, MAX_PROCESSING_AGE},
|
clock::{DEFAULT_SLOTS_PER_EPOCH, MAX_PROCESSING_AGE},
|
||||||
|
@ -990,10 +990,10 @@ fn test_program_bpf_invoke_sanity() {
|
||||||
assert_eq!(invoke_program_id, account.owner);
|
assert_eq!(invoke_program_id, account.owner);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
MAX_PERMITTED_DATA_INCREASE,
|
MAX_PERMITTED_DATA_INCREASE,
|
||||||
bank.get_account(&derived_key1).unwrap().data.len()
|
bank.get_account(&derived_key1).unwrap().data().len()
|
||||||
);
|
);
|
||||||
for i in 0..20 {
|
for i in 0..20 {
|
||||||
assert_eq!(i as u8, account.data[i]);
|
assert_eq!(i as u8, account.data()[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Attempt to realloc into unauthorized address space
|
// Attempt to realloc into unauthorized address space
|
||||||
|
|
|
@ -1561,7 +1561,7 @@ mod tests {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn truncate_data(account: &mut AccountSharedData, len: usize) {
|
fn truncate_data(account: &mut AccountSharedData, len: usize) {
|
||||||
let mut data = account.data.to_vec();
|
let mut data = account.data().to_vec();
|
||||||
data.truncate(len);
|
data.truncate(len);
|
||||||
account.set_data(data);
|
account.set_data(data);
|
||||||
}
|
}
|
||||||
|
@ -3290,7 +3290,11 @@ mod tests {
|
||||||
);
|
);
|
||||||
assert_eq!(0, buffer_account.borrow().lamports());
|
assert_eq!(0, buffer_account.borrow().lamports());
|
||||||
assert_eq!(2, recipient_account.borrow().lamports());
|
assert_eq!(2, recipient_account.borrow().lamports());
|
||||||
assert!(buffer_account.borrow().data.iter().all(|&value| value == 0));
|
assert!(buffer_account
|
||||||
|
.borrow()
|
||||||
|
.data()
|
||||||
|
.iter()
|
||||||
|
.all(|&value| value == 0));
|
||||||
|
|
||||||
// Case: close with wrong authority
|
// Case: close with wrong authority
|
||||||
buffer_account
|
buffer_account
|
||||||
|
|
|
@ -448,7 +448,7 @@ mod tests {
|
||||||
assert_eq!(account.lamports, de_keyed_account.lamports().unwrap());
|
assert_eq!(account.lamports, de_keyed_account.lamports().unwrap());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
&account.data()[..],
|
&account.data()[..],
|
||||||
&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());
|
||||||
|
@ -507,7 +507,7 @@ mod tests {
|
||||||
assert_eq!(account.lamports, de_keyed_account.lamports().unwrap());
|
assert_eq!(account.lamports, de_keyed_account.lamports().unwrap());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
&account.data()[..],
|
&account.data()[..],
|
||||||
&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());
|
||||||
|
|
|
@ -413,7 +413,7 @@ pub mod tests {
|
||||||
|
|
||||||
// Vote account too big
|
// Vote account too big
|
||||||
let cache_data = vote_account.data().to_vec();
|
let cache_data = vote_account.data().to_vec();
|
||||||
let mut pushed = vote_account.data.to_vec();
|
let mut pushed = vote_account.data().to_vec();
|
||||||
pushed.push(0);
|
pushed.push(0);
|
||||||
vote_account.set_data(pushed);
|
vote_account.set_data(pushed);
|
||||||
stakes.store(&vote_pubkey, &vote_account, true, true);
|
stakes.store(&vote_pubkey, &vote_account, true, true);
|
||||||
|
|
|
@ -32,7 +32,7 @@ pub struct AccountSharedData {
|
||||||
/// lamports in the account
|
/// lamports in the account
|
||||||
pub lamports: u64,
|
pub lamports: u64,
|
||||||
/// data held in this account
|
/// data held in this account
|
||||||
pub data: Arc<Vec<u8>>,
|
data: Arc<Vec<u8>>,
|
||||||
/// the program that owns this account. If executable, the program that loads this account.
|
/// the program that owns this account. If executable, the program that loads this account.
|
||||||
pub owner: Pubkey,
|
pub owner: Pubkey,
|
||||||
/// this account's data contains a loaded program (and is now read-only)
|
/// this account's data contains a loaded program (and is now read-only)
|
||||||
|
|
Loading…
Reference in New Issue