From 275e47f93135e1ca359a2a0cece0da1f51125b11 Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)" <wash678@gmail.com>
Date: Sun, 10 Jul 2022 23:10:22 -0500
Subject: [PATCH] do this right: add 2nd pass at hash calc when failure seen
 (#26392) (#26538)

---
 core/src/accounts_hash_verifier.rs | 39 +++++++++++++++---------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/core/src/accounts_hash_verifier.rs b/core/src/accounts_hash_verifier.rs
index 80bd1b1eda..9d59e40728 100644
--- a/core/src/accounts_hash_verifier.rs
+++ b/core/src/accounts_hash_verifier.rs
@@ -147,27 +147,28 @@ impl AccountsHashVerifier {
             )
             .unwrap();
 
-        assert_eq!(accounts_package.expected_capitalization, lamports);
-        if let Some(expected_hash) = accounts_package.accounts_hash_for_testing {
+        if accounts_package.expected_capitalization != lamports {
             // before we assert, run the hash calc again. This helps track down whether it could have been a failure in a race condition possibly with shrink.
             // We could add diagnostics to the hash calc here to produce a per bin cap or something to help narrow down how many pubkeys are different.
-            if expected_hash != accounts_hash {
-                let _ = accounts_package
-                    .accounts
-                    .accounts_db
-                    .calculate_accounts_hash_without_index(
-                        &CalcAccountsHashConfig {
-                            use_bg_thread_pool: false,
-                            check_hash: false,
-                            ancestors: None,
-                            use_write_cache: false,
-                            epoch_schedule: &accounts_package.epoch_schedule,
-                            rent_collector: &accounts_package.rent_collector,
-                        },
-                        &sorted_storages,
-                        HashStats::default(),
-                    );
-            }
+            let _ = accounts_package
+                .accounts
+                .accounts_db
+                .calculate_accounts_hash_without_index(
+                    &CalcAccountsHashConfig {
+                        use_bg_thread_pool: false,
+                        check_hash: false,
+                        ancestors: None,
+                        use_write_cache: false,
+                        epoch_schedule: &accounts_package.epoch_schedule,
+                        rent_collector: &accounts_package.rent_collector,
+                    },
+                    &sorted_storages,
+                    HashStats::default(),
+                );
+        }
+
+        assert_eq!(accounts_package.expected_capitalization, lamports);
+        if let Some(expected_hash) = accounts_package.accounts_hash_for_testing {
             assert_eq!(expected_hash, accounts_hash);
         };