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

bank::new_with_leader_scheduler_config() - remove Option<>

Browse Source
This commit is contained in:
Michael Vines
2019-02-06 19:35:00 -08:00
parent f789038baa
commit d9e2b94d7a
5 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fullnode.rs
View File

@ -125,7 +125,7 @@ impl Fullnode {
db_ledger,
ledger_signal_sender,
ledger_signal_receiver,
) = Self::new_bank_from_ledger(ledger_path, Some(&config.leader_scheduler_config));
) = Self::new_bank_from_ledger(ledger_path, &config.leader_scheduler_config);
info!("node info: {:?}", node.info);
info!("node entrypoint_info: {:?}", entrypoint_info_option);
@ -480,7 +480,7 @@ impl Fullnode {
pub fn new_bank_from_ledger(
ledger_path: &str,
leader_scheduler_config: Option<&LeaderSchedulerConfig>,
leader_scheduler_config: &LeaderSchedulerConfig,
) -> (Bank, u64, Hash, DbLedger, SyncSender<bool>, Receiver<bool>) {
let (db_ledger, ledger_signal_sender, ledger_signal_receiver) =
DbLedger::open_with_signal(ledger_path)
@ -829,8 +829,10 @@ mod tests {
// Close the validator so that rocksdb has locks available
validator_exit();
let (bank, entry_height, _, _, _, _) =
Fullnode::new_bank_from_ledger(&validator_ledger_path, None);
let (bank, entry_height, _, _, _, _) = Fullnode::new_bank_from_ledger(
&validator_ledger_path,
&LeaderSchedulerConfig::default(),
);
assert!(
bank.tick_height()