Refactor: Update hash type definitions and align associated conversions

Author: lowhung

codec/src/map_parameters.rs

@@ -37,16 +37,14 @@ pub fn to_hash<const N: usize>(pallas_hash: &pallas_primitives::Hash<N>) -> Hash
 
 /// Convert a Pallas Hash reference to an Acropolis Hash (owned)
 /// Works for any hash size N
-pub fn genesis_to_hash<const N: usize>(pallas_hash: &pallas_primitives::Genesishash) -> Hash<N> {
-    Hash::try_from(pallas_hash.as_ref()).unwrap()
+pub fn genesis_to_hash(pallas_hash: &pallas_primitives::Genesishash) -> GenesisKeyhash {
+    GenesisKeyhash::try_from(pallas_hash.as_ref()).unwrap()
 }
 
 /// Convert a Pallas Hash reference to an Acropolis Hash (owned)
 /// Works for any hash size N
-pub fn genesis_delegate_to_hash<const N: usize>(
-    pallas_hash: &pallas_primitives::GenesisDelegateHash,
-) -> Hash<N> {
-    Hash::try_from(pallas_hash.as_ref()).unwrap()
+pub fn genesis_delegate_to_hash(pallas_hash: &pallas_primitives::GenesisDelegateHash) -> PoolId {
+    PoolId::try_from(pallas_hash.as_ref()).unwrap()
 }
 
 /// Convert a Pallas Hash<28> reference to an Acropolis PoolId

common/src/types.rs

@@ -450,7 +450,7 @@ pub type ScriptHash = KeyHash;
 pub type AddrKeyhash = KeyHash;
 
 /// Script identifier
-pub type GenesisKeyhash = Vec<u8>;
+pub type GenesisKeyhash = Hash<32>;
 
 declare_hash_type!(BlockHash, 32);
 declare_hash_type!(TxHash, 32);
@@ -982,10 +982,10 @@ pub struct SPORewards {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct GenesisKeyDelegation {
     /// Genesis hash
-    pub genesis_hash: KeyHash,
+    pub genesis_hash: GenesisKeyhash,
 
     /// Genesis delegate hash
-    pub genesis_delegate_hash: KeyHash,
+    pub genesis_delegate_hash: PoolId,
 
     /// VRF key hash
     pub vrf_key_hash: VrfKeyHash,
@@ -1678,19 +1678,23 @@ pub enum Voter {
     StakePoolKey(PoolId),
 }
 
-impl Display for Voter {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        let bech32 = match self {
+impl Voter {
+    pub fn to_bech32(&self) -> Result<String, Error> {
+        match self {
             Voter::ConstitutionalCommitteeKey(h) => h.to_bech32(),
             Voter::ConstitutionalCommitteeScript(s) => s.to_bech32(),
             Voter::DRepKey(k) => k.to_bech32(),
             Voter::DRepScript(s) => s.to_bech32(),
             Voter::StakePoolKey(k) => k.to_bech32(),
-        };
+        }
+    }
+}
 
-        match bech32 {
-            Ok(s) => write!(f, "{}", s),
-            Err(e) => write!(f, "<invalid: {}>", e),
+impl Display for Voter {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self.to_bech32() {
+            Ok(addr) => write!(f, "{}", addr),
+            Err(e) => write!(f, "<invalid voter: {}>", e),
         }
     }
 }

modules/stake_delta_filter/src/utils.rs

@@ -429,15 +429,15 @@ mod test {
         }
     }
 
-    pub fn script_to_hash<const N: usize>(pallas_hash: ScriptHash) -> Hash<N> {
+    pub fn script_to_hash(pallas_hash: ScriptHash) -> Hash<28> {
         pallas_hash.as_ref().try_into().unwrap()
     }
 
-    pub fn stake_to_hash<const N: usize>(pallas_hash: StakeKeyHash) -> Hash<N> {
+    pub fn stake_to_hash(pallas_hash: StakeKeyHash) -> Hash<28> {
         pallas_hash.as_ref().try_into().unwrap()
     }
 
-    pub fn payment_to_hash<const N: usize>(pallas_hash: PaymentKeyHash) -> Hash<N> {
+    pub fn payment_to_hash(pallas_hash: PaymentKeyHash) -> Hash<28> {
         pallas_hash.as_ref().try_into().unwrap()
     }