dcou: make internal function pub conditionally (#32822)

dcou: make internal function pub conditionally
solana-labs · Aug 13, 2023 · ce63640 · ce63640
1 parent 58cca78
commit ce63640
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -259,6 +259,7 @@ prost = "0.11.9"
 prost-types = "0.11.9"
 protobuf-src = "1.1.0"
 qstring = "0.7.2"
+qualifier_attr = "0.1.6"
 quinn = "0.10.2"
 quinn-proto = "0.10.2"
 quote = "1.0"

diff --git a/accounts-db/Cargo.toml b/accounts-db/Cargo.toml
@@ -39,6 +39,7 @@ num_enum = { workspace = true }
 once_cell = { workspace = true }
 ouroboros = { workspace = true }
 percentage = { workspace = true }
+qualifier_attr = { workspace = true }
 rand = { workspace = true }
 rayon = { workspace = true }
 regex = { workspace = true }

diff --git a/accounts-db/src/accounts_db.rs b/accounts-db/src/accounts_db.rs
@@ -18,6 +18,8 @@
 //! tracks the number of commits to the entire data store. So the latest
 //! commit for each slot entry would be indexed.
 
+#[cfg(feature = "dev-context-only-utils")]
+use qualifier_attr::fn_qualifiers;
 use {
     crate::{
         account_info::{AccountInfo, StorageLocation},
@@ -7898,6 +7900,7 @@ impl AccountsDb {
     /// Set the accounts delta hash for `slot` in the `accounts_delta_hashes` map
     ///
     /// returns the previous accounts delta hash for `slot`
+    #[cfg_attr(feature = "dev-context-only-utils", fn_qualifiers(pub))]
     fn set_accounts_delta_hash(
         &self,
         slot: Slot,
@@ -9581,14 +9584,6 @@ impl AccountsDb {
         &self.accounts_delta_hashes
     }
 
-    pub fn set_accounts_delta_hash_for_tests(
-        &self,
-        slot: Slot,
-        accounts_delta_hash: AccountsDeltaHash,
-    ) {
-        self.set_accounts_delta_hash(slot, accounts_delta_hash);
-    }
-
     pub fn accounts_hashes(&self) -> &Mutex<HashMap<Slot, (AccountsHash, /*capitalization*/ u64)>> {
         &self.accounts_hashes
     }

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/runtime/src/bank/serde_snapshot.rs b/runtime/src/bank/serde_snapshot.rs
@@ -352,10 +352,7 @@ mod tests {
             bank.rc
                 .accounts
                 .accounts_db
-                .set_accounts_delta_hash_for_tests(
-                    bank.slot(),
-                    AccountsDeltaHash(Hash::new_unique()),
-                );
+                .set_accounts_delta_hash(bank.slot(), AccountsDeltaHash(Hash::new_unique()));
             bank.rc
                 .accounts
                 .accounts_db
@@ -546,7 +543,7 @@ mod tests {
         bank.rc
             .accounts
             .accounts_db
-            .set_accounts_delta_hash_for_tests(bank.slot(), AccountsDeltaHash(Hash::new_unique()));
+            .set_accounts_delta_hash(bank.slot(), AccountsDeltaHash(Hash::new_unique()));
         bank.rc
             .accounts
             .accounts_db
@@ -628,10 +625,7 @@ mod tests {
             bank.rc
                 .accounts
                 .accounts_db
-                .set_accounts_delta_hash_for_tests(
-                    bank.slot(),
-                    AccountsDeltaHash(Hash::new_unique()),
-                );
+                .set_accounts_delta_hash(bank.slot(), AccountsDeltaHash(Hash::new_unique()));
             bank.rc
                 .accounts
                 .accounts_db