gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

introduce AccountsIndex::default_for_tests() (#19067)

Browse Source
This commit is contained in:
Jeff Washington (jwash) 2021-08-04 21:58:53 -05:00 committed by GitHub
parent 5a4979f25f
commit dfe99efa7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/src/accounts_index.rs
View File

@ -33,6 +33,7 @@ use thiserror::Error;
pub const ITER_BATCH_SIZE: usize = 1000; pub const ITER_BATCH_SIZE: usize = 1000;
const BINS_DEFAULT: usize = 16; const BINS_DEFAULT: usize = 16;
const BINS_FOR_TESTING: usize = BINS_DEFAULT;
pub type ScanResult<T> = Result<T, ScanError>; pub type ScanResult<T> = Result<T, ScanError>;
pub type SlotList<T> = Vec<(Slot, T)>; pub type SlotList<T> = Vec<(Slot, T)>;
pub type SlotSlice<'s, T> = &'s [(Slot, T)]; pub type SlotSlice<'s, T> = &'s [(Slot, T)];
@ -681,7 +682,21 @@ impl<
> Default for AccountsIndex<T> > Default for AccountsIndex<T>
{ {
fn default() -> Self { fn default() -> Self {
let (account_maps, bin_calculator) = Self::allocate_accounts_index(BINS_DEFAULT); // all test callers will move to default_for_tests
Self::new(BINS_DEFAULT)
}
}
impl<
T: 'static + Clone + IsCached + ZeroLamport + std::marker::Sync + std::marker::Send + Debug,
> AccountsIndex<T>
{
pub fn default_for_tests() -> Self {
Self::new(BINS_FOR_TESTING)
}
fn new(bins: usize) -> Self {
let (account_maps, bin_calculator) = Self::allocate_accounts_index(bins);
Self { Self {
account_maps, account_maps,
bin_calculator, bin_calculator,
@ -699,12 +714,7 @@ impl<
removed_bank_ids: Mutex::<HashSet<BankId>>::default(), removed_bank_ids: Mutex::<HashSet<BankId>>::default(),
} }
} }
}
impl<
T: 'static + Clone + IsCached + ZeroLamport + std::marker::Sync + std::marker::Send + Debug,
> AccountsIndex<T>
{
fn allocate_accounts_index(bins: usize) -> (LockMapType<T>, PubkeyBinCalculator16) { fn allocate_accounts_index(bins: usize) -> (LockMapType<T>, PubkeyBinCalculator16) {
let account_maps = (0..bins) let account_maps = (0..bins)
.into_iter() .into_iter()
@ -713,6 +723,7 @@ impl<
let bin_calculator = PubkeyBinCalculator16::new(bins); let bin_calculator = PubkeyBinCalculator16::new(bins);
(account_maps, bin_calculator) (account_maps, bin_calculator)
} }
fn iter<R>(&self, range: Option<R>) -> AccountsIndexIterator<T> fn iter<R>(&self, range: Option<R>) -> AccountsIndexIterator<T>
where where
R: RangeBounds<Pubkey>, R: RangeBounds<Pubkey>,