Boot new_with_leader_scheduler_config
Only used in one place. Easy enough to use the one with the shared leader scheduler.
This commit is contained in:
10
src/bank.rs
10
src/bank.rs
@ -8,7 +8,7 @@ use crate::counter::Counter;
|
||||
use crate::entry::Entry;
|
||||
use crate::genesis_block::GenesisBlock;
|
||||
use crate::last_id_queue::{LastIdQueue, MAX_ENTRY_IDS};
|
||||
use crate::leader_scheduler::{LeaderScheduler, LeaderSchedulerConfig};
|
||||
use crate::leader_scheduler::LeaderScheduler;
|
||||
use crate::poh_recorder::{PohRecorder, PohRecorderError};
|
||||
use crate::result::Error;
|
||||
use crate::rpc_pubsub::RpcSubscriptions;
|
||||
@ -132,14 +132,6 @@ impl Bank {
|
||||
bank
|
||||
}
|
||||
|
||||
pub fn new_with_leader_scheduler_config(
|
||||
genesis_block: &GenesisBlock,
|
||||
leader_scheduler_config: &LeaderSchedulerConfig,
|
||||
) -> Self {
|
||||
let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::new(leader_scheduler_config)));
|
||||
Self::new_with_leader_scheduler(genesis_block, leader_scheduler)
|
||||
}
|
||||
|
||||
pub fn new(genesis_block: &GenesisBlock) -> Self {
|
||||
let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::default()));
|
||||
Self::new_with_leader_scheduler(genesis_block, leader_scheduler)
|
||||
|
@ -262,10 +262,11 @@ mod tests {
|
||||
use super::*;
|
||||
use crate::entry::EntrySlice;
|
||||
use crate::genesis_block::GenesisBlock;
|
||||
use crate::leader_scheduler::{LeaderSchedulerConfig, DEFAULT_TICKS_PER_SLOT};
|
||||
use crate::leader_scheduler::{LeaderScheduler, LeaderSchedulerConfig, DEFAULT_TICKS_PER_SLOT};
|
||||
use crate::packet::to_packets;
|
||||
use solana_sdk::signature::{Keypair, KeypairUtil};
|
||||
use solana_sdk::system_transaction::SystemTransaction;
|
||||
use std::sync::RwLock;
|
||||
use std::thread::sleep;
|
||||
|
||||
#[test]
|
||||
@ -459,9 +460,11 @@ mod tests {
|
||||
solana_logger::setup();
|
||||
let (genesis_block, mint_keypair) = GenesisBlock::new(2);
|
||||
let leader_scheduler_config = LeaderSchedulerConfig::new(1, 1, 1);
|
||||
let bank = Arc::new(Bank::new_with_leader_scheduler_config(
|
||||
let leader_scheduler =
|
||||
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config)));
|
||||
let bank = Arc::new(Bank::new_with_leader_scheduler(
|
||||
&genesis_block,
|
||||
&leader_scheduler_config,
|
||||
leader_scheduler,
|
||||
));
|
||||
let (verified_sender, verified_receiver) = channel();
|
||||
let (to_validator_sender, to_validator_receiver) = channel();
|
||||
|
Reference in New Issue
Block a user