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

Remove redundant annotations

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-01-29 21:37:11 -07:00
parent a16e41002e
commit 06a1681fdc
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/leader_scheduler.rs
View File

@ -702,7 +702,7 @@ mod tests {
// Create a vote account // Create a vote account
let vote_signer = VoteSignerProxy::new_local(&Arc::new(new_keypair)); let vote_signer = VoteSignerProxy::new_local(&Arc::new(new_keypair));
vote_signer vote_signer
.new_vote_account(&bank, 1 as u64, genesis_block.last_id()) .new_vote_account(&bank, 1, genesis_block.last_id())
.unwrap(); .unwrap();
// Push a vote for the account // Push a vote for the account
@ -723,7 +723,7 @@ mod tests {
// Create a vote account // Create a vote account
let vote_signer = VoteSignerProxy::new_local(&Arc::new(new_keypair)); let vote_signer = VoteSignerProxy::new_local(&Arc::new(new_keypair));
vote_signer vote_signer
.new_vote_account(&bank, 1 as u64, genesis_block.last_id()) .new_vote_account(&bank, 1, genesis_block.last_id())
.unwrap(); .unwrap();
push_vote( push_vote(
@ -1049,7 +1049,7 @@ mod tests {
let vote_signer = VoteSignerProxy::new_local(&Arc::new(leader_keypair)); let vote_signer = VoteSignerProxy::new_local(&Arc::new(leader_keypair));
// Create a vote account // Create a vote account
vote_signer vote_signer
.new_vote_account(&bank, 1 as u64, genesis_block.last_id()) .new_vote_account(&bank, 1, genesis_block.last_id())
.unwrap(); .unwrap();
// Vote twice // Vote twice
@ -1195,7 +1195,7 @@ mod tests {
// Create a vote account // Create a vote account
let vote_signer = VoteSignerProxy::new_local(&Arc::new(validator_keypair)); let vote_signer = VoteSignerProxy::new_local(&Arc::new(validator_keypair));
vote_signer vote_signer
.new_vote_account(&bank, 1 as u64, genesis_block.last_id()) .new_vote_account(&bank, 1, genesis_block.last_id())
.unwrap(); .unwrap();
push_vote( push_vote(
@ -1212,13 +1212,7 @@ mod tests {
// [(validator, 1), (leader, leader_stake)]. Thus we just need to make sure that // [(validator, 1), (leader, leader_stake)]. Thus we just need to make sure that
// seed % (leader_stake + 1) > 0 to make sure that the leader is picked again. // seed % (leader_stake + 1) > 0 to make sure that the leader is picked again.
let seed = LeaderScheduler::calculate_seed(bootstrap_height); let seed = LeaderScheduler::calculate_seed(bootstrap_height);
let leader_stake = { let leader_stake = if seed % 3 == 0 { 3 } else { 2 };
if seed % 3 == 0 {
3
} else {
2
}
};
let vote_account_tokens = 1; let vote_account_tokens = 1;
bank.transfer( bank.transfer(
@ -1355,7 +1349,7 @@ mod tests {
.unwrap(); .unwrap();
let vote_signer = VoteSignerProxy::new_local(&Arc::new(validator_keypair)); let vote_signer = VoteSignerProxy::new_local(&Arc::new(validator_keypair));
vote_signer vote_signer
.new_vote_account(&bank, 1 as u64, genesis_block.last_id()) .new_vote_account(&bank, 1, genesis_block.last_id())
.unwrap(); .unwrap();
push_vote( push_vote(
&vote_signer, &vote_signer,
@ -1369,7 +1363,7 @@ mod tests {
.unwrap(); .unwrap();
let vote_signer = VoteSignerProxy::new_local(&Arc::new(bootstrap_leader_keypair)); let vote_signer = VoteSignerProxy::new_local(&Arc::new(bootstrap_leader_keypair));
vote_signer vote_signer
.new_vote_account(&bank, 1 as u64, genesis_block.last_id()) .new_vote_account(&bank, 1, genesis_block.last_id())
.unwrap(); .unwrap();
// Add leader to the active set // Add leader to the active set