minor test refactoring (#23423)

This commit is contained in:
Jeff Washington (jwash)
2022-03-02 08:31:14 -06:00
committed by GitHub
parent c8cb940b4e
commit 7b7fdb42d9

View File

@ -12352,26 +12352,21 @@ pub mod tests {
} else { } else {
panic!("All roots should have been flushed to storage"); panic!("All roots should have been flushed to storage");
}; };
if !should_clean || slot == slots.last().unwrap() { let expected_accounts = if !should_clean || slot == slots.last().unwrap() {
// The slot was not cleaned before being flushed to storage, // The slot was not cleaned before being flushed to storage,
// so it also contains all the original updates. // so it also contains all the original updates.
assert_eq!( keys[*slot as usize..]
slot_accounts, .iter()
keys[*slot as usize..] .cloned()
.iter() .collect::<HashSet<Pubkey>>()
.cloned()
.collect::<HashSet<Pubkey>>()
);
} else { } else {
// If clean was specified, only the latest slot should have all the updates. // If clean was specified, only the latest slot should have all the updates.
// All these other slots have been cleaned before flush // All these other slots have been cleaned before flush
assert_eq!( std::iter::once(keys[*slot as usize])
slot_accounts, .into_iter()
std::iter::once(keys[*slot as usize]) .collect::<HashSet<Pubkey>>()
.into_iter() };
.collect::<HashSet<Pubkey>>() assert_eq!(slot_accounts, expected_accounts);
);
}
} }
} }