Refactor: Replace KeyHash with PoolId for verifier.rs

Author: lowhung

modules/accounts_state/src/rewards.rs

@@ -2,10 +2,9 @@
 
 use crate::snapshot::{Snapshot, SnapshotSPO};
 use acropolis_common::{
-    protocol_params::ShelleyParams, rational_number::RationalNumber, Lovelace, PoolId, SPORewards,
-    StakeAddress,
+    protocol_params::ShelleyParams, rational_number::RationalNumber, Lovelace, PoolId, RewardType,
+    SPORewards, StakeAddress,
 };
-use acropolis_common::{PoolId, RewardType};
 use anyhow::{bail, Result};
 use bigdecimal::{BigDecimal, One, ToPrimitive, Zero};
 use std::cmp::min;
@@ -389,7 +388,7 @@ fn calculate_spo_rewards(
                     account: delegator_stake_address.clone(),
                     rtype: RewardType::Member,
                     amount: to_pay,
-                    pool: operator_id.to_vec(),
+                    pool: *operator_id,
                 });
                 total_paid += to_pay;
                 delegators_paid += 1;
@@ -407,7 +406,7 @@ fn calculate_spo_rewards(
             account: spo.reward_account.clone(),
             rtype: RewardType::Leader,
             amount: spo_benefit,
-            pool: operator_id.to_vec(),
+            pool: *operator_id,
         });
     } else {
         info!(

modules/accounts_state/src/verifier.rs

@@ -1,7 +1,7 @@
 //! Verification of calculated values against captured CSV from Haskell node / DBSync
 use crate::rewards::{RewardDetail, RewardsResult};
 use crate::state::Pots;
-use acropolis_common::{KeyHash, RewardType, StakeAddress};
+use acropolis_common::{PoolId, RewardType, StakeAddress};
 use hex::FromHex;
 use itertools::EitherOrBoth::{Both, Left, Right};
 use itertools::Itertools;
@@ -131,7 +131,7 @@ impl Verifier {
             };
 
             // Expect CSV header: spo,address,type,amount
-            let mut expected_rewards: BTreeMap<KeyHash, Vec<RewardDetail>> = BTreeMap::new();
+            let mut expected_rewards: BTreeMap<PoolId, Vec<RewardDetail>> = BTreeMap::new();
             for result in reader.deserialize() {
                 let (spo, address, rtype, amount): (String, String, String, u64) = match result {
                     Ok(row) => row,
@@ -141,10 +141,13 @@ impl Verifier {
                     }
                 };
 
-                let Ok(spo) = Vec::from_hex(&spo) else {
-                    error!("Bad hex in {path} for SPO: {spo} - skipping");
+                let Some(spo) =
+                    Vec::from_hex(&spo).ok().and_then(|bytes| PoolId::try_from(bytes).ok())
+                else {
+                    error!("Bad hex/SPO in {path} for SPO: {spo} - skipping");
                     continue;
                 };
+
                 let Ok(account) = Vec::from_hex(&address) else {
                     error!("Bad hex in {path} for address: {address} - skipping");
                     continue;
@@ -167,7 +170,7 @@ impl Verifier {
                     continue;
                 };
 
-                expected_rewards.entry(spo.clone()).or_default().push(RewardDetail {
+                expected_rewards.entry(spo).or_default().push(RewardDetail {
                     account: stake_address,
                     rtype,
                     amount,

modules/historical_accounts_state/src/immutable_historical_account_store.rs

@@ -153,8 +153,10 @@ impl ImmutableHistoricalAccountStore {
         &self,
         account: &StakeAddress,
     ) -> Result<Option<Vec<AccountReward>>> {
-        let mut immutable_rewards =
-            self.collect_partition::<AccountReward>(&self.rewards_history, account.get_hash())?;
+        let mut immutable_rewards = self.collect_partition::<AccountReward>(
+            &self.rewards_history,
+            account.get_hash().as_ref(),
+        )?;
 
         self.merge_pending(
             account,