Use as_ref in immutable_historical_account_store.rs vs into_inner()

Author: lowhung

common/src/hash.rs

@@ -53,6 +53,11 @@ impl<const BYTES: usize> Hash<BYTES> {
     pub fn into_inner(self) -> [u8; BYTES] {
         self.0
     }
+
+    #[inline]
+    pub fn as_inner(&self) -> &[u8; BYTES] {
+        &self.0
+    }
 }
 
 impl<const BYTES: usize> From<[u8; BYTES]> for Hash<BYTES> {

common/src/snapshot/streaming_snapshot.rs

@@ -309,7 +309,7 @@ impl<'b, C> minicbor::Decode<'b, C> for Account {
 
 pub use crate::types::AddrKeyhash;
 pub use crate::types::ScriptHash;
-use crate::{PoolId};
+use crate::PoolId;
 /// Alias minicbor as cbor for pool_params module
 pub use minicbor as cbor;
 

common/src/types.rs

@@ -451,8 +451,8 @@ declare_hash_type!(BlockHash, 32);
 declare_hash_type!(TxHash, 32);
 declare_hash_type_with_bech32!(VrfKeyHash, 32, "vrf_vk");
 declare_hash_type_with_bech32!(PoolId, 28, "pool");
-declare_hash_type_with_bech32!(DrepKey, 28, "drep");
-declare_hash_type_with_bech32!(DrepScriptKey, 28, "drep_script");
+// declare_hash_type_with_bech32!(DrepKey, 28, "drep");
+// declare_hash_type_with_bech32!(DrepScriptKey, 28, "drep_script");
 
 /// Data hash used for metadata, anchors (SHA256)
 pub type DataHash = Vec<u8>;

modules/accounts_state/src/verifier.rs

@@ -167,13 +167,11 @@ impl Verifier {
                     continue;
                 };
 
-                expected_rewards.entry(spo.try_into().unwrap()).or_default().push(
-                    RewardDetail {
-                        account: stake_address,
-                        rtype,
-                        amount,
-                    },
-                );
+                expected_rewards.entry(spo.try_into().unwrap()).or_default().push(RewardDetail {
+                    account: stake_address,
+                    rtype,
+                    amount,
+                });
             }
 
             info!(

modules/historical_accounts_state/src/immutable_historical_account_store.rs

@@ -156,8 +156,10 @@ impl ImmutableHistoricalAccountStore {
         &self,
         account: &StakeAddress,
     ) -> Result<Option<Vec<RewardHistory>>> {
-        let mut immutable_rewards =
-            self.collect_partition::<RewardHistory>(&self.rewards_history, account.get_hash())?;
+        let mut immutable_rewards = self.collect_partition::<RewardHistory>(
+            &self.rewards_history,
+            account.get_hash().as_ref(),
+        )?;
 
         self.merge_pending(
             account,
@@ -175,7 +177,7 @@ impl ImmutableHistoricalAccountStore {
     ) -> Result<Option<Vec<ActiveStakeHistory>>> {
         let mut immutable_active_stake = self.collect_partition::<ActiveStakeHistory>(
             &self.active_stake_history,
-            account.get_hash(),
+            account.get_hash().as_ref(),
         )?;
 
         self.merge_pending(
@@ -194,7 +196,7 @@ impl ImmutableHistoricalAccountStore {
     ) -> Result<Option<Vec<RegistrationUpdate>>> {
         let mut immutable_registrations = self.collect_partition::<RegistrationUpdate>(
             &self.registration_history,
-            account.get_hash(),
+            account.get_hash().as_ref(),
         )?;
 
         self.merge_pending(
@@ -211,8 +213,10 @@ impl ImmutableHistoricalAccountStore {
         &self,
         account: &StakeAddress,
     ) -> Result<Option<Vec<DelegationUpdate>>> {
-        let mut immutable_delegations = self
-            .collect_partition::<DelegationUpdate>(&self.delegation_history, account.get_hash())?;
+        let mut immutable_delegations = self.collect_partition::<DelegationUpdate>(
+            &self.delegation_history,
+            account.get_hash().as_ref(),
+        )?;
 
         self.merge_pending(
             account,
@@ -228,8 +232,10 @@ impl ImmutableHistoricalAccountStore {
         &self,
         account: &StakeAddress,
     ) -> Result<Option<Vec<AccountWithdrawal>>> {
-        let mut immutable_mirs =
-            self.collect_partition::<AccountWithdrawal>(&self.mir_history, account.get_hash())?;
+        let mut immutable_mirs = self.collect_partition::<AccountWithdrawal>(
+            &self.mir_history,
+            account.get_hash().as_ref(),
+        )?;
 
         self.merge_pending(account, |e| e.mir_history.as_ref(), &mut immutable_mirs).await;
 
@@ -240,8 +246,10 @@ impl ImmutableHistoricalAccountStore {
         &self,
         account: &StakeAddress,
     ) -> Result<Option<Vec<AccountWithdrawal>>> {
-        let mut immutable_withdrawals = self
-            .collect_partition::<AccountWithdrawal>(&self.withdrawal_history, account.get_hash())?;
+        let mut immutable_withdrawals = self.collect_partition::<AccountWithdrawal>(
+            &self.withdrawal_history,
+            account.get_hash().as_ref(),
+        )?;
 
         self.merge_pending(
             account,
@@ -258,7 +266,7 @@ impl ImmutableHistoricalAccountStore {
         account: &StakeAddress,
     ) -> Result<Option<Vec<ShelleyAddress>>> {
         let mut immutable_addresses =
-            self.collect_partition::<ShelleyAddress>(&self.addresses, account.get_hash())?;
+            self.collect_partition::<ShelleyAddress>(&self.addresses, account.get_hash().as_ref())?;
 
         self.merge_pending(account, |e| e.addresses.as_ref(), &mut immutable_addresses).await;
 
@@ -321,7 +329,7 @@ impl ImmutableHistoricalAccountStore {
 
     fn make_epoch_key(account: &StakeAddress, epoch: u32) -> [u8; 32] {
         let mut key = [0u8; 32];
-        key[..28].copy_from_slice(&account.get_credential().get_hash());
+        key[..28].copy_from_slice(&account.get_credential().get_hash().as_ref());
         key[28..32].copy_from_slice(&epoch.to_be_bytes());
         key
     }

modules/parameters_state/src/genesis_params.rs

@@ -107,9 +107,7 @@ fn map_drep_thresholds(thresholds: &conway::DRepVotingThresholds) -> Result<DRep
 pub fn map_constitution(constitution: &conway::Constitution) -> Result<Constitution> {
     Ok(Constitution {
         anchor: map_anchor(&constitution.anchor)?,
-        guardrail_script: Some(
-            decode_hex_string(&constitution.script, 28)?.try_into().unwrap(),
-        ),
+        guardrail_script: Some(decode_hex_string(&constitution.script, 28)?.try_into().unwrap()),
     })
 }