From aba9df845727c2bed31e6931232f99e39bd352e8 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Wed, 23 Jan 2019 15:25:54 -0800 Subject: [PATCH] Remove get_stake placeholder --- src/bank.rs | 6 ------ src/cluster_info.rs | 2 +- src/compute_leader_confirmation_service.rs | 2 +- src/leader_scheduler.rs | 2 +- src/retransmit_stage.rs | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/bank.rs b/src/bank.rs index 5586808197..25e080763f 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -885,12 +885,6 @@ impl Bank { .unwrap_or(0) } - /// TODO: Need to implement a real staking program to hold node stake. - /// Right now this just gets the account balances. See github issue #1655. - pub fn get_stake(&self, pubkey: &Pubkey) -> u64 { - self.get_balance(pubkey) - } - pub fn get_account(&self, pubkey: &Pubkey) -> Option { self.accounts.load_slow(pubkey) } diff --git a/src/cluster_info.rs b/src/cluster_info.rs index cff5d04d0b..4280613b41 100644 --- a/src/cluster_info.rs +++ b/src/cluster_info.rs @@ -321,7 +321,7 @@ impl ClusterInfo { fn sort_by_stake(peers: &[NodeInfo], bank: &Arc) -> Vec<(u64, NodeInfo)> { let mut peers_with_stakes: Vec<_> = peers .iter() - .map(|c| (bank.get_stake(&c.id), c.clone())) + .map(|c| (bank.get_balance(&c.id), c.clone())) .collect(); peers_with_stakes.sort_unstable(); peers_with_stakes diff --git a/src/compute_leader_confirmation_service.rs b/src/compute_leader_confirmation_service.rs index 2143fcfad9..73d8b66cad 100644 --- a/src/compute_leader_confirmation_service.rs +++ b/src/compute_leader_confirmation_service.rs @@ -60,7 +60,7 @@ impl ComputeLeaderConfirmationService { let mut ticks_and_stakes: Vec<(u64, u64)> = vote_states .iter() .filter_map(|vote_state| { - let validator_stake = bank.get_stake(&vote_state.node_id); + let validator_stake = bank.get_balance(&vote_state.node_id); total_stake += validator_stake; // Filter out any validators that don't have at least one vote // by returning None diff --git a/src/leader_scheduler.rs b/src/leader_scheduler.rs index 9b39cb2da6..0ca6fcd5d8 100644 --- a/src/leader_scheduler.rs +++ b/src/leader_scheduler.rs @@ -419,7 +419,7 @@ impl LeaderScheduler { { let mut active_accounts: Vec<(&'a Pubkey, u64)> = active .filter_map(|pk| { - let stake = bank.get_stake(pk); + let stake = bank.get_balance(pk); if stake > 0 { Some((pk, stake as u64)) } else { diff --git a/src/retransmit_stage.rs b/src/retransmit_stage.rs index b0ce4efcc5..04b10534ce 100644 --- a/src/retransmit_stage.rs +++ b/src/retransmit_stage.rs @@ -62,7 +62,7 @@ fn retransmit( //find my index (my ix is the same as the first node with smaller stake) let my_index = peers .iter() - .position(|ci| bank.get_stake(&ci.id) <= bank.get_stake(&my_id)); + .position(|ci| bank.get_balance(&ci.id) <= bank.get_balance(&my_id)); //find my layer let locality = ClusterInfo::localize( &layer_indices,