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

[TieredStorage] Correct the HotStorage API for account_matches_owners (#34967) 

#### Problem
In HotStorageReader, the account_matches_owners takes
&[&Pubkey] as the address candidates.  However, it should
be &[Pubkey] as defined in the accounts_file API.

#### Summary of Changes
Correct HotStorageReader::account_matches_owners() to
take &[Pubkey] instead.

#### Test Plan
Existing unit-tests
This commit is contained in:
Yueh-Hsuan Chiang 2024-01-26 09:40:05 -08:00 committed by GitHub
parent 7138f8767e
commit 3380c14044
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,7 +362,7 @@ impl HotStorageReader {
pub fn account_matches_owners( pub fn account_matches_owners(
&self, &self,
account_offset: HotAccountOffset, account_offset: HotAccountOffset,
owners: &[&Pubkey], owners: &[Pubkey],
) -> Result<usize, MatchAccountOwnerError> { ) -> Result<usize, MatchAccountOwnerError> {
let account_meta = self let account_meta = self
.get_account_meta_from_offset(account_offset) .get_account_meta_from_offset(account_offset)
@ -377,7 +377,7 @@ impl HotStorageReader {
owners owners
.iter() .iter()
.position(|candidate| &account_owner == candidate) .position(|candidate| account_owner == candidate)
.ok_or(MatchAccountOwnerError::NoMatch) .ok_or(MatchAccountOwnerError::NoMatch)
} }
} }
@ -1081,7 +1081,7 @@ pub mod tests {
let hot_storage = HotStorageReader::new_from_path(&path).unwrap(); let hot_storage = HotStorageReader::new_from_path(&path).unwrap();
// First, verify whether we can find the expected owners. // First, verify whether we can find the expected owners.
let mut owner_candidates: Vec<_> = owner_addresses.iter().collect(); let mut owner_candidates = owner_addresses.clone();
owner_candidates.shuffle(&mut rng); owner_candidates.shuffle(&mut rng);
for (account_offset, account_meta) in account_offsets.iter().zip(hot_account_metas.iter()) { for (account_offset, account_meta) in account_offsets.iter().zip(hot_account_metas.iter()) {
@ -1090,16 +1090,15 @@ pub mod tests {
.unwrap(); .unwrap();
assert_eq!( assert_eq!(
owner_candidates[index], owner_candidates[index],
&owner_addresses[account_meta.owner_offset().0 as usize] owner_addresses[account_meta.owner_offset().0 as usize]
); );
} }
// Second, verify the MatchAccountOwnerError::NoMatch case // Second, verify the MatchAccountOwnerError::NoMatch case
const NUM_UNMATCHED_OWNERS: usize = 20; const NUM_UNMATCHED_OWNERS: usize = 20;
let unmatched_owners: Vec<_> = std::iter::repeat_with(Pubkey::new_unique) let unmatched_candidates: Vec<_> = std::iter::repeat_with(Pubkey::new_unique)
.take(NUM_UNMATCHED_OWNERS) .take(NUM_UNMATCHED_OWNERS)
.collect(); .collect();
let unmatched_candidates: Vec<_> = unmatched_owners.iter().collect();
for account_offset in account_offsets.iter() { for account_offset in account_offsets.iter() {
assert_eq!( assert_eq!(
@ -1119,7 +1118,7 @@ pub mod tests {
.unwrap(); .unwrap();
assert_eq!( assert_eq!(
owner_candidates[index], owner_candidates[index],
&owner_addresses[account_meta.owner_offset().0 as usize] owner_addresses[account_meta.owner_offset().0 as usize]
); );
} }
} }