fix: address comments

Author: iamquang95

crates/dkg/src/aggregate.rs

@@ -399,11 +399,8 @@ mod tests {
             })
             .collect::<Vec<_>>();
 
-        let mut data = HashMap::new();
-        data.insert(core_pub_key, partials);
-
-        let mut msgs = HashMap::new();
-        msgs.insert(core_pub_key, reg.clone());
+        let data = HashMap::from([(core_pub_key, partials)]);
+        let msgs = HashMap::from([(core_pub_key, reg.clone())]);
 
         let res =
             agg_validator_registrations(&data, std::slice::from_ref(&share), &msgs, &fork_version)

crates/dkg/src/dkg.rs

@@ -250,34 +250,15 @@ pub fn log_peer_summary(
             .filter(|operator| !operator.address.is_empty())
             .map(|operator| operator.address.as_str());
         let is_current_peer = peer.id == current_peer;
-
-        if let Some(address) = address {
-            if is_current_peer {
-                info!(
-                    peer = peer.name,
-                    index = peer.index,
-                    address,
-                    you = "⭐️",
-                    "Peer summary"
-                );
-            } else {
-                info!(
-                    peer = peer.name,
-                    index = peer.index,
-                    address,
-                    "Peer summary"
-                );
-            }
-        } else if is_current_peer {
-            info!(
-                peer = peer.name,
-                index = peer.index,
-                you = "⭐️",
-                "Peer summary"
-            );
-        } else {
-            info!(peer = peer.name, index = peer.index, "Peer summary");
-        }
+        let you = is_current_peer.then_some("⭐");
+
+        info!(
+            peer = peer.name,
+            index = peer.index,
+            address,
+            you,
+            "Peer summary"
+        );
     }
 }
 

crates/dkg/src/signing.rs

@@ -16,8 +16,11 @@ pub type Result<T> = std::result::Result<T, SigningError>;
 #[derive(Debug, thiserror::Error)]
 pub enum SigningError {
     /// Failed to build a core public key from bytes.
-    #[error("invalid public key length")]
-    InvalidPublicKeyLength,
+    #[error("invalid public key length while {error_context}")]
+    InvalidPublicKeyLength {
+        /// Signing helper that encountered the invalid key.
+        error_context: &'static str,
+    },
 
     /// Failed to sign or verify with threshold BLS.
     #[error(transparent)]
@@ -65,8 +68,7 @@ pub fn sign_lock_hash(share_idx: u64, shares: &[Share], hash: &[u8]) -> Result<P
     let mut set = ParSignedDataSet::new();
 
     for share in shares {
-        let pub_key = PubKey::try_from(share.pub_key.as_slice())
-            .map_err(|_| SigningError::InvalidPublicKeyLength)?;
+        let pub_key = share_pubkey(share, "signing lock hash")?;
         let sig = BlstImpl.sign(&share.secret_share, hash)?;
 
         set.insert(
@@ -97,7 +99,7 @@ pub fn sign_deposit_msgs(
 
     for (share, withdrawal_address) in shares.iter().zip(withdrawal_addresses.iter()) {
         let eth2_pubkey = pubkey_to_eth2(share.pub_key);
-        let pub_key = share_pubkey(share)?;
+        let pub_key = share_pubkey(share, "signing deposit message")?;
         let withdrawal_address = pluto_eth2util::helpers::checksum_address(withdrawal_address)?;
 
         let msg = deposit::new_message(eth2_pubkey, &withdrawal_address, amount, compounding)?;
@@ -139,7 +141,7 @@ pub fn sign_validator_registrations(
 
     for (share, fee_recipient) in shares.iter().zip(fee_recipients.iter()) {
         let eth2_pubkey = pubkey_to_eth2(share.pub_key);
-        let pub_key = share_pubkey(share)?;
+        let pub_key = share_pubkey(share, "signing validator registration")?;
 
         let reg_msg = registration::new_message(
             eth2_pubkey,
@@ -170,8 +172,9 @@ pub fn sign_validator_registrations(
     Ok((set, msgs))
 }
 
-fn share_pubkey(share: &Share) -> Result<PubKey> {
-    PubKey::try_from(share.pub_key.as_slice()).map_err(|_| SigningError::InvalidPublicKeyLength)
+fn share_pubkey(share: &Share, error_context: &'static str) -> Result<PubKey> {
+    PubKey::try_from(share.pub_key.as_slice())
+        .map_err(|_| SigningError::InvalidPublicKeyLength { error_context })
 }
 
 #[cfg(test)]