From 4ed5b4c0830792693bd93d0c53d053cca021bc58 Mon Sep 17 00:00:00 2001 From: "Jeff Washington (jwash)" Date: Tue, 9 Apr 2024 13:29:03 -0500 Subject: [PATCH] removed LoadedAccount::compute_hash (#683) --- accounts-db/src/accounts_db.rs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/accounts-db/src/accounts_db.rs b/accounts-db/src/accounts_db.rs index 9132f65a5..a5aa3793e 100644 --- a/accounts-db/src/accounts_db.rs +++ b/accounts-db/src/accounts_db.rs @@ -919,17 +919,6 @@ impl<'a> LoadedAccount<'a> { } } - pub fn compute_hash(&self, pubkey: &Pubkey) -> AccountHash { - match self { - LoadedAccount::Stored(stored_account_meta) => { - AccountsDb::hash_account(stored_account_meta, stored_account_meta.pubkey()) - } - LoadedAccount::Cached(cached_account) => { - AccountsDb::hash_account(&cached_account.account, pubkey) - } - } - } - pub fn take_account(self) -> AccountSharedData { match self { LoadedAccount::Stored(stored_account_meta) => { @@ -2272,7 +2261,7 @@ impl<'a> AppendVecScan for ScanState<'a> { let hash_is_missing = loaded_hash == AccountHash(Hash::default()); if self.config.check_hash || hash_is_missing { - let computed_hash = loaded_account.compute_hash(pubkey); + let computed_hash = AccountsDb::hash_account(loaded_account, loaded_account.pubkey()); if hash_is_missing { loaded_hash = computed_hash; } else if self.config.check_hash && computed_hash != loaded_hash { @@ -6639,8 +6628,7 @@ impl AccountsDb { let balance = loaded_account.lamports(); let hash_is_missing = loaded_hash == AccountHash(Hash::default()); if config.check_hash || hash_is_missing { - let computed_hash = - loaded_account.compute_hash(pubkey); + let computed_hash = AccountsDb::hash_account(&loaded_account, loaded_account.pubkey()); if hash_is_missing { loaded_hash = computed_hash; }