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

hot storage tests don't use Option (#821)

This commit is contained in:
Jeff Washington (jwash) 2024-04-15 19:17:02 -05:00 committed by GitHub
parent ee5fb5102d
commit 7f16e84237
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accounts-db/src/tiered_storage.rs
View File

@ -358,7 +358,9 @@ mod tests {
storable_accounts.get(i, |(account, address, _account_hash)| {
expected_accounts_map.insert(
*address,
account.map(|account| account.to_account_shared_data()),
account
.map(|account| account.to_account_shared_data())
.unwrap_or_default(),
);
});
}
@ -378,7 +380,7 @@ mod tests {
if let Some(account) = expected_accounts_map.get(stored_account_meta.pubkey()) {
verify_test_account_with_footer(
&stored_account_meta,
account.as_ref(),
account,
stored_account_meta.pubkey(),
footer,
);

24
accounts-db/src/tiered_storage/hot.rs
View File

@ -1563,7 +1563,13 @@ mod tests {
.unwrap();
storable_accounts.get(i, |(account, address, _account_hash)| {
verify_test_account(&stored_account_meta, account.as_ref(), address);
verify_test_account(
&stored_account_meta,
&account
.map(|account| account.to_account_shared_data())
.unwrap_or_default(),
address,
);
});
assert_eq!(i + 1, next.0 as usize);
@ -1582,7 +1588,13 @@ mod tests {
.unwrap();
storable_accounts.get(stored_info.offset, |(account, address, _account_hash)| {
verify_test_account(&stored_account_meta, account.as_ref(), address);
verify_test_account(
&stored_account_meta,
&account
.map(|account| account.to_account_shared_data())
.unwrap_or_default(),
address,
);
});
}
@ -1592,7 +1604,13 @@ mod tests {
// first, we verify everything
for (i, stored_meta) in accounts.iter().enumerate() {
storable_accounts.get(i, |(account, address, _account_hash)| {
verify_test_account(stored_meta, account.as_ref(), address);
verify_test_account(
stored_meta,
&account
.map(|account| account.to_account_shared_data())
.unwrap_or_default(),
address,
);
});
}

10
accounts-db/src/tiered_storage/test_utils.rs
View File

@ -5,7 +5,6 @@ use {
crate::{
account_storage::meta::{StoredAccountMeta, StoredMeta},
accounts_hash::AccountHash,
tiered_storage::owners::OWNER_NO_OWNER,
},
solana_sdk::{
account::{Account, AccountSharedData, ReadableAccount},
@ -47,12 +46,11 @@ pub(super) fn create_test_account(seed: u64) -> (StoredMeta, AccountSharedData)
pub(super) fn verify_test_account(
stored_meta: &StoredAccountMeta<'_>,
account: Option<&impl ReadableAccount>,
acc: &impl ReadableAccount,
address: &Pubkey,
) {
let (lamports, owner, data, executable) = account
.map(|acc| (acc.lamports(), acc.owner(), acc.data(), acc.executable()))
.unwrap_or((0, &OWNER_NO_OWNER, &[], false));
let (lamports, owner, data, executable) =
(acc.lamports(), acc.owner(), acc.data(), acc.executable());
assert_eq!(stored_meta.lamports(), lamports);
assert_eq!(stored_meta.data().len(), data.len());
@ -65,7 +63,7 @@ pub(super) fn verify_test_account(
pub(super) fn verify_test_account_with_footer(
stored_meta: &StoredAccountMeta<'_>,
account: Option<&impl ReadableAccount>,
account: &impl ReadableAccount,
address: &Pubkey,
footer: &TieredStorageFooter,
) {