Respond to PR feedback

Author: buddhisthead

common/examples/test_streaming_parser.rs

@@ -288,14 +288,7 @@ impl SnapshotsCallback for CountingCallbacks {
         if !snapshots.mark.0.is_empty() {
             eprintln!("  Sample stakes (first 5):");
             for (i, (cred, amount)) in snapshots.mark.0.iter().take(5).enumerate() {
-                let cred_str = match cred {
-                    acropolis_common::StakeCredential::AddrKeyHash(h) => {
-                        format!("KeyHash({}...)", &hex::encode(&h[..4]))
-                    }
-                    acropolis_common::StakeCredential::ScriptHash(h) => {
-                        format!("ScriptHash({}...)", &hex::encode(&h[..4]))
-                    }
-                };
+                let cred_str = cred.to_string().unwrap_or_default();
                 eprintln!(
                     "    [{}] {} -> {:.2} ADA",
                     i + 1,
@@ -312,14 +305,7 @@ impl SnapshotsCallback for CountingCallbacks {
         if !snapshots.set.0.is_empty() {
             eprintln!("  Sample stakes (first 5):");
             for (i, (cred, amount)) in snapshots.set.0.iter().take(5).enumerate() {
-                let cred_str = match cred {
-                    acropolis_common::StakeCredential::AddrKeyHash(h) => {
-                        format!("KeyHash({}...)", &hex::encode(&h[..4]))
-                    }
-                    acropolis_common::StakeCredential::ScriptHash(h) => {
-                        format!("ScriptHash({}...)", &hex::encode(&h[..4]))
-                    }
-                };
+                let cred_str = cred.to_string().unwrap_or_default();
                 eprintln!(
                     "    [{}] {} -> {:.2} ADA",
                     i + 1,
@@ -336,14 +322,7 @@ impl SnapshotsCallback for CountingCallbacks {
         if !snapshots.go.0.is_empty() {
             eprintln!("  Sample stakes (first 5):");
             for (i, (cred, amount)) in snapshots.go.0.iter().take(5).enumerate() {
-                let cred_str = match cred {
-                    acropolis_common::StakeCredential::AddrKeyHash(h) => {
-                        format!("KeyHash({}...)", &hex::encode(&h[..4]))
-                    }
-                    acropolis_common::StakeCredential::ScriptHash(h) => {
-                        format!("ScriptHash({}...)", &hex::encode(&h[..4]))
-                    }
-                };
+                let cred_str = cred.to_string().unwrap_or_default();
                 eprintln!(
                     "    [{}] {} -> {:.2} ADA",
                     i + 1,

common/src/snapshot/mark_set_go.rs

@@ -3,7 +3,7 @@
 // ================================================================================================
 
 use anyhow::{Context, Error, Result};
-use log::info;
+use log::{error, info};
 
 use minicbor::Decoder;
 use serde::Serialize;
@@ -14,6 +14,7 @@ pub use crate::hash::Hash;
 use crate::snapshot::pool_params::PoolParams;
 use crate::snapshot::streaming_snapshot;
 pub use crate::stake_addresses::{AccountState, StakeAddressState};
+use crate::PoolId;
 pub use crate::StakeCredential;
 use crate::{address::StakeAddress, types, NetworkId, PoolRegistration};
 
@@ -83,9 +84,9 @@ pub struct Snapshot {
     /// snapshot_stake: stake distribution map (credential -> lovelace amount)
     pub snapshot_stake: VMap<StakeCredential, i64>,
     // snapshot_delegations: vmap<credential, key_hash<stake_pool>>,)
-    pub snapshot_delegations: VMap<StakeCredential, Hash<28>>,
+    pub snapshot_delegations: VMap<StakeCredential, PoolId>,
     // snapshot_pool_params: vmap<key_hash<stake_pool>, pool_params>,
-    pub snapshot_pool_params: VMap<Hash<28>, PoolRegistration>,
+    pub snapshot_pool_params: VMap<PoolId, PoolRegistration>,
 }
 
 impl Snapshot {
@@ -112,14 +113,14 @@ impl Snapshot {
                         // Skip delegations (second element)
                         info!("        {snapshot_name} snapshot - parsing snapshot_delegations...");
 
-                        let delegations: VMap<StakeCredential, Hash<28>> =
+                        let delegations: VMap<StakeCredential, PoolId> =
                             decoder.decode().context("Failed to parse snapshot_delegations")?;
 
                         info!(
                             "        {snapshot_name} snapshot - parsing snapshot_pool_registration..."
                         );
                         // pool_registration (third element)
-                        let pools: VMap<Hash<28>, PoolParams> = decoder
+                        let pools: VMap<PoolId, PoolParams> = decoder
                             .decode()
                             .context("Failed to parse snapshot_pool_registration")?;
                         let registration = VMap(
@@ -130,7 +131,12 @@ impl Snapshot {
                                     // Convert RewardAccount (Vec<u8>) to StakeAddress
                                     let reward_account =
                                         StakeAddress::from_binary(&params.reward_account.0)
-                                            .unwrap_or_else(|_| StakeAddress::default());
+                                            .unwrap_or_else(|_|
+                                                {
+                                                    error!("Failed to parse reward account for pool {pool_id}, using default");
+                                                    StakeAddress::default()
+                                                }
+                                            );
 
                                     // Convert Set<AddrKeyhash> to Vec<StakeAddress>
                                     let pool_owners: Vec<StakeAddress> = params
@@ -140,7 +146,7 @@ impl Snapshot {
                                         .map(|keyhash| {
                                             StakeAddress::new(
                                                 StakeCredential::AddrKeyHash(keyhash),
-                                                NetworkId::Mainnet,
+                                                NetworkId::Mainnet, // TODO: Make network configurable or get it from parameters
                                             )
                                         })
                                         .collect();