Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

dcou: set_accounts_hash() #32829

Merged
merged 1 commit into from
Aug 15, 2023
Merged

dcou: set_accounts_hash() #32829

Show file tree
Hide file tree
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
7 changes: 2 additions & 5 deletions accounts-db/src/accounts_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7445,7 +7445,8 @@ impl AccountsDb {
/// Set the accounts hash for `slot`
///
/// returns the previous accounts hash for `slot`
pub fn set_accounts_hash(
#[cfg_attr(feature = "dev-context-only-utils", fn_qualifiers(pub))]
fn set_accounts_hash(
&self,
slot: Slot,
accounts_hash: (AccountsHash, /*capitalization*/ u64),
Expand Down Expand Up @@ -9597,10 +9598,6 @@ impl AccountsDb {
&self.accounts_hashes
}

pub fn set_accounts_hash_for_tests(&self, slot: Slot, accounts_hash: AccountsHash) {
self.set_accounts_hash(slot, (accounts_hash, u64::default()));
}

pub fn assert_load_account(&self, slot: Slot, pubkey: Pubkey, expected_lamports: u64) {
let ancestors = vec![(slot, 0)].into_iter().collect();
let (account, slot) = self.load_without_fixed_root(&ancestors, &pubkey).unwrap();
Expand Down
40 changes: 20 additions & 20 deletions runtime/src/bank/serde_snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ mod tests {
bank2.freeze();
bank2.squash();
bank2.force_flush_accounts_cache();
bank2
.accounts()
.accounts_db
.set_accounts_hash_for_tests(bank2.slot(), AccountsHash(Hash::new(&[0; 32])));
bank2.accounts().accounts_db.set_accounts_hash(
bank2.slot(),
(AccountsHash(Hash::new(&[0; 32])), u64::default()),
);

let snapshot_storages = bank2.get_snapshot_storages(None);
let mut buf = vec![];
Expand Down Expand Up @@ -164,10 +164,10 @@ mod tests {
.unwrap();

if update_accounts_hash {
bank2
.accounts()
.accounts_db
.set_accounts_hash_for_tests(bank2.slot(), AccountsHash(Hash::new(&[1; 32])));
bank2.accounts().accounts_db.set_accounts_hash(
bank2.slot(),
(AccountsHash(Hash::new(&[1; 32])), u64::default()),
);
}
let accounts_hash = bank2.get_accounts_hash().unwrap();

Expand Down Expand Up @@ -353,10 +353,10 @@ mod tests {
.accounts
.accounts_db
.set_accounts_delta_hash(bank.slot(), AccountsDeltaHash(Hash::new_unique()));
bank.rc
.accounts
.accounts_db
.set_accounts_hash_for_tests(bank.slot(), AccountsHash(Hash::new_unique()));
bank.rc.accounts.accounts_db.set_accounts_hash(
bank.slot(),
(AccountsHash(Hash::new_unique()), u64::default()),
);

// Set extra fields
bank.fee_rate_governor.lamports_per_signature = 7000;
Expand Down Expand Up @@ -544,10 +544,10 @@ mod tests {
.accounts
.accounts_db
.set_accounts_delta_hash(bank.slot(), AccountsDeltaHash(Hash::new_unique()));
bank.rc
.accounts
.accounts_db
.set_accounts_hash_for_tests(bank.slot(), AccountsHash(Hash::new_unique()));
bank.rc.accounts.accounts_db.set_accounts_hash(
bank.slot(),
(AccountsHash(Hash::new_unique()), u64::default()),
);

// Set extra fields
bank.fee_rate_governor.lamports_per_signature = 7000;
Expand Down Expand Up @@ -626,10 +626,10 @@ mod tests {
.accounts
.accounts_db
.set_accounts_delta_hash(bank.slot(), AccountsDeltaHash(Hash::new_unique()));
bank.rc
.accounts
.accounts_db
.set_accounts_hash_for_tests(bank.slot(), AccountsHash(Hash::new_unique()));
bank.rc.accounts.accounts_db.set_accounts_hash(
bank.slot(),
(AccountsHash(Hash::new_unique()), u64::default()),
);
let snapshot_storages = bank.rc.accounts.accounts_db.get_snapshot_storages(..=0).0;
// ensure there is a single snapshot storage example for ABI digesting
assert_eq!(snapshot_storages.len(), 1);
Expand Down
2 changes: 1 addition & 1 deletion runtime/src/serde_snapshot/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ mod serde_snapshot_tests {
let accounts_hash = AccountsHash(Hash::new_unique());
accounts
.accounts_db
.set_accounts_hash_for_tests(slot, accounts_hash);
.set_accounts_hash(slot, (accounts_hash, u64::default()));

let mut writer = Cursor::new(vec![]);
accountsdb_to_stream(
Expand Down