From 1c4e84b8caefe4f419ec48acf1d09ade41208377 Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)" <jeff.washington@solana.com>
Date: Wed, 1 Feb 2023 15:01:01 -0600
Subject: [PATCH] impl default version of contains_multiple_slots (#30055)

---
 runtime/src/accounts_db.rs       |  3 ---
 runtime/src/bank.rs              |  3 ---
 runtime/src/storable_accounts.rs | 16 +++-------------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index 4653510ff6..ad25aaaaf4 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -9536,9 +9536,6 @@ pub mod tests {
         fn len(&self) -> usize {
             self.1.len()
         }
-        fn contains_multiple_slots(&self) -> bool {
-            false
-        }
         fn include_slot_in_hash(&self) -> IncludeSlotInHash {
             INCLUDE_SLOT_IN_HASH_TESTS
         }
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index faa406ad59..97ea61ced3 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -1189,9 +1189,6 @@ impl<'a> StorableAccounts<'a, AccountSharedData> for (Slot, &'a [StakeReward], I
     fn len(&self) -> usize {
         self.1.len()
     }
-    fn contains_multiple_slots(&self) -> bool {
-        false
-    }
     fn include_slot_in_hash(&self) -> IncludeSlotInHash {
         self.2
     }
diff --git a/runtime/src/storable_accounts.rs b/runtime/src/storable_accounts.rs
index 1d8dccced1..7250eca11f 100644
--- a/runtime/src/storable_accounts.rs
+++ b/runtime/src/storable_accounts.rs
@@ -31,7 +31,9 @@ pub trait StorableAccounts<'a, T: ReadableAccount + Sync>: Sync {
     fn len(&self) -> usize;
     /// are there accounts from multiple slots
     /// only used for an assert
-    fn contains_multiple_slots(&self) -> bool;
+    fn contains_multiple_slots(&self) -> bool {
+        false
+    }
     /// true iff hashing these accounts should include the slot
     fn include_slot_in_hash(&self) -> IncludeSlotInHash;
 
@@ -87,9 +89,6 @@ impl<'a, T: ReadableAccount + Sync> StorableAccounts<'a, T> for StorableAccounts
     fn len(&self) -> usize {
         self.accounts.len()
     }
-    fn contains_multiple_slots(&self) -> bool {
-        false
-    }
     fn include_slot_in_hash(&self) -> IncludeSlotInHash {
         self.include_slot_in_hash
     }
@@ -116,9 +115,6 @@ impl<'a, T: ReadableAccount + Sync> StorableAccounts<'a, T>
     fn len(&self) -> usize {
         self.1.len()
     }
-    fn contains_multiple_slots(&self) -> bool {
-        false
-    }
     fn include_slot_in_hash(&self) -> IncludeSlotInHash {
         self.2
     }
@@ -145,9 +141,6 @@ impl<'a> StorableAccounts<'a, StoredAccountMeta<'a>>
     fn len(&self) -> usize {
         self.1.len()
     }
-    fn contains_multiple_slots(&self) -> bool {
-        false
-    }
     fn include_slot_in_hash(&self) -> IncludeSlotInHash {
         self.2
     }
@@ -292,9 +285,6 @@ impl<'a> StorableAccounts<'a, StoredAccountMeta<'a>>
     fn len(&self) -> usize {
         self.1.len()
     }
-    fn contains_multiple_slots(&self) -> bool {
-        false
-    }
     fn include_slot_in_hash(&self) -> IncludeSlotInHash {
         self.2
     }