gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Boot new_with_leader_scheduler_config

Browse Source 
Only used in one place. Easy enough to use the one with the shared
leader scheduler.
This commit is contained in:
Greg Fitzgerald
2019-02-16 10:08:41 -07:00
parent 97c93629a5
commit 3bfe2e75b5
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bank.rs
View File

@ -8,7 +8,7 @@ use crate::counter::Counter;
use crate::entry::Entry; use crate::entry::Entry;
use crate::genesis_block::GenesisBlock; use crate::genesis_block::GenesisBlock;
use crate::last_id_queue::{LastIdQueue, MAX_ENTRY_IDS}; 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::poh_recorder::{PohRecorder, PohRecorderError};
use crate::result::Error; use crate::result::Error;
use crate::rpc_pubsub::RpcSubscriptions; use crate::rpc_pubsub::RpcSubscriptions;
@ -132,14 +132,6 @@ impl Bank {
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 { pub fn new(genesis_block: &GenesisBlock) -> Self {
let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::default())); let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::default()));
Self::new_with_leader_scheduler(genesis_block, leader_scheduler) Self::new_with_leader_scheduler(genesis_block, leader_scheduler)

9
src/banking_stage.rs
View File

@ -262,10 +262,11 @@ mod tests {
use super::*; use super::*;
use crate::entry::EntrySlice; use crate::entry::EntrySlice;
use crate::genesis_block::GenesisBlock; 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 crate::packet::to_packets;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_transaction::SystemTransaction; use solana_sdk::system_transaction::SystemTransaction;
use std::sync::RwLock;
use std::thread::sleep; use std::thread::sleep;
#[test] #[test]
@ -459,9 +460,11 @@ mod tests {
solana_logger::setup(); solana_logger::setup();
let (genesis_block, mint_keypair) = GenesisBlock::new(2); let (genesis_block, mint_keypair) = GenesisBlock::new(2);
let leader_scheduler_config = LeaderSchedulerConfig::new(1, 1, 1); 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, &genesis_block,
&leader_scheduler_config, leader_scheduler,
)); ));
let (verified_sender, verified_receiver) = channel(); let (verified_sender, verified_receiver) = channel();
let (to_validator_sender, to_validator_receiver) = channel(); let (to_validator_sender, to_validator_receiver) = channel();