Remove storage of HasherKind

solana-labs · Jan 19, 2024 · b329e89 · b329e89
1 parent 5897110
commit b329e89
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -140,7 +140,7 @@ use {
         },
         epoch_info::EpochInfo,
         epoch_rewards_partition_data::{
-            get_epoch_rewards_partition_data_address, EpochRewardsPartitionDataVersion, HasherKind,
+            get_epoch_rewards_partition_data_address, EpochRewardsPartitionDataVersion,
             PartitionData,
         },
         epoch_schedule::EpochSchedule,
@@ -3603,7 +3603,6 @@ impl Bank {
         let epoch_rewards_partition_data = EpochRewardsPartitionDataVersion::V0(PartitionData {
             num_partitions,
             parent_blockhash,
-            hasher_kind: HasherKind::Sip13,
         });
         let address = get_epoch_rewards_partition_data_address(self.epoch());
 

diff --git a/sdk/program/src/epoch_rewards_partition_data.rs b/sdk/program/src/epoch_rewards_partition_data.rs
@@ -12,6 +12,14 @@ pub enum EpochRewardsPartitionDataVersion {
     V0(PartitionData),
 }
 
+impl EpochRewardsPartitionDataVersion {
+    pub fn get_hasher_kind(&self) -> HasherKind {
+        match self {
+            EpochRewardsPartitionDataVersion::V0(_) => HasherKind::Sip13,
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
 pub enum HasherKind {
     Sip13,
@@ -24,8 +32,6 @@ pub struct PartitionData {
     pub num_partitions: usize,
     /// Blockhash of the last block of the previous epoch, used to create EpochRewardsHasher
     pub parent_blockhash: Hash,
-    /// Kind of hasher used to generate partitions
-    pub hasher_kind: HasherKind,
 }
 
 pub fn get_epoch_rewards_partition_data_address(epoch: u64) -> Pubkey {