formatted code

This commit is contained in:
Carl
2018-09-13 19:02:14 -07:00
committed by Greg Fitzgerald
parent d3cb161c36
commit 062f654fe0
3 changed files with 37 additions and 23 deletions

View File

@ -219,7 +219,15 @@ impl BroadcastStage {
let thread_hdl = Builder::new() let thread_hdl = Builder::new()
.name("solana-broadcaster".to_string()) .name("solana-broadcaster".to_string())
.spawn(move || { .spawn(move || {
Self::run(&sock, &crdt, &window, entry_height, &recycler, &receiver); Self::run(
&sock,
&crdt,
&window,
entry_height,
&recycler,
&receiver,
exit_sender,
);
}) })
.unwrap(); .unwrap();
@ -238,27 +246,35 @@ impl Service for BroadcastStage {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crdt::{Crdt, LEADER_ROTATION_INTERVAL, Node}; use broadcast_stage::BroadcastStage;
use crdt::{Crdt, Node, LEADER_ROTATION_INTERVAL};
use entry::Entry; use entry::Entry;
use ledger::Block;
use hash::Hash; use hash::Hash;
use ledger::Block;
use mint::Mint;
use packet::BlobRecycler; use packet::BlobRecycler;
use recorder::Recorder; use recorder::Recorder;
use service::Service; use service::Service;
use signature::{Keypair, KeypairUtil, Pubkey}; use signature::{Keypair, KeypairUtil, Pubkey};
use std::sync::{Arc, RwLock};
use std::sync::mpsc::{channel, Receiver};
use broadcast_stage::BroadcastStage;
use mint::Mint;
use streamer::BlobSender;
use std::cmp; use std::cmp;
use window::{new_window_from_entries, SharedWindow}; use std::sync::mpsc::{channel, Receiver};
use std::sync::{Arc, RwLock};
use std::thread::sleep; use std::thread::sleep;
use std::time::Duration; use std::time::Duration;
use streamer::BlobSender;
use window::{new_window_from_entries, SharedWindow};
fn setup_dummy_broadcast_stage() -> fn setup_dummy_broadcast_stage() -> (
(Pubkey, Pubkey, BroadcastStage, SharedWindow, BlobSender, BlobRecycler, Arc<RwLock<Crdt>>, Vec<Entry>, Receiver<bool>) Pubkey,
{ Pubkey,
BroadcastStage,
SharedWindow,
BlobSender,
BlobRecycler,
Arc<RwLock<Crdt>>,
Vec<Entry>,
Receiver<bool>,
) {
// Setup dummy leader info // Setup dummy leader info
let leader_keypair = Keypair::new(); let leader_keypair = Keypair::new();
let id = leader_keypair.pubkey(); let id = leader_keypair.pubkey();
@ -346,8 +362,7 @@ mod tests {
} }
let genesis_len = entries.len() as u64; let genesis_len = entries.len() as u64;
let last_entry_hash = let last_entry_hash = entries.last().expect("Ledger should not be empty").id;
entries.last().expect("Ledger should not be empty").id;
// Input enough entries to make exactly LEADER_ROTATION_INTERVAL entries, which will // Input enough entries to make exactly LEADER_ROTATION_INTERVAL entries, which will
// trigger a check for leader rotation. Because the next scheduled leader // trigger a check for leader rotation. Because the next scheduled leader
@ -379,8 +394,7 @@ mod tests {
} }
match exit_receiver.recv() { match exit_receiver.recv() {
Ok(x) if x == false => Ok(x) if x == false => panic!("Unexpected value on exit channel for Broadcast stage"),
panic!("Unexpected value on exit channel for Broadcast stage"),
_ => (), _ => (),
} }

View File

@ -344,10 +344,10 @@ impl Service for Fullnode {
match self.node_role { match self.node_role {
Some(NodeRole::Validator(validator_service)) => { Some(NodeRole::Validator(validator_service)) => {
validator_service.join()?; validator_service.join()?;
}, }
Some(NodeRole::Leader(leader_service)) => { Some(NodeRole::Leader(leader_service)) => {
leader_service.join()?; leader_service.join()?;
}, }
_ => (), _ => (),
} }

View File

@ -12,9 +12,9 @@ use mint::Mint;
use packet::{self, SharedBlob, BLOB_DATA_SIZE}; use packet::{self, SharedBlob, BLOB_DATA_SIZE};
use rayon::prelude::*; use rayon::prelude::*;
use result::{Error, Result}; use result::{Error, Result};
use signature::Pubkey;
#[cfg(test)] #[cfg(test)]
use signature::{Keypair, KeypairUtil}; use signature::{Keypair, KeypairUtil};
use signature::Pubkey;
use std::fs::{create_dir_all, remove_dir_all, File, OpenOptions}; use std::fs::{create_dir_all, remove_dir_all, File, OpenOptions};
use std::io::prelude::*; use std::io::prelude::*;
use std::io::{self, BufReader, BufWriter, Seek, SeekFrom}; use std::io::{self, BufReader, BufWriter, Seek, SeekFrom};