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

Pacify clippy

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-08-22 20:28:05 -06:00
committed by Grimes
parent 816de4f8ec
commit 85f96d926a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fullnode.rs
View File

@ -79,14 +79,14 @@ impl Fullnode {
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
let local_requests_addr = node.sockets.requests.local_addr().unwrap(); let local_requests_addr = node.sockets.requests.local_addr().unwrap();
let requests_addr = node.data.contact_info.rpu; let requests_addr = node.data.contact_info.rpu;
let leader_info = leader_addr.map(|x| NodeInfo::new_entry_point(x)); let leader_info = leader_addr.map(NodeInfo::new_entry_point);
let server = Self::new_with_bank( let server = Self::new_with_bank(
keypair, keypair,
bank, bank,
entry_height, entry_height,
&ledger_tail, &ledger_tail,
node, node,
leader_info, leader_info.as_ref(),
exit, exit,
Some(ledger_path), Some(ledger_path),
sigverify_disabled, sigverify_disabled,
@ -166,7 +166,7 @@ impl Fullnode {
entry_height: u64, entry_height: u64,
ledger_tail: &[Entry], ledger_tail: &[Entry],
mut node: TestNode, mut node: TestNode,
leader_info: Option<NodeInfo>, leader_info: Option<&NodeInfo>,
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
ledger_path: Option<&str>, ledger_path: Option<&str>,
sigverify_disabled: bool, sigverify_disabled: bool,
@ -207,7 +207,7 @@ impl Fullnode {
thread_hdls.extend(ncp.thread_hdls()); thread_hdls.extend(ncp.thread_hdls());
match leader_info { match leader_info {
Some(ref leader_info) => { Some(leader_info) => {
// Start in validator mode. // Start in validator mode.
crdt.write().unwrap().insert(leader_info); crdt.write().unwrap().insert(leader_info);
let tvu = Tvu::new( let tvu = Tvu::new(
@ -301,7 +301,7 @@ mod tests {
let bank = Bank::new(&alice); let bank = Bank::new(&alice);
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
let entry = tn.data.clone(); let entry = tn.data.clone();
let v = Fullnode::new_with_bank(keypair, bank, 0, &[], tn, Some(entry), exit, None, false); let v = Fullnode::new_with_bank(keypair, bank, 0, &[], tn, Some(&entry), exit, None, false);
v.exit(); v.exit();
v.join().unwrap(); v.join().unwrap();
} }
@ -315,7 +315,7 @@ mod tests {
let bank = Bank::new(&alice); let bank = Bank::new(&alice);
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
let entry = tn.data.clone(); let entry = tn.data.clone();
Fullnode::new_with_bank(keypair, bank, 0, &[], tn, Some(entry), exit, None, false) Fullnode::new_with_bank(keypair, bank, 0, &[], tn, Some(&entry), exit, None, false)
}) })
.collect(); .collect();
//each validator can exit in parallel to speed many sequential calls to `join` //each validator can exit in parallel to speed many sequential calls to `join`