From c5876ddca9db7479b36f2009e741eb665bc24fa9 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Sat, 23 Feb 2019 14:09:53 -0700 Subject: [PATCH] Make LeaderScheduler::new_with_window_len private It's useful for unit-testing, but generally isn't a variable validators should be modifying. Blockstream and BlockstreamService were the only ones using it. Switching them from a hard-coded 10 to the default didn't cause any test failures, so running with it. --- src/blockstream.rs | 2 +- src/blockstream_service.rs | 2 +- src/leader_scheduler.rs | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/blockstream.rs b/src/blockstream.rs index de1131c712..197bda383a 100644 --- a/src/blockstream.rs +++ b/src/blockstream.rs @@ -181,7 +181,7 @@ mod test { genesis_block.slots_per_epoch = 2; let bank = Bank::new(&genesis_block); - let leader_scheduler = LeaderScheduler::new_with_window_len(10, &bank); + let leader_scheduler = LeaderScheduler::new_with_bank(&bank); let leader_scheduler = Arc::new(RwLock::new(leader_scheduler)); // Set up blockstream diff --git a/src/blockstream_service.rs b/src/blockstream_service.rs index 938516da9d..582d6c4656 100644 --- a/src/blockstream_service.rs +++ b/src/blockstream_service.rs @@ -136,7 +136,7 @@ mod test { genesis_block.slots_per_epoch = 2; let bank = Bank::new(&genesis_block); - let leader_scheduler = LeaderScheduler::new_with_window_len(10, &bank); + let leader_scheduler = LeaderScheduler::new_with_bank(&bank); let leader_scheduler = Arc::new(RwLock::new(leader_scheduler)); // Set up blockstream diff --git a/src/leader_scheduler.rs b/src/leader_scheduler.rs index 9778353ff1..c54927c134 100644 --- a/src/leader_scheduler.rs +++ b/src/leader_scheduler.rs @@ -105,7 +105,9 @@ impl LeaderScheduler { } } - pub fn new_with_window_len(active_window_slot_len: u64, bank: &Bank) -> Self { + // Same as new_with_bank() but allows caller to override `active_window_slot_len`. + // Used by unit-tests. + fn new_with_window_len(active_window_slot_len: u64, bank: &Bank) -> Self { let config = LeaderSchedulerConfig::new( bank.ticks_per_slot(), bank.slots_per_epoch(),