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

Rename mode-specific constructors and return only thread handles

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-08-22 17:52:14 -06:00
committed by Grimes
parent be58fdf1bb
commit a133784706
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/fullnode.rs
View File

@ -121,10 +121,10 @@ impl Fullnode {
ledger_path: Option<&str>, ledger_path: Option<&str>,
sigverify_disabled: bool, sigverify_disabled: bool,
) -> Self { ) -> Self {
match leader_info { let thread_hdls = match leader_info {
Some(leader_info) => { Some(leader_info) => {
// Start in validator mode. // Start in validator mode.
Self::new_validator( Self::create_validator_threads(
keypair, keypair,
bank, bank,
entry_height, entry_height,
@ -140,7 +140,7 @@ impl Fullnode {
// Start in leader mode. // Start in leader mode.
node.data.leader_id = node.data.id; node.data.leader_id = node.data.id;
Self::new_leader( Self::create_leader_threads(
keypair, keypair,
bank, bank,
entry_height, entry_height,
@ -151,7 +151,9 @@ impl Fullnode {
sigverify_disabled, sigverify_disabled,
) )
} }
} };
Fullnode { exit, thread_hdls }
} }
/// Create a server instance acting as a leader. /// Create a server instance acting as a leader.
@ -178,7 +180,7 @@ impl Fullnode {
/// | | `------------` /// | | `------------`
/// `---------------------` /// `---------------------`
/// ``` /// ```
fn new_leader( fn create_leader_threads(
keypair: Keypair, keypair: Keypair,
bank: Bank, bank: Bank,
entry_height: u64, entry_height: u64,
@ -187,7 +189,7 @@ impl Fullnode {
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
ledger_path: &str, ledger_path: &str,
sigverify_disabled: bool, sigverify_disabled: bool,
) -> Self { ) -> Vec<JoinHandle<()>> {
let tick_duration = None; let tick_duration = None;
// TODO: To light up PoH, uncomment the following line: // TODO: To light up PoH, uncomment the following line:
//let tick_duration = Some(Duration::from_millis(1000)); //let tick_duration = Some(Duration::from_millis(1000));
@ -252,7 +254,7 @@ impl Fullnode {
); );
thread_hdls.extend(broadcast_stage.thread_hdls()); thread_hdls.extend(broadcast_stage.thread_hdls());
Fullnode { exit, thread_hdls } thread_hdls
} }
/// Create a server instance acting as a validator. /// Create a server instance acting as a validator.
@ -284,7 +286,7 @@ impl Fullnode {
/// `--------` | | `------------` /// `--------` | | `------------`
/// `-------------------------------` /// `-------------------------------`
/// ``` /// ```
fn new_validator( fn create_validator_threads(
keypair: Keypair, keypair: Keypair,
bank: Bank, bank: Bank,
entry_height: u64, entry_height: u64,
@ -294,7 +296,7 @@ impl Fullnode {
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
ledger_path: Option<&str>, ledger_path: Option<&str>,
_sigverify_disabled: bool, _sigverify_disabled: bool,
) -> Self { ) -> Vec<JoinHandle<()>> {
let bank = Arc::new(bank); let bank = Arc::new(bank);
let mut thread_hdls = vec![]; let mut thread_hdls = vec![];
let rpu = Rpu::new( let rpu = Rpu::new(
@ -349,7 +351,7 @@ impl Fullnode {
); );
thread_hdls.extend(tvu.thread_hdls()); thread_hdls.extend(tvu.thread_hdls());
thread_hdls.extend(ncp.thread_hdls()); thread_hdls.extend(ncp.thread_hdls());
Fullnode { exit, thread_hdls } thread_hdls
} }
//used for notifying many nodes in parallel to exit //used for notifying many nodes in parallel to exit