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

Fix bank new_from_field for epoch reward status (#34992) 

* fix bank new_from_field for epoch reward status

* fix bank serde test assert for epoch reward status

---------

Co-authored-by: HaoranYi <haoran.yi@solana.com>
This commit is contained in:
HaoranYi 2024-01-29 09:00:40 -06:00 committed by GitHub
parent 8fde8d26c7
commit b1f8a89da5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/bank.rs
View File

@ -1853,7 +1853,7 @@ impl Bank {
fields.epoch,
))),
check_program_modification_slot: false,
epoch_reward_status: EpochRewardStatus::default(),
epoch_reward_status: fields.epoch_reward_status,
};
bank.finish_init(
genesis_config,

6
runtime/src/bank/serde_snapshot.rs
View File

@ -411,7 +411,7 @@ mod tests {
);
// assert epoch_reward_status is the same as the set epoch reward status
let epoch_reward_status = bank
let epoch_reward_status = dbank
.get_epoch_reward_status_to_serialize()
.unwrap_or(&EpochRewardStatus::Inactive);
if let Some(rewards) = epoch_reward_status_active {
@ -504,7 +504,7 @@ mod tests {
);
// assert epoch_reward_status is the same as the set epoch reward status
let epoch_reward_status = bank
let epoch_reward_status = dbank
.get_epoch_reward_status_to_serialize()
.unwrap_or(&EpochRewardStatus::Inactive);
if let Some(rewards) = epoch_reward_status_active {
@ -593,7 +593,7 @@ mod tests {
assert_eq!(0, dbank.fee_rate_governor.lamports_per_signature);
// epoch_reward status should default to `Inactive`
let epoch_reward_status = bank
let epoch_reward_status = dbank
.get_epoch_reward_status_to_serialize()
.unwrap_or(&EpochRewardStatus::Inactive);
assert_matches!(epoch_reward_status, EpochRewardStatus::Inactive);