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

Don't update the leader scheduler in bank's default constructor

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-02-16 11:03:39 -07:00
parent 07b57735b1
commit 7a7349f2ff
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/bank.rs
View File

@ -121,20 +121,24 @@ impl Default for Bank {
} }
impl Bank { impl Bank {
pub fn new_with_leader_scheduler( pub fn new(genesis_block: &GenesisBlock) -> Self {
genesis_block: &GenesisBlock, let bank = Self::default();
leader_scheduler: Arc<RwLock<LeaderScheduler>>,
) -> Self {
let mut bank = Self::default();
bank.leader_scheduler = leader_scheduler;
bank.process_genesis_block(genesis_block); bank.process_genesis_block(genesis_block);
bank.add_builtin_programs(); bank.add_builtin_programs();
bank bank
} }
pub fn new(genesis_block: &GenesisBlock) -> Self { pub fn new_with_leader_scheduler(
let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::default())); genesis_block: &GenesisBlock,
Self::new_with_leader_scheduler(genesis_block, leader_scheduler) leader_scheduler: Arc<RwLock<LeaderScheduler>>,
) -> Self {
let mut bank = Bank::new(genesis_block);
leader_scheduler
.write()
.unwrap()
.update_tick_height(0, &bank);
bank.leader_scheduler = leader_scheduler;
bank
} }
pub fn set_subscriptions(&self, subscriptions: Arc<RpcSubscriptions>) { pub fn set_subscriptions(&self, subscriptions: Arc<RpcSubscriptions>) {
@ -197,10 +201,6 @@ impl Bank {
&genesis_block.bootstrap_leader_vote_account_id, &genesis_block.bootstrap_leader_vote_account_id,
&bootstrap_leader_vote_account, &bootstrap_leader_vote_account,
); );
self.leader_scheduler
.write()
.unwrap()
.update_tick_height(0, self);
self.last_id_queue self.last_id_queue
.write() .write()