Refactor epoch reward 2 (solana-labs#27257)

* refactor: extract store_stake_accounts fn * refactor: extract store_vote_account fn * clippy: slice * clippy: slice * fix merge error Co-authored-by: haoran <haoran@mbook>
HaoranYi · Aug 21, 2022 · 2f0d355 · 2f0d355
1 parent 4b4af89
commit 2f0d355
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -3272,6 +3272,7 @@ impl Bank {
         m.stop();
         metrics.store_vote_accounts_us.fetch_add(m.as_us(), Relaxed);
         vote_rewards
+<<<<<<< HEAD
     }
 
     fn update_reward_history(
@@ -3298,6 +3299,8 @@ impl Bank {
         metrics
             .store_stake_accounts_us
             .fetch_add(m.as_us(), Relaxed);
+=======
+>>>>>>> c17f15a34f (Refactor epoch reward 2 (#27257))
     }
 
     fn update_recent_blockhashes_locked(&self, locked_blockhash_queue: &BlockhashQueue) {