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

fmt

Browse Source
This commit is contained in:
Anatoly Yakovenko
2019-02-17 13:09:28 -08:00
committed by Grimes
parent 300e3d151d
commit 5f55a9be84
2 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/fullnode.rs
View File

@ -127,13 +127,8 @@ impl Fullnode {
let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::new( let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::new(
&config.leader_scheduler_config, &config.leader_scheduler_config,
))); )));
let ( let (bank, entry_height, last_entry_id, blocktree, ledger_signal_receiver) =
bank, new_bank_from_ledger(ledger_path, &config.ledger_config(), &leader_scheduler);
entry_height,
last_entry_id,
blocktree,
ledger_signal_receiver,
) = new_bank_from_ledger(ledger_path, &config.ledger_config(), &leader_scheduler);
info!("node info: {:?}", node.info); info!("node info: {:?}", node.info);
info!("node entrypoint_info: {:?}", entrypoint_info_option); info!("node entrypoint_info: {:?}", entrypoint_info_option);
@ -458,13 +453,7 @@ fn new_banks_from_blocktree(
blocktree_path: &str, blocktree_path: &str,
blocktree_config: &BlocktreeConfig, blocktree_config: &BlocktreeConfig,
leader_scheduler: &Arc<RwLock<LeaderScheduler>>, leader_scheduler: &Arc<RwLock<LeaderScheduler>>,
) -> ( ) -> (BankForks, u64, Hash, Blocktree, Receiver<bool>) {
BankForks,
u64,
Hash,
Blocktree,
Receiver<bool>,
) {
let (blocktree, ledger_signal_receiver) = let (blocktree, ledger_signal_receiver) =
Blocktree::open_with_config_signal(blocktree_path, blocktree_config) Blocktree::open_with_config_signal(blocktree_path, blocktree_config)
.expect("Expected to successfully open database ledger"); .expect("Expected to successfully open database ledger");
@ -503,20 +492,9 @@ pub fn new_bank_from_ledger(
ledger_path: &str, ledger_path: &str,
ledger_config: &BlocktreeConfig, ledger_config: &BlocktreeConfig,
leader_scheduler: &Arc<RwLock<LeaderScheduler>>, leader_scheduler: &Arc<RwLock<LeaderScheduler>>,
) -> ( ) -> (Arc<Bank>, u64, Hash, Blocktree, Receiver<bool>) {
Arc<Bank>, let (bank_forks, entry_height, last_entry_id, blocktree, ledger_signal_receiver) =
u64, new_banks_from_blocktree(ledger_path, ledger_config, leader_scheduler);
Hash,
Blocktree,
Receiver<bool>,
) {
let (
bank_forks,
entry_height,
last_entry_id,
blocktree,
ledger_signal_receiver,
) = new_banks_from_blocktree(ledger_path, ledger_config, leader_scheduler);
( (
bank_forks.working_bank(), bank_forks.working_bank(),
entry_height, entry_height,

13
src/replay_stage.rs
View File

@ -6,7 +6,6 @@ use crate::blocktree_processor;
use crate::cluster_info::ClusterInfo; use crate::cluster_info::ClusterInfo;
use crate::counter::Counter; use crate::counter::Counter;
use crate::entry::{Entry, EntryReceiver, EntrySender, EntrySlice}; use crate::entry::{Entry, EntryReceiver, EntrySender, EntrySlice};
use std::sync::mpsc::RecvTimeoutError;
use crate::leader_scheduler::LeaderScheduler; use crate::leader_scheduler::LeaderScheduler;
use crate::packet::BlobError; use crate::packet::BlobError;
use crate::result::{Error, Result}; use crate::result::{Error, Result};
@ -20,6 +19,7 @@ use solana_sdk::pubkey::Pubkey;
use solana_sdk::timing::duration_as_ms; use solana_sdk::timing::duration_as_ms;
use solana_sdk::vote_transaction::VoteTransaction; use solana_sdk::vote_transaction::VoteTransaction;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::RecvTimeoutError;
use std::sync::mpsc::{channel, Receiver}; use std::sync::mpsc::{channel, Receiver};
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
#[cfg(test)] #[cfg(test)]
@ -559,12 +559,11 @@ mod test {
let (to_leader_sender, _) = channel(); let (to_leader_sender, _) = channel();
{ {
let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::default())); let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::default()));
let (bank, entry_height, last_entry_id, blocktree, l_receiver) = let (bank, entry_height, last_entry_id, blocktree, l_receiver) = new_bank_from_ledger(
new_bank_from_ledger( &my_ledger_path,
&my_ledger_path, &BlocktreeConfig::default(),
&BlocktreeConfig::default(), &leader_scheduler,
&leader_scheduler, );
);
let blocktree = Arc::new(blocktree); let blocktree = Arc::new(blocktree);
let (replay_stage, ledger_writer_recv) = ReplayStage::new( let (replay_stage, ledger_writer_recv) = ReplayStage::new(