From 8c4078283cd0d081092f97026d276cbae4695038 Mon Sep 17 00:00:00 2001
From: Rob Walker <rwalker@rwalker.com>
Date: Fri, 3 Jul 2020 17:42:50 -0700
Subject: [PATCH] fixups

---
 runtime/src/bank.rs   | 23 +++++++++++++++++++----
 runtime/src/stakes.rs |  4 +---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index b9950062aa..54cc919e46 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -898,9 +898,9 @@ impl Bank {
             let inflation = self.inflation.read().unwrap();
 
             (*inflation).validator(year) * self.capitalization() as f64 * period
-        };
+        } as u64;
 
-        let validator_point_value = self.pay_validator_rewards(validator_rewards as u64);
+        let validator_point_value = self.pay_validator_rewards(validator_rewards);
 
         self.update_sysvar_account(&sysvar::rewards::id(), |account| {
             sysvar::rewards::create_account(
@@ -910,7 +910,7 @@ impl Bank {
         });
 
         self.capitalization
-            .fetch_add(validator_rewards as u64, Ordering::Relaxed);
+            .fetch_add(validator_rewards, Ordering::Relaxed);
     }
 
     /// iterate over all stakes, redeem vote credits for each stake we can
@@ -4746,7 +4746,22 @@ mod tests {
         }
         bank.store_account(&vote_id, &vote_account);
 
-        let validator_points = bank.stakes.read().unwrap().points();
+        let validator_points: u128 = bank
+            .stake_delegations()
+            .iter()
+            .map(|(stake_pubkey, delegation)| {
+                match (
+                    bank.get_account(&stake_pubkey),
+                    bank.get_account(&delegation.voter_pubkey),
+                ) {
+                    (Some(stake_account), Some(vote_account)) => {
+                        stake_state::calculate_points(&stake_account, &vote_account, None)
+                            .unwrap_or(0)
+                    }
+                    (_, _) => 0,
+                }
+            })
+            .sum();
 
         // put a child bank in epoch 1, which calls update_rewards()...
         let bank1 = Bank::new_from_parent(
diff --git a/runtime/src/stakes.rs b/runtime/src/stakes.rs
index 66d3d31826..9b1bf41ac4 100644
--- a/runtime/src/stakes.rs
+++ b/runtime/src/stakes.rs
@@ -173,9 +173,7 @@ pub mod tests {
     use super::*;
     use solana_sdk::{pubkey::Pubkey, rent::Rent};
     use solana_stake_program::stake_state;
-    use solana_vote_program::vote_state::{
-        self, VoteState, VoteStateVersions, MAX_LOCKOUT_HISTORY,
-    };
+    use solana_vote_program::vote_state::{self, VoteState};
 
     //  set up some dummies for a staked node     ((     vote      )  (     stake     ))
     pub fn create_staked_node_accounts(stake: u64) -> ((Pubkey, Account), (Pubkey, Account)) {