From 7ceafd957c4d35855f5e7a782b01dbf19194e77d Mon Sep 17 00:00:00 2001 From: "Jeff Washington (jwash)" Date: Mon, 5 Apr 2021 09:48:37 -0500 Subject: [PATCH] remove cluster_type from hash_stored_account --- runtime/src/accounts_db.rs | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs index 3a9e5ab660359e..b4e98325bdcea6 100644 --- a/runtime/src/accounts_db.rs +++ b/runtime/src/accounts_db.rs @@ -2878,33 +2878,20 @@ impl AccountsDb { pub fn hash_stored_account( slot: Slot, account: &StoredAccountMeta, - cluster_type: &ClusterType, + _cluster_type: &ClusterType, ) -> Hash { - let include_owner = Self::include_owner(cluster_type, slot); + let include_owner = true; - if slot > Self::get_blake3_slot(cluster_type) { - Self::blake3_hash_account_data( - slot, - account.account_meta.lamports, - &account.account_meta.owner, - account.account_meta.executable, - account.account_meta.rent_epoch, - account.data, - &account.meta.pubkey, - include_owner, - ) - } else { - Self::hash_account_data( - slot, - account.account_meta.lamports, - &account.account_meta.owner, - account.account_meta.executable, - account.account_meta.rent_epoch, - account.data, - &account.meta.pubkey, - include_owner, - ) - } + Self::blake3_hash_account_data( + slot, + account.account_meta.lamports, + &account.account_meta.owner, + account.account_meta.executable, + account.account_meta.rent_epoch, + account.data, + &account.meta.pubkey, + include_owner, + ) } pub fn hash_account(