From e396a1031252cd87045cd4940df26582fb1d9cc8 Mon Sep 17 00:00:00 2001 From: "Jeff Washington (jwash)" Date: Tue, 23 May 2023 22:10:51 -0500 Subject: [PATCH] change StartBlockHeightAndRewards from parent to current (#31781) --- runtime/src/bank.rs | 4 ++-- runtime/src/serde_snapshot/tests.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index b9d8d9937a..ad3598ddc2 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -878,8 +878,8 @@ impl AbiExample for OptionalDropCallback { #[derive(AbiExample, Debug, Clone, PartialEq, Serialize, Deserialize)] pub(crate) struct StartBlockHeightAndRewards { - /// the block height of the parent of the slot at which rewards distribution began - pub(crate) parent_start_block_height: u64, + /// the block height of the slot at which rewards distribution began + pub(crate) start_block_height: u64, /// calculated epoch rewards pending distribution pub(crate) calculated_epoch_stake_rewards: Arc, } diff --git a/runtime/src/serde_snapshot/tests.rs b/runtime/src/serde_snapshot/tests.rs index cf80616ebd..b499383ef9 100644 --- a/runtime/src/serde_snapshot/tests.rs +++ b/runtime/src/serde_snapshot/tests.rs @@ -719,7 +719,7 @@ mod test_bank_serialize { // This some what long test harness is required to freeze the ABI of // Bank's serialization due to versioned nature - #[frozen_abi(digest = "8aBQnNxnfKDxGEmMwaq9uLeMh3fw5sKsMGZBsCp15Dmv")] + #[frozen_abi(digest = "9BucA5MtPMNNUjADyV27vNgzvDy1RqCLH2gRq5NEuDEF")] #[derive(Serialize, AbiExample)] pub struct BankAbiTestWrapperNewer { #[serde(serialize_with = "wrapper_newer")]