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

De-replicode Tower constructors (#8153)

Browse Source 
automerge
This commit is contained in:
Trent Nelson
2020-02-06 19:24:10 -07:00
committed by GitHub
parent b832a03315
commit 27c8ba6afc
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/consensus.rs
View File

@ -37,7 +37,6 @@ impl StakeLockout {
} }
} }
#[derive(Default)]
pub struct Tower { pub struct Tower {
node_pubkey: Pubkey, node_pubkey: Pubkey,
threshold_depth: usize, threshold_depth: usize,
@ -47,16 +46,22 @@ pub struct Tower {
last_timestamp: BlockTimestamp, last_timestamp: BlockTimestamp,
} }
impl Tower { impl Default for Tower {
pub fn new(node_pubkey: &Pubkey, vote_account_pubkey: &Pubkey, bank_forks: &BankForks) -> Self { fn default() -> Self {
let mut tower = Self { Self {
node_pubkey: *node_pubkey, node_pubkey: Pubkey::default(),
threshold_depth: VOTE_THRESHOLD_DEPTH, threshold_depth: VOTE_THRESHOLD_DEPTH,
threshold_size: VOTE_THRESHOLD_SIZE, threshold_size: VOTE_THRESHOLD_SIZE,
lockouts: VoteState::default(), lockouts: VoteState::default(),
last_vote: Vote::default(), last_vote: Vote::default(),
last_timestamp: BlockTimestamp::default(), last_timestamp: BlockTimestamp::default(),
}; }
}
}
impl Tower {
pub fn new(node_pubkey: &Pubkey, vote_account_pubkey: &Pubkey, bank_forks: &BankForks) -> Self {
let mut tower = Self::new_with_key(node_pubkey);
tower.initialize_lockouts_from_bank_forks(&bank_forks, vote_account_pubkey); tower.initialize_lockouts_from_bank_forks(&bank_forks, vote_account_pubkey);
@ -66,11 +71,7 @@ impl Tower {
pub fn new_with_key(node_pubkey: &Pubkey) -> Self { pub fn new_with_key(node_pubkey: &Pubkey) -> Self {
Self { Self {
node_pubkey: *node_pubkey, node_pubkey: *node_pubkey,
threshold_depth: VOTE_THRESHOLD_DEPTH, ..Tower::default()
threshold_size: VOTE_THRESHOLD_SIZE,
lockouts: VoteState::default(),
last_vote: Vote::default(),
last_timestamp: BlockTimestamp::default(),
} }
} }