Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit 5d824a3

Browse files
v1.18: Fix bank new_from_field for epoch reward status (backport of #34992) (#35002)
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 <[email protected]> (cherry picked from commit b1f8a89) Co-authored-by: HaoranYi <[email protected]>
1 parent 021e555 commit 5d824a3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

runtime/src/bank.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1840,7 +1840,7 @@ impl Bank {
18401840
fields.epoch,
18411841
))),
18421842
check_program_modification_slot: false,
1843-
epoch_reward_status: EpochRewardStatus::default(),
1843+
epoch_reward_status: fields.epoch_reward_status,
18441844
};
18451845
bank.finish_init(
18461846
genesis_config,

runtime/src/bank/serde_snapshot.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ mod tests {
411411
);
412412

413413
// assert epoch_reward_status is the same as the set epoch reward status
414-
let epoch_reward_status = bank
414+
let epoch_reward_status = dbank
415415
.get_epoch_reward_status_to_serialize()
416416
.unwrap_or(&EpochRewardStatus::Inactive);
417417
if let Some(rewards) = epoch_reward_status_active {
@@ -504,7 +504,7 @@ mod tests {
504504
);
505505

506506
// assert epoch_reward_status is the same as the set epoch reward status
507-
let epoch_reward_status = bank
507+
let epoch_reward_status = dbank
508508
.get_epoch_reward_status_to_serialize()
509509
.unwrap_or(&EpochRewardStatus::Inactive);
510510
if let Some(rewards) = epoch_reward_status_active {
@@ -593,7 +593,7 @@ mod tests {
593593
assert_eq!(0, dbank.fee_rate_governor.lamports_per_signature);
594594

595595
// epoch_reward status should default to `Inactive`
596-
let epoch_reward_status = bank
596+
let epoch_reward_status = dbank
597597
.get_epoch_reward_status_to_serialize()
598598
.unwrap_or(&EpochRewardStatus::Inactive);
599599
assert_matches!(epoch_reward_status, EpochRewardStatus::Inactive);

0 commit comments

Comments
 (0)