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

extract expected cluster type (#15615) 

* extract expected cluster type

* fix clippy warning

* more clippy
This commit is contained in:
Jeff Washington (jwash) 2021-03-02 13:55:34 -06:00 committed by GitHub
parent 7435a7b0ed
commit a2c47db920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
runtime/src/accounts_db.rs
View File

@ -1161,6 +1161,11 @@ impl AccountsDb {
)
}
pub fn expected_cluster_type(&self) -> ClusterType {
self.cluster_type
.expect("Cluster type must be set at initialization")
}
// Reclaim older states of rooted accounts for AccountsDb bloat mitigation
fn clean_old_rooted_accounts(
&self,
@ -3529,9 +3534,7 @@ impl AccountsDb {
let computed_hash = loaded_account
.compute_hash(
*slot,
&self.cluster_type.expect(
"Cluster type must be set at initialization",
),
&self.expected_cluster_type(),
pubkey,
);
if computed_hash != *loaded_hash {
@ -4172,13 +4175,7 @@ impl AccountsDb {
}
self.assert_frozen_accounts(accounts);
let mut hash_time = Measure::start("hash_accounts");
let hashes = self.hash_accounts(
slot,
accounts,
&self
.cluster_type
.expect("Cluster type must be set at initialization"),
);
let hashes = self.hash_accounts(slot, accounts, &self.expected_cluster_type());
hash_time.stop();
self.stats
.store_hash_accounts