From f89e83ae49883704bad7b1d052034d747773eeb2 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Sat, 23 Feb 2019 16:49:34 -0700 Subject: [PATCH] Delete redundant code --- src/active_stakers.rs | 7 +------ src/leader_schedule.rs | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/active_stakers.rs b/src/active_stakers.rs index df676c115..884b3ed18 100644 --- a/src/active_stakers.rs +++ b/src/active_stakers.rs @@ -1,4 +1,3 @@ -use crate::leader_schedule::LeaderSchedule; use solana_runtime::bank::Bank; use solana_sdk::pubkey::Pubkey; use solana_sdk::timing::DEFAULT_SLOTS_PER_EPOCH; @@ -57,11 +56,7 @@ impl ActiveStakers { } pub fn new(bank: &Bank) -> Self { - Self::new_with_bounds( - bank, - DEFAULT_ACTIVE_WINDOW_NUM_SLOTS, - LeaderSchedule::tick_height_to_slot(bank.tick_height(), bank.ticks_per_slot()), - ) + Self::new_with_bounds(bank, DEFAULT_ACTIVE_WINDOW_NUM_SLOTS, bank.slot_height()) } pub fn sorted_stakes(&self) -> Vec<(Pubkey, u64)> { diff --git a/src/leader_schedule.rs b/src/leader_schedule.rs index 8ee8a7913..2c86dae8a 100644 --- a/src/leader_schedule.rs +++ b/src/leader_schedule.rs @@ -39,10 +39,6 @@ impl LeaderSchedule { bank.slots_per_epoch(), ) } - - pub fn tick_height_to_slot(tick_height: u64, ticks_per_slot: u64) -> u64 { - tick_height / ticks_per_slot - } } impl Index for LeaderSchedule {