From 272e5a05f255007ee4ceb3cd6f53b39e58a641b7 Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)" <jeff.washington@solana.com>
Date: Fri, 6 Jan 2023 08:51:25 -0600
Subject: [PATCH] remove AccountStorage::is_empty() (#29548)

---
 runtime/src/account_storage.rs | 7 -------
 runtime/src/accounts_db.rs     | 8 ++++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/runtime/src/account_storage.rs b/runtime/src/account_storage.rs
index 1452c2a8b..e7e1369b8 100644
--- a/runtime/src/account_storage.rs
+++ b/runtime/src/account_storage.rs
@@ -46,13 +46,6 @@ impl AccountStorage {
         self.map.iter().map(|iter_item| *iter_item.key()).collect()
     }
 
-    /// returns true if there are no append vecs for 'slot'
-    pub(crate) fn is_empty(&self, slot: Slot) -> bool {
-        self.get_slot_stores(slot)
-            .map(|storages| storages.read().unwrap().is_empty())
-            .unwrap_or(true)
-    }
-
     /// returns true if there is an entry in the map for 'slot', but it contains no append vec
     #[cfg(test)]
     pub(crate) fn is_empty_entry(&self, slot: Slot) -> bool {
diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index 394e771e1..91c88447b 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -8783,7 +8783,7 @@ impl AccountsDb {
                 .take(per_pass)
                 .collect::<Vec<_>>();
             roots_in_this_pass.into_par_iter().for_each(|slot| {
-                if self.storage.is_empty(*slot) {
+                if self.storage.get_slot_storage_entry(*slot).is_none() {
                     return;
                 }
 
@@ -14297,7 +14297,7 @@ pub mod tests {
         db.store_cached((0, &[(&other_account_key, &slot0_account)][..]), None);
         db.add_root(0);
         db.flush_accounts_cache(true, None);
-        assert!(!db.storage.is_empty(0));
+        assert!(db.storage.get_slot_storage_entry(0).is_some());
 
         // Store into slot 1, a dummy slot that will be dead and purged before flush
         db.store_cached(
@@ -16424,7 +16424,7 @@ pub mod tests {
             let existing_store = db.create_and_insert_store(slot, size, "test");
             let old_id = existing_store.append_vec_id();
             let dead_storages = db.mark_dirty_dead_stores(slot, add_dirty_stores, None);
-            assert!(db.storage.is_empty(slot));
+            assert!(db.storage.get_slot_storage_entry(slot).is_none());
             assert_eq!(dead_storages.len(), 1);
             assert_eq!(dead_storages.first().unwrap().append_vec_id(), old_id);
             if add_dirty_stores {
@@ -16451,7 +16451,7 @@ pub mod tests {
             let shrink_in_progress = db.get_store_for_shrink(slot, 100);
             let dead_storages =
                 db.mark_dirty_dead_stores(slot, add_dirty_stores, Some(shrink_in_progress));
-            assert!(!db.storage.is_empty(slot));
+            assert!(db.storage.get_slot_storage_entry(slot).is_some());
             assert_eq!(dead_storages.len(), 1);
             assert_eq!(dead_storages.first().unwrap().append_vec_id(), old_id);
             if add_dirty_stores {