Skip to content

removed LoadedAccount::compute_hash #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffwashington merged 1 commit into from
Apr 9, 2024
Merged

removed LoadedAccount::compute_hash #683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions accounts-db/src/accounts_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down