From c3001abef74085ac3b5529b72fb2ae1ff9fb8d68 Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)" <jeff.washington@solana.com>
Date: Mon, 12 Dec 2022 21:24:45 -0600
Subject: [PATCH] don't rely on write_version increasing - just assert that it
 is for now (#29180)

---
 runtime/src/accounts_db.rs | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index 55cb9b808..2fb6f8681 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -3720,11 +3720,11 @@ impl AccountsDb {
                     let new_entry = FoundStoredAccount { account, store_id };
                     match stored_accounts.entry(*new_entry.account.pubkey()) {
                         Entry::Occupied(mut occupied_entry) => {
-                            if new_entry.account.meta.write_version
-                                > occupied_entry.get().account.meta.write_version
-                            {
-                                occupied_entry.insert(new_entry);
-                            }
+                            assert!(
+                                new_entry.account.meta.write_version
+                                    > occupied_entry.get().account.meta.write_version
+                            );
+                            occupied_entry.insert(new_entry);
                         }
                         Entry::Vacant(vacant_entry) => {
                             vacant_entry.insert(new_entry);
@@ -8680,15 +8680,12 @@ impl AccountsDb {
                     }
                     Entry::Occupied(mut entry) => {
                         let occupied_version = entry.get().write_version;
-                        if occupied_version < this_version {
-                            entry.insert(IndexAccountMapEntry {
-                                write_version: this_version,
-                                store_id: storage.append_vec_id(),
-                                stored_account,
-                            });
-                        } else {
-                            assert_ne!(occupied_version, this_version);
-                        }
+                        assert!(occupied_version < this_version);
+                        entry.insert(IndexAccountMapEntry {
+                            write_version: this_version,
+                            store_id: storage.append_vec_id(),
+                            stored_account,
+                        });
                     }
                 }
             })