Refactor: Rename variables for clarity in drep_state.rs, simplify decode_key in spo_distribution_store.rs, and add tempfile as a dev dependency

Author: lowhung

modules/accounts_state/Cargo.toml

@@ -25,6 +25,8 @@ tracing = { workspace = true }
 fjall = "2.11.2"
 csv = "1.3.1"
 itertools = "0.14.0"
+
+[dev-dependencies]
 tempfile = "3"
 
 [lib]

modules/accounts_state/src/spo_distribution_store.rs

@@ -1,5 +1,5 @@
 use acropolis_common::{PoolId, StakeAddress};
-use anyhow::{anyhow, Context, Result};
+use anyhow::Result;
 use fjall::{Config, Keyspace, PartitionCreateOptions};
 use std::collections::HashMap;
 
@@ -30,27 +30,10 @@ fn encode_epoch_pool_prefix(epoch: u64, pool_id: &PoolId) -> Vec<u8> {
 }
 
 fn decode_key(key: &[u8]) -> Result<(u64, PoolId, StakeAddress)> {
-    let epoch_bytes: [u8; EPOCH_LEN] = key[..EPOCH_LEN]
-        .try_into()
-        .map_err(|_| anyhow!("Failed to extract epoch bytes (offset 0-{})", EPOCH_LEN))?;
-    let epoch = u64::from_be_bytes(epoch_bytes);
-
-    let pool_id: PoolId = key[EPOCH_LEN..EPOCH_LEN + POOL_ID_LENGTH].try_into().map_err(|_| {
-        anyhow!(
-            "Failed to extract pool ID bytes (offset {}-{})",
-            EPOCH_LEN,
-            EPOCH_LEN + POOL_ID_LENGTH
-        )
-    })?;
-
+    let epoch = u64::from_be_bytes(key[..EPOCH_LEN].try_into()?);
+    let pool_id = key[EPOCH_LEN..EPOCH_LEN + POOL_ID_LENGTH].try_into()?;
     let stake_address_bytes = &key[EPOCH_LEN + POOL_ID_LENGTH..];
-    let stake_address = StakeAddress::from_binary(stake_address_bytes).with_context(|| {
-        format!(
-            "Failed to decode stake address from {} bytes at offset {}",
-            stake_address_bytes.len(),
-            EPOCH_LEN + POOL_ID_LENGTH
-        )
-    })?;
+    let stake_address = StakeAddress::from_binary(stake_address_bytes)?;
 
     Ok((epoch, pool_id, stake_address))
 }

modules/drep_state/src/state.rs

@@ -474,12 +474,12 @@ impl State {
         context: &Arc<Context<Message>>,
         delegators: &[(&StakeAddress, &DRepChoice)],
     ) -> Result<()> {
-        let mut stake_address_to_input = HashMap::with_capacity(delegators.len());
+        let mut stake_address_to_drep = HashMap::with_capacity(delegators.len());
         let mut stake_addresses = Vec::with_capacity(delegators.len());
 
         for &(stake_address, drep) in delegators {
             stake_addresses.push(stake_address.clone());
-            stake_address_to_input.insert(stake_address, (stake_address, drep));
+            stake_address_to_drep.insert(stake_address, drep);
         }
 
         let msg = Arc::new(Message::StateQuery(StateQuery::Accounts(
@@ -501,8 +501,8 @@ impl State {
         };
 
         for (stake_address, old_drep_opt) in result_map {
-            let &(delegator, new_drep_choice) = match stake_address_to_input.get(&stake_address) {
-                Some(pair) => pair,
+            let new_drep_choice = match stake_address_to_drep.get(&stake_address) {
+                Some(&drep) => drep,
                 None => continue,
             };
 
@@ -516,10 +516,7 @@ impl State {
                     if old_drep_cred != new_drep_cred {
                         self.update_historical(&old_drep_cred, false, |entry| {
                             if let Some(delegators) = entry.delegators.as_mut() {
-                                delegators.retain(|s| {
-                                    s.get_credential().get_hash()
-                                        != delegator.get_credential().get_hash()
-                                });
+                                delegators.retain(|s| s.get_hash() != stake_address.get_hash());
                             }
                         })?;
                     }
@@ -529,8 +526,8 @@ impl State {
             // Add delegator to new DRep
             match self.update_historical(&new_drep_cred, true, |entry| {
                 if let Some(delegators) = entry.delegators.as_mut() {
-                    if !delegators.contains(delegator) {
-                        delegators.push(delegator.clone());
+                    if !delegators.contains(&stake_address) {
+                        delegators.push(stake_address.clone());
                     }
                 }
             }) {