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

vote_api cleanup (#3710)

Browse Source 
* vote_api cleanup

* fixups

* fixup

* remove unused code

* revert removal of serialize and deserialize

* ...

* increase coverage, bootstrap staking

* Sagar's STAKE to my VOTE
This commit is contained in:
Rob Walker
2019-04-10 17:52:47 -07:00
committed by GitHub
parent 1b5845ac3e
commit f1e7237c09
24 changed files with 638 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/staking_utils.rs
View File

@@ -76,7 +76,7 @@ pub fn node_staked_accounts_at_epoch(
fn filter_no_delegate(account_id: &Pubkey, account: &Account) -> bool {
VoteState::deserialize(&account.data)
.map(|vote_state| vote_state.delegate_id != *account_id)
.map(|vote_state| vote_state.node_id != *account_id)
.unwrap_or(false)
}
@@ -104,7 +104,7 @@ fn to_delegated_stakes(
) -> HashMap<Pubkey, u64> {
let mut map: HashMap<Pubkey, u64> = HashMap::new();
node_staked_accounts.for_each(|(stake, state)| {
let delegate = &state.delegate_id;
let delegate = &state.node_id;
map.entry(*delegate)
.and_modify(|s| *s += stake)
.or_insert(stake);
@@ -200,7 +200,7 @@ mod tests {
// Make a mint vote account. Because the mint has nonzero stake, this
// should show up in the active set
voting_keypair_tests::new_vote_account_with_delegate(
voting_keypair_tests::new_vote_account(
&mint_keypair,
&bank_voter,
&mint_keypair.pubkey(),
@@ -283,11 +283,11 @@ mod tests {
// Delegate 1 has stake of 3
for i in 0..3 {
stakes.push((i, VoteState::new(&delegate1)));
stakes.push((i, VoteState::new(&Pubkey::new_rand(), &delegate1, 0)));
}
// Delegate 1 has stake of 5
stakes.push((5, VoteState::new(&delegate2)));
stakes.push((5, VoteState::new(&Pubkey::new_rand(), &delegate2, 0)));
let result = to_delegated_stakes(stakes.into_iter());
assert_eq!(result.len(), 2);