diff --git a/core/src/accounts_hash_verifier.rs b/core/src/accounts_hash_verifier.rs index 37a49adb98..ec446a9a2e 100644 --- a/core/src/accounts_hash_verifier.rs +++ b/core/src/accounts_hash_verifier.rs @@ -121,7 +121,6 @@ impl AccountsHashVerifier { check_hash: false, accounts_cache_and_ancestors: None, 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(); diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs index e623fb59bf..14bae5498d 100644 --- a/runtime/src/accounts_db.rs +++ b/runtime/src/accounts_db.rs @@ -5526,7 +5526,6 @@ impl AccountsDb { } else { None }, - num_hash_scan_passes: self.num_hash_scan_passes, }) } else { self.calculate_accounts_hash(slot, ancestors, check_hash) @@ -5725,8 +5724,7 @@ impl AccountsDb { &self, config: &mut CalcAccountsHashConfig<'_>, ) -> Result<(Hash, u64), BankHashVerificationError> { - let (num_hash_scan_passes, bins_per_pass) = - Self::bins_per_pass(config.num_hash_scan_passes); + let (num_hash_scan_passes, bins_per_pass) = Self::bins_per_pass(self.num_hash_scan_passes); let use_bg_thread_pool = config.use_bg_thread_pool; let mut scan_and_hash = move || { let mut previous_pass = PreviousPass::default(); @@ -7926,7 +7924,6 @@ pub mod tests { check_hash: false, accounts_cache_and_ancestors: None, filler_account_suffix: None, - num_hash_scan_passes: None, }) .unwrap(); let expected_hash = Hash::from_str("GKot5hBsd81kMupNCXHaqbhv3huEbxAFMLnpcX2hniwn").unwrap(); @@ -7952,7 +7949,6 @@ pub mod tests { check_hash: false, accounts_cache_and_ancestors: None, filler_account_suffix: None, - num_hash_scan_passes: None, }) .unwrap(); diff --git a/runtime/src/accounts_hash.rs b/runtime/src/accounts_hash.rs index 9d3569f5ea..f165f0eb41 100644 --- a/runtime/src/accounts_hash.rs +++ b/runtime/src/accounts_hash.rs @@ -37,7 +37,6 @@ pub struct CalcAccountsHashConfig<'a> { )>, // these should be gone soon as we get an AccountsDb '&self' pub filler_account_suffix: Option<&'a Pubkey>, - pub num_hash_scan_passes: Option, // to come soon /* pub rent_collector: RentCollector,