calculate_capitalization uses hash calculation

solana-labs · May 28, 2021 · 05eef8f · 05eef8f
1 parent 4e5657b
commit 05eef8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs
@@ -619,8 +619,12 @@ impl Accounts {
             .collect()
     }
 
-    pub fn calculate_capitalization(&self, ancestors: &Ancestors) -> u64 {
-        self.accounts_db.unchecked_scan_accounts(
+    pub fn calculate_capitalization(&self, ancestors: &Ancestors, slot: Slot) -> u64 {
+        let cap = self
+            .accounts_db
+            .update_accounts_hash_with_index_option(false, false, slot, ancestors, None)
+            .1;
+        let cap2 = self.accounts_db.unchecked_scan_accounts(
             "calculate_capitalization_scan_elapsed",
             ancestors,
             |total_capitalization: &mut u64, (_pubkey, loaded_account, _slot)| {
@@ -632,7 +636,9 @@ impl Accounts {
                     );
                 }
             },
-        )
+        );
+        assert_eq!(cap, cap2);
+        cap2
     }
 
     #[must_use]

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -4560,7 +4560,9 @@ impl Bank {
     }
 
     pub fn calculate_capitalization(&self) -> u64 {
-        self.rc.accounts.calculate_capitalization(&self.ancestors)
+        self.rc
+            .accounts
+            .calculate_capitalization(&self.ancestors, self.slot())
     }
 
     pub fn calculate_and_verify_capitalization(&self) -> bool {