From ad6a3abd8b3850d9040221a7d2c78a9fb5de3582 Mon Sep 17 00:00:00 2001 From: Brooks Date: Fri, 17 Feb 2023 16:00:25 -0500 Subject: [PATCH] Uses set_accounts_{delta,}_hash_for_tests() in serde tests (#30390) --- runtime/src/accounts_db.rs | 9 +++++++++ runtime/src/serde_snapshot/tests.rs | 17 +++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs index b3984f3e60..18e188e491 100644 --- a/runtime/src/accounts_db.rs +++ b/runtime/src/accounts_db.rs @@ -9501,6 +9501,15 @@ pub mod tests { pub fn set_accounts_hash_for_tests(&self, slot: Slot, accounts_hash: AccountsHash) { self.set_accounts_hash(slot, accounts_hash); } + + // used by serde_snapshot tests + pub fn set_accounts_delta_hash_for_tests( + &self, + slot: Slot, + accounts_delta_hash: AccountsDeltaHash, + ) { + self.set_accounts_delta_hash(slot, accounts_delta_hash); + } } /// This impl exists until this feature is activated: diff --git a/runtime/src/serde_snapshot/tests.rs b/runtime/src/serde_snapshot/tests.rs index 3b15703456..564dc05d54 100644 --- a/runtime/src/serde_snapshot/tests.rs +++ b/runtime/src/serde_snapshot/tests.rs @@ -188,7 +188,7 @@ fn test_accounts_serialize_style(serde_style: SerdeStyle) { let accounts_hash = AccountsHash(Hash::new_unique()); accounts .accounts_db - .set_accounts_hash_from_snapshot(slot, accounts_hash); + .set_accounts_hash_for_tests(slot, accounts_hash); let mut writer = Cursor::new(vec![]); accountsdb_to_stream( @@ -521,11 +521,11 @@ fn test_extra_fields_eof() { bank.rc .accounts .accounts_db - .set_accounts_delta_hash_from_snapshot(bank.slot(), AccountsDeltaHash(Hash::new_unique())); + .set_accounts_delta_hash_for_tests(bank.slot(), AccountsDeltaHash(Hash::new_unique())); bank.rc .accounts .accounts_db - .set_accounts_hash_from_snapshot(bank.slot(), AccountsHash(Hash::new_unique())); + .set_accounts_hash_for_tests(bank.slot(), AccountsHash(Hash::new_unique())); // Set extra fields bank.fee_rate_governor.lamports_per_signature = 7000; @@ -657,11 +657,11 @@ fn test_blank_extra_fields() { bank.rc .accounts .accounts_db - .set_accounts_delta_hash_from_snapshot(bank.slot(), AccountsDeltaHash(Hash::new_unique())); + .set_accounts_delta_hash_for_tests(bank.slot(), AccountsDeltaHash(Hash::new_unique())); bank.rc .accounts .accounts_db - .set_accounts_hash_from_snapshot(bank.slot(), AccountsHash(Hash::new_unique())); + .set_accounts_hash_for_tests(bank.slot(), AccountsHash(Hash::new_unique())); // Set extra fields bank.fee_rate_governor.lamports_per_signature = 7000; @@ -733,14 +733,11 @@ mod test_bank_serialize { bank.rc .accounts .accounts_db - .set_accounts_delta_hash_from_snapshot( - bank.slot(), - AccountsDeltaHash(Hash::new_unique()), - ); + .set_accounts_delta_hash_for_tests(bank.slot(), AccountsDeltaHash(Hash::new_unique())); bank.rc .accounts .accounts_db - .set_accounts_hash_from_snapshot(bank.slot(), AccountsHash(Hash::new_unique())); + .set_accounts_hash_for_tests(bank.slot(), AccountsHash(Hash::new_unique())); let snapshot_storages = bank .rc .accounts