blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use into_iter()

This commit is contained in:
Michael Vines 2020-03-18 11:43:20 -07:00
parent bb92184085
commit 306a5c849e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/src/bank.rs
View File

@ -1539,12 +1539,12 @@ impl Bank {
}); });
let validator_rent_shares = validator_stakes let validator_rent_shares = validator_stakes
.iter() .into_iter()
.map(|(pubkey, staked)| { .map(|(pubkey, staked)| {
let rent_share = let rent_share =
(((*staked * rent_to_be_distributed) as f64) / (total_staked as f64)) as u64; (((staked * rent_to_be_distributed) as f64) / (total_staked as f64)) as u64;
rent_distributed_in_initial_round += rent_share; rent_distributed_in_initial_round += rent_share;
(*pubkey, rent_share) (pubkey, rent_share)
}) })
.collect::<Vec<(Pubkey, u64)>>(); .collect::<Vec<(Pubkey, u64)>>();
@ -1553,17 +1553,17 @@ impl Bank {
let mut leftover_lamports = rent_to_be_distributed - rent_distributed_in_initial_round; let mut leftover_lamports = rent_to_be_distributed - rent_distributed_in_initial_round;
validator_rent_shares validator_rent_shares
.iter() .into_iter()
.for_each(|(pubkey, rent_share)| { .for_each(|(pubkey, rent_share)| {
let rent_to_be_paid = if leftover_lamports > 0 { let rent_to_be_paid = if leftover_lamports > 0 {
leftover_lamports -= 1; leftover_lamports -= 1;
*rent_share + 1 rent_share + 1
} else { } else {
*rent_share rent_share
}; };
let mut account = self.get_account(pubkey).unwrap_or_default(); let mut account = self.get_account(&pubkey).unwrap_or_default();
account.lamports += rent_to_be_paid; account.lamports += rent_to_be_paid;
self.store_account(pubkey, &account); self.store_account(&pubkey, &account);
}); });
} }