dcou: set_accounts_hash()

solana-labs · Aug 14, 2023 · 6c9da95 · 6c9da95
1 parent 7b804e3
commit 6c9da95
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 26 deletions.
diff --git a/accounts-db/src/accounts_db.rs b/accounts-db/src/accounts_db.rs
@@ -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),
@@ -9604,10 +9605,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();

diff --git a/runtime/src/bank/serde_snapshot.rs b/runtime/src/bank/serde_snapshot.rs
@@ -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![];
@@ -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();
 
@@ -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;
@@ -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;
@@ -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);

diff --git a/runtime/src/serde_snapshot/tests.rs b/runtime/src/serde_snapshot/tests.rs
@@ -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(