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

Fix clippy warning

Browse Source 
Always pass Arcs by reference. Then you'll only need to clone()
to cross thread boundaries.
This commit is contained in:
Greg Fitzgerald
2019-01-30 20:51:50 -07:00
parent 11f1c00ca7
commit 609e915169
5 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fullnode/src/main.rs
View File

@ -264,7 +264,7 @@ fn main() {
let gossip_addr = node.info.gossip; let gossip_addr = node.info.gossip;
let mut fullnode = Fullnode::new( let mut fullnode = Fullnode::new(
node, node,
keypair.clone(), &keypair,
ledger_path, ledger_path,
Arc::new(RwLock::new(leader_scheduler)), Arc::new(RwLock::new(leader_scheduler)),
vote_signer, vote_signer,

14
src/fullnode.rs
View File

@ -105,7 +105,7 @@ pub struct Fullnode {
impl Fullnode { impl Fullnode {
pub fn new( pub fn new(
mut node: Node, mut node: Node,
keypair: Arc<Keypair>, keypair: &Arc<Keypair>,
ledger_path: &str, ledger_path: &str,
leader_scheduler: Arc<RwLock<LeaderScheduler>>, leader_scheduler: Arc<RwLock<LeaderScheduler>>,
vote_signer: VoteSignerProxy, vote_signer: VoteSignerProxy,
@ -477,7 +477,7 @@ mod tests {
let validator = Fullnode::new( let validator = Fullnode::new(
validator_node, validator_node,
Arc::new(validator_keypair), &Arc::new(validator_keypair),
&validator_ledger_path, &validator_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&Default::default()))), Arc::new(RwLock::new(LeaderScheduler::new(&Default::default()))),
VoteSignerProxy::new(), VoteSignerProxy::new(),
@ -509,7 +509,7 @@ mod tests {
Fullnode::new( Fullnode::new(
validator_node, validator_node,
Arc::new(validator_keypair), &Arc::new(validator_keypair),
&validator_ledger_path, &validator_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&Default::default()))), Arc::new(RwLock::new(LeaderScheduler::new(&Default::default()))),
VoteSignerProxy::new(), VoteSignerProxy::new(),
@ -573,7 +573,7 @@ mod tests {
// Start up the leader // Start up the leader
let mut bootstrap_leader = Fullnode::new( let mut bootstrap_leader = Fullnode::new(
bootstrap_leader_node, bootstrap_leader_node,
bootstrap_leader_keypair, &bootstrap_leader_keypair,
&bootstrap_leader_ledger_path, &bootstrap_leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
signer, signer,
@ -658,7 +658,7 @@ mod tests {
// Test that a node knows to transition to a validator based on parsing the ledger // Test that a node knows to transition to a validator based on parsing the ledger
let bootstrap_leader = Fullnode::new( let bootstrap_leader = Fullnode::new(
bootstrap_leader_node, bootstrap_leader_node,
bootstrap_leader_keypair, &bootstrap_leader_keypair,
&bootstrap_leader_ledger_path, &bootstrap_leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
VoteSignerProxy::new(), VoteSignerProxy::new(),
@ -671,7 +671,7 @@ mod tests {
// Test that a node knows to transition to a leader based on parsing the ledger // Test that a node knows to transition to a leader based on parsing the ledger
let validator = Fullnode::new( let validator = Fullnode::new(
validator_node, validator_node,
validator_keypair, &validator_keypair,
&validator_ledger_path, &validator_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
VoteSignerProxy::new(), VoteSignerProxy::new(),
@ -755,7 +755,7 @@ mod tests {
// Start the validator // Start the validator
let validator = Fullnode::new( let validator = Fullnode::new(
validator_node, validator_node,
validator_keypair, &validator_keypair,
&validator_ledger_path, &validator_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
vote_signer, vote_signer,

2
src/thin_client.rs
View File

@ -455,7 +455,7 @@ pub fn new_fullnode(ledger_name: &'static str) -> (Fullnode, NodeInfo, Keypair,
let vote_signer = VoteSignerProxy::new_local(&vote_account_keypair); let vote_signer = VoteSignerProxy::new_local(&vote_account_keypair);
let node = Fullnode::new( let node = Fullnode::new(
node, node,
node_keypair, &node_keypair,
&ledger_path, &ledger_path,
Arc::new(RwLock::new(leader_scheduler)), Arc::new(RwLock::new(leader_scheduler)),
vote_signer, vote_signer,

44
tests/multinode.rs
View File

@ -156,7 +156,7 @@ fn test_multi_node_ledger_window() -> result::Result<()> {
let signer_proxy = VoteSignerProxy::new_local(&leader_keypair); let signer_proxy = VoteSignerProxy::new_local(&leader_keypair);
let leader = Fullnode::new( let leader = Fullnode::new(
leader, leader,
leader_keypair, &leader_keypair,
&leader_ledger_path, &leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -175,7 +175,7 @@ fn test_multi_node_ledger_window() -> result::Result<()> {
let signer_proxy = VoteSignerProxy::new_local(&keypair); let signer_proxy = VoteSignerProxy::new_local(&keypair);
let validator = Fullnode::new( let validator = Fullnode::new(
validator, validator,
keypair, &keypair,
&zero_ledger_path, &zero_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -259,7 +259,7 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
let signer_proxy = VoteSignerProxy::new_local(&leader_keypair); let signer_proxy = VoteSignerProxy::new_local(&leader_keypair);
let server = Fullnode::new( let server = Fullnode::new(
leader, leader,
leader_keypair, &leader_keypair,
&leader_ledger_path, &leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -292,7 +292,7 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
let signer_proxy = VoteSignerProxy::new_local(&keypair); let signer_proxy = VoteSignerProxy::new_local(&keypair);
let val = Fullnode::new( let val = Fullnode::new(
validator, validator,
keypair, &keypair,
&ledger_path, &ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -354,7 +354,7 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
let val = Fullnode::new( let val = Fullnode::new(
validator, validator,
keypair, &keypair,
&zero_ledger_path, &zero_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -443,7 +443,7 @@ fn test_multi_node_basic() {
let signer_proxy = VoteSignerProxy::new_local(&leader_keypair); let signer_proxy = VoteSignerProxy::new_local(&leader_keypair);
let server = Fullnode::new( let server = Fullnode::new(
leader, leader,
leader_keypair, &leader_keypair,
&leader_ledger_path, &leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -472,7 +472,7 @@ fn test_multi_node_basic() {
let signer_proxy = VoteSignerProxy::new_local(&keypair); let signer_proxy = VoteSignerProxy::new_local(&keypair);
let val = Fullnode::new( let val = Fullnode::new(
validator, validator,
keypair, &keypair,
&ledger_path, &ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -551,7 +551,7 @@ fn test_boot_validator_from_file() -> result::Result<()> {
let signer_proxy = VoteSignerProxy::new_local(&leader_keypair); let signer_proxy = VoteSignerProxy::new_local(&leader_keypair);
let leader_fullnode = Fullnode::new( let leader_fullnode = Fullnode::new(
leader, leader,
leader_keypair, &leader_keypair,
&leader_ledger_path, &leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -575,7 +575,7 @@ fn test_boot_validator_from_file() -> result::Result<()> {
let signer_proxy = VoteSignerProxy::new_local(&keypair); let signer_proxy = VoteSignerProxy::new_local(&keypair);
let val_fullnode = Fullnode::new( let val_fullnode = Fullnode::new(
validator, validator,
keypair, &keypair,
&ledger_path, &ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -607,7 +607,7 @@ fn create_leader(
let leader_data = leader.info.clone(); let leader_data = leader.info.clone();
let leader_fullnode = Fullnode::new( let leader_fullnode = Fullnode::new(
leader, leader,
leader_keypair, &leader_keypair,
&ledger_path, &ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_data.id, leader_data.id,
@ -684,7 +684,7 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
let signer_proxy = VoteSignerProxy::new_local(&keypair); let signer_proxy = VoteSignerProxy::new_local(&keypair);
let val_fullnode = Fullnode::new( let val_fullnode = Fullnode::new(
validator, validator,
keypair, &keypair,
&stale_ledger_path, &stale_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_data.id, leader_data.id,
@ -757,7 +757,7 @@ fn test_multi_node_dynamic_network() {
let signer_proxy = VoteSignerProxy::new_local(&leader_keypair); let signer_proxy = VoteSignerProxy::new_local(&leader_keypair);
let server = Fullnode::new( let server = Fullnode::new(
leader, leader,
leader_keypair, &leader_keypair,
&leader_ledger_path, &leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -831,7 +831,7 @@ fn test_multi_node_dynamic_network() {
let signer_proxy = VoteSignerProxy::new_local(&keypair); let signer_proxy = VoteSignerProxy::new_local(&keypair);
let val = Fullnode::new( let val = Fullnode::new(
validator, validator,
keypair, &keypair,
&ledger_path, &ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_pubkey, leader_pubkey,
@ -1008,7 +1008,7 @@ fn test_leader_to_validator_transition() {
let signer_proxy = VoteSignerProxy::new_local(&leader_keypair); let signer_proxy = VoteSignerProxy::new_local(&leader_keypair);
let mut leader = Fullnode::new( let mut leader = Fullnode::new(
leader_node, leader_node,
leader_keypair, &leader_keypair,
&leader_ledger_path, &leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
signer_proxy, signer_proxy,
@ -1157,7 +1157,7 @@ fn test_leader_validator_basic() {
let signer_proxy = VoteSignerProxy::new_local(&validator_keypair); let signer_proxy = VoteSignerProxy::new_local(&validator_keypair);
let mut validator = Fullnode::new( let mut validator = Fullnode::new(
validator_node, validator_node,
validator_keypair, &validator_keypair,
&validator_ledger_path, &validator_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
signer_proxy, signer_proxy,
@ -1169,7 +1169,7 @@ fn test_leader_validator_basic() {
let signer_proxy = VoteSignerProxy::new_local(&leader_keypair); let signer_proxy = VoteSignerProxy::new_local(&leader_keypair);
let mut leader = Fullnode::new( let mut leader = Fullnode::new(
leader_node, leader_node,
leader_keypair, &leader_keypair,
&leader_ledger_path, &leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
signer_proxy, signer_proxy,
@ -1356,7 +1356,7 @@ fn test_dropped_handoff_recovery() {
ledger_paths.push(bootstrap_leader_ledger_path.clone()); ledger_paths.push(bootstrap_leader_ledger_path.clone());
let bootstrap_leader = Fullnode::new( let bootstrap_leader = Fullnode::new(
bootstrap_leader_node, bootstrap_leader_node,
bootstrap_leader_keypair, &bootstrap_leader_keypair,
&bootstrap_leader_ledger_path, &bootstrap_leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
signer_proxy, signer_proxy,
@ -1378,7 +1378,7 @@ fn test_dropped_handoff_recovery() {
let signer_proxy = VoteSignerProxy::new_local(&keypair); let signer_proxy = VoteSignerProxy::new_local(&keypair);
let validator = Fullnode::new( let validator = Fullnode::new(
validator_node, validator_node,
keypair, &keypair,
&validator_ledger_path, &validator_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
signer_proxy, signer_proxy,
@ -1404,7 +1404,7 @@ fn test_dropped_handoff_recovery() {
let signer_proxy = VoteSignerProxy::new_local(&next_leader_keypair); let signer_proxy = VoteSignerProxy::new_local(&next_leader_keypair);
let next_leader = Fullnode::new( let next_leader = Fullnode::new(
next_leader_node, next_leader_node,
next_leader_keypair, &next_leader_keypair,
&next_leader_ledger_path, &next_leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
signer_proxy, signer_proxy,
@ -1542,7 +1542,7 @@ fn test_full_leader_validator_network() {
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))); Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config)));
let validator = Fullnode::new( let validator = Fullnode::new(
validator_node, validator_node,
kp.clone(), &kp,
&validator_ledger_path, &validator_ledger_path,
leader_scheduler.clone(), leader_scheduler.clone(),
signer_proxy, signer_proxy,
@ -1559,7 +1559,7 @@ fn test_full_leader_validator_network() {
let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))); let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config)));
let bootstrap_leader = Fullnode::new( let bootstrap_leader = Fullnode::new(
bootstrap_leader_node, bootstrap_leader_node,
leader_keypair.clone(), &leader_keypair,
&bootstrap_leader_ledger_path, &bootstrap_leader_ledger_path,
leader_scheduler.clone(), leader_scheduler.clone(),
signer_proxy, signer_proxy,
@ -1731,7 +1731,7 @@ fn test_broadcast_last_tick() {
let signer_proxy = VoteSignerProxy::new_local(&bootstrap_leader_keypair); let signer_proxy = VoteSignerProxy::new_local(&bootstrap_leader_keypair);
let mut bootstrap_leader = Fullnode::new( let mut bootstrap_leader = Fullnode::new(
bootstrap_leader_node, bootstrap_leader_node,
bootstrap_leader_keypair, &bootstrap_leader_keypair,
&bootstrap_leader_ledger_path, &bootstrap_leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))), Arc::new(RwLock::new(LeaderScheduler::new(&leader_scheduler_config))),
signer_proxy, signer_proxy,

8
tests/replicator.rs
View File

@ -53,7 +53,7 @@ fn test_replicator_startup() {
fullnode_config.storage_rotate_count = STORAGE_ROTATE_TEST_COUNT; fullnode_config.storage_rotate_count = STORAGE_ROTATE_TEST_COUNT;
let leader = Fullnode::new( let leader = Fullnode::new(
leader_node, leader_node,
leader_keypair, &leader_keypair,
&leader_ledger_path, &leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_info.id.clone(), leader_info.id.clone(),
@ -83,7 +83,7 @@ fn test_replicator_startup() {
fullnode_config.storage_rotate_count = STORAGE_ROTATE_TEST_COUNT; fullnode_config.storage_rotate_count = STORAGE_ROTATE_TEST_COUNT;
let validator = Fullnode::new( let validator = Fullnode::new(
validator_node, validator_node,
validator_keypair, &validator_keypair,
&validator_ledger_path, &validator_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_info.id, leader_info.id,
@ -278,7 +278,7 @@ fn test_replicator_startup_ledger_hang() {
let _ = Fullnode::new( let _ = Fullnode::new(
leader_node, leader_node,
leader_keypair, &leader_keypair,
&leader_ledger_path, &leader_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_info.id.clone(), leader_info.id.clone(),
@ -294,7 +294,7 @@ fn test_replicator_startup_ledger_hang() {
let _ = Fullnode::new( let _ = Fullnode::new(
validator_node, validator_node,
validator_keypair, &validator_keypair,
&validator_ledger_path, &validator_ledger_path,
Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader( Arc::new(RwLock::new(LeaderScheduler::from_bootstrap_leader(
leader_info.id, leader_info.id,