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

Refactor reward block calculation fn (#32167) 

refactor reward block calculation fn

Co-authored-by: HaoranYi <haoran.yi@solana.com>
This commit is contained in:
HaoranYi 2023-06-16 08:40:23 -05:00 committed by GitHub
parent 37f51e8376
commit af7b7f1436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/src/bank.rs
View File

@ -1528,7 +1528,8 @@ impl Bank {
#[allow(dead_code)] #[allow(dead_code)]
/// Calculate the number of blocks required to distribute rewards to all stake accounts. /// Calculate the number of blocks required to distribute rewards to all stake accounts.
fn get_reward_distribution_num_blocks(&self, total_stake_accounts: usize) -> u64 { fn get_reward_distribution_num_blocks(&self, rewards: &StakeRewards) -> u64 {
let total_stake_accounts = rewards.len();
if self.epoch_schedule.warmup && self.epoch < self.first_normal_epoch() { if self.epoch_schedule.warmup && self.epoch < self.first_normal_epoch() {
1 1
} else { } else {
@ -1544,9 +1545,8 @@ impl Bank {
#[allow(dead_code)] #[allow(dead_code)]
/// Return the total number of blocks in reward interval (including both calculation and crediting). /// Return the total number of blocks in reward interval (including both calculation and crediting).
fn get_reward_total_num_blocks(&self, total_stake_accounts: usize) -> u64 { fn get_reward_total_num_blocks(&self, rewards: &StakeRewards) -> u64 {
self.get_reward_calculation_num_blocks() self.get_reward_calculation_num_blocks() + self.get_reward_distribution_num_blocks(rewards)
+ self.get_reward_distribution_num_blocks(total_stake_accounts)
} }
#[allow(dead_code)] #[allow(dead_code)]
@ -2642,8 +2642,7 @@ impl Bank {
) )
.unwrap_or_default(); .unwrap_or_default();
let num_partitions = let num_partitions = self.get_reward_distribution_num_blocks(&stake_rewards.stake_rewards);
self.get_reward_distribution_num_blocks(stake_rewards.stake_rewards.len());
let stake_rewards_by_partition = hash_rewards_into_partitions( let stake_rewards_by_partition = hash_rewards_into_partitions(
std::mem::take(&mut stake_rewards.stake_rewards), std::mem::take(&mut stake_rewards.stake_rewards),
&self.parent_hash(), &self.parent_hash(),

26
runtime/src/bank/tests.rs
View File

@ -13196,14 +13196,11 @@ fn test_get_reward_distribution_num_blocks_normal() {
.map(|_| StakeReward::new_random()) .map(|_| StakeReward::new_random())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
assert_eq!( assert_eq!(bank.get_reward_distribution_num_blocks(&stake_rewards), 2);
bank.get_reward_distribution_num_blocks(stake_rewards.len()),
2
);
assert_eq!(bank.get_reward_calculation_num_blocks(), 1); assert_eq!(bank.get_reward_calculation_num_blocks(), 1);
assert_eq!( assert_eq!(
bank.get_reward_total_num_blocks(stake_rewards.len()), bank.get_reward_total_num_blocks(&stake_rewards),
bank.get_reward_distribution_num_blocks(stake_rewards.len()) bank.get_reward_distribution_num_blocks(&stake_rewards)
+ bank.get_reward_calculation_num_blocks(), + bank.get_reward_calculation_num_blocks(),
); );
} }
@ -13224,14 +13221,11 @@ fn test_get_reward_distribution_num_blocks_cap() {
.map(|_| StakeReward::new_random()) .map(|_| StakeReward::new_random())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
assert_eq!( assert_eq!(bank.get_reward_distribution_num_blocks(&stake_rewards), 1);
bank.get_reward_distribution_num_blocks(stake_rewards.len()),
1
);
assert_eq!(bank.get_reward_calculation_num_blocks(), 1); assert_eq!(bank.get_reward_calculation_num_blocks(), 1);
assert_eq!( assert_eq!(
bank.get_reward_total_num_blocks(stake_rewards.len()), bank.get_reward_total_num_blocks(&stake_rewards),
bank.get_reward_distribution_num_blocks(stake_rewards.len()) bank.get_reward_distribution_num_blocks(&stake_rewards)
+ bank.get_reward_calculation_num_blocks(), + bank.get_reward_calculation_num_blocks(),
); );
} }
@ -13243,11 +13237,13 @@ fn test_get_reward_distribution_num_blocks_warmup() {
let (genesis_config, _mint_keypair) = create_genesis_config(1_000_000 * LAMPORTS_PER_SOL); let (genesis_config, _mint_keypair) = create_genesis_config(1_000_000 * LAMPORTS_PER_SOL);
let bank = Bank::new_for_tests(&genesis_config); let bank = Bank::new_for_tests(&genesis_config);
assert_eq!(bank.get_reward_distribution_num_blocks(0), 1); let rewards = vec![];
assert_eq!(bank.get_reward_distribution_num_blocks(&rewards), 1);
assert_eq!(bank.get_reward_calculation_num_blocks(), 1); assert_eq!(bank.get_reward_calculation_num_blocks(), 1);
assert_eq!( assert_eq!(
bank.get_reward_total_num_blocks(0), bank.get_reward_total_num_blocks(&rewards),
bank.get_reward_distribution_num_blocks(0) + bank.get_reward_calculation_num_blocks(), bank.get_reward_distribution_num_blocks(&rewards)
+ bank.get_reward_calculation_num_blocks(),
); );
} }