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

calc hash uses self.num_hash_scan_passes (#23883)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2022-03-24 09:44:42 -05:00
committed by GitHub
parent e3eb002f66
commit 9022931689
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/accounts_hash_verifier.rs
View File

@ -121,7 +121,6 @@ impl AccountsHashVerifier {
check_hash: false, check_hash: false,
accounts_cache_and_ancestors: None, accounts_cache_and_ancestors: None,
filler_account_suffix: None, // this will fail with filler accounts filler_account_suffix: None, // this will fail with filler accounts
num_hash_scan_passes: None, // this code path is only for testing, so use default # passes here
}) })
.unwrap(); .unwrap();

6
runtime/src/accounts_db.rs
View File

@ -5526,7 +5526,6 @@ impl AccountsDb {
} else { } else {
None None
}, },
num_hash_scan_passes: self.num_hash_scan_passes,
}) })
} else { } else {
self.calculate_accounts_hash(slot, ancestors, check_hash) self.calculate_accounts_hash(slot, ancestors, check_hash)
@ -5725,8 +5724,7 @@ impl AccountsDb {
&self, &self,
config: &mut CalcAccountsHashConfig<'_>, config: &mut CalcAccountsHashConfig<'_>,
) -> Result<(Hash, u64), BankHashVerificationError> { ) -> Result<(Hash, u64), BankHashVerificationError> {
let (num_hash_scan_passes, bins_per_pass) = let (num_hash_scan_passes, bins_per_pass) = Self::bins_per_pass(self.num_hash_scan_passes);
Self::bins_per_pass(config.num_hash_scan_passes);
let use_bg_thread_pool = config.use_bg_thread_pool; let use_bg_thread_pool = config.use_bg_thread_pool;
let mut scan_and_hash = move || { let mut scan_and_hash = move || {
let mut previous_pass = PreviousPass::default(); let mut previous_pass = PreviousPass::default();
@ -7926,7 +7924,6 @@ pub mod tests {
check_hash: false, check_hash: false,
accounts_cache_and_ancestors: None, accounts_cache_and_ancestors: None,
filler_account_suffix: None, filler_account_suffix: None,
num_hash_scan_passes: None,
}) })
.unwrap(); .unwrap();
let expected_hash = Hash::from_str("GKot5hBsd81kMupNCXHaqbhv3huEbxAFMLnpcX2hniwn").unwrap(); let expected_hash = Hash::from_str("GKot5hBsd81kMupNCXHaqbhv3huEbxAFMLnpcX2hniwn").unwrap();
@ -7952,7 +7949,6 @@ pub mod tests {
check_hash: false, check_hash: false,
accounts_cache_and_ancestors: None, accounts_cache_and_ancestors: None,
filler_account_suffix: None, filler_account_suffix: None,
num_hash_scan_passes: None,
}) })
.unwrap(); .unwrap();

1
runtime/src/accounts_hash.rs
View File

@ -37,7 +37,6 @@ pub struct CalcAccountsHashConfig<'a> {
)>, )>,
// these should be gone soon as we get an AccountsDb '&self' // these should be gone soon as we get an AccountsDb '&self'
pub filler_account_suffix: Option<&'a Pubkey>, pub filler_account_suffix: Option<&'a Pubkey>,
pub num_hash_scan_passes: Option<usize>,
// to come soon // to come soon
/* /*
pub rent_collector: RentCollector, pub rent_collector: RentCollector,