imp(types): refactor Default implementations with concrete names

.changelog/unreleased/improvements/1074-refactor-default-implemetation.md

@@ -0,0 +1,2 @@
+- [types] Refactor Default implementations with concrete names
+  ([\#1074](https://github.com/cosmos/ibc-rs/issues/1074))

ibc-apps/ics20-transfer/types/src/denom.rs

@@ -109,7 +109,7 @@ impl Display for TracePrefix {
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord, From)]
+#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, From)]
 pub struct TracePath(Vec<TracePrefix>);
 
 impl TracePath {
@@ -134,6 +134,11 @@ impl TracePath {
     pub fn is_empty(&self) -> bool {
         self.0.is_empty()
     }
+
+    /// Return empty trace path
+    pub fn empty() -> Self {
+        Self(vec![])
+    }
 }
 
 impl<'a> TryFrom<Vec<&'a str>> for TracePath {
@@ -294,7 +299,7 @@ impl FromStr for PrefixedDenom {
 
         let (base_denom, trace_path) = {
             if last_part == s {
-                (BaseDenom::from_str(s)?, TracePath::default())
+                (BaseDenom::from_str(s)?, TracePath::empty())
             } else {
                 let base_denom = BaseDenom::from_str(last_part)?;
                 let trace_path = TracePath::try_from(parts)?;
@@ -334,7 +339,7 @@ impl From<PrefixedDenom> for RawDenomTrace {
 impl From<BaseDenom> for PrefixedDenom {
     fn from(denom: BaseDenom) -> Self {
         Self {
-            trace_path: Default::default(),
+            trace_path: TracePath::empty(),
             base_denom: denom,
         }
     }

ibc-apps/ics20-transfer/types/src/memo.rs

@@ -45,6 +45,12 @@ impl From<String> for Memo {
     }
 }
 
+impl From<&str> for Memo {
+    fn from(memo: &str) -> Self {
+        Self(memo.to_owned())
+    }
+}
+
 impl FromStr for Memo {
     type Err = Infallible;
 

ibc-apps/ics721-nft-transfer/src/handler/send_transfer.rs

@@ -81,14 +81,14 @@
                 &msg.chan_id_on_a,
                 class_id,
                 token_id,
-                &packet_data.memo.clone().unwrap_or_default(),
+                &packet_data.memo.clone().unwrap_or("".into()),
             )?;
         } else {
             transfer_ctx.burn_nft_validate(
                 &sender,
                 class_id,
                 token_id,
-                &packet_data.memo.clone().unwrap_or_default(),
+                &packet_data.memo.clone().unwrap_or("".into()),
             )?;
         }
         let nft = transfer_ctx.get_nft(class_id, token_id)?;
@@ -184,14 +184,14 @@
                 &msg.chan_id_on_a,
                 class_id,
                 token_id,
-                &packet_data.memo.clone().unwrap_or_default(),
+                &packet_data.memo.clone().unwrap_or("".into()),
             )?;
         } else {
             transfer_ctx.burn_nft_execute(
                 &sender,
                 class_id,
                 token_id,
-                &packet_data.memo.clone().unwrap_or_default(),
+                &packet_data.memo.clone().unwrap_or("".into()),
             )?;
         }
         let nft = transfer_ctx.get_nft(class_id, token_id)?;
@@ -242,7 +242,7 @@
             receiver: packet_data.receiver,
             class: packet_data.class_id,
             tokens: packet_data.token_ids,
-            memo: packet_data.memo.unwrap_or_default(),
+            memo: packet_data.memo.unwrap_or("".into()),
         };
         send_packet_ctx_a.emit_ibc_event(ModuleEvent::from(transfer_event).into())?;
 

ibc-apps/ics721-nft-transfer/src/module.rs

@@ -1,5 +1,4 @@
 //! Provides IBC module callbacks implementation for the ICS-721 transfer.
-
 use ibc_core::channel::types::acknowledgement::{Acknowledgement, AcknowledgementStatus};
 use ibc_core::channel::types::channel::{Counterparty, Order};
 use ibc_core::channel::types::packet::Packet;
@@ -194,7 +193,7 @@
         receiver: data.receiver,
         class: data.class_id,
         tokens: data.token_ids,
-        memo: data.memo.unwrap_or_default(),
+        memo: data.memo.unwrap_or("".into()),
         success: ack.is_successful(),
     };
     extras.events.push(recv_event.into());
@@ -259,7 +258,7 @@
         receiver: data.receiver,
         class: data.class_id,
         tokens: data.token_ids,
-        memo: data.memo.unwrap_or_default(),
+        memo: data.memo.unwrap_or("".into()),
         acknowledgement: acknowledgement.clone(),
     };
 
@@ -307,7 +306,7 @@
         refund_receiver: data.sender,
         refund_class: data.class_id,
         refund_tokens: data.token_ids,
-        memo: data.memo.unwrap_or_default(),
+        memo: data.memo.unwrap_or("".into()),
     };
 
     let extras = ModuleExtras {

ibc-apps/ics721-nft-transfer/types/src/class.rs

@@ -106,7 +106,7 @@
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord, From)]
+#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, From)]
 pub struct TracePath(Vec<TracePrefix>);
 
 impl TracePath {
@@ -131,6 +131,11 @@
     pub fn is_empty(&self) -> bool {
         self.0.is_empty()
     }
+
+    /// Return empty trace path
+    pub fn empty() -> Self {
+        Self(vec![])
+    }
 }
 
 impl<'a> TryFrom<Vec<&'a str>> for TracePath {
@@ -268,7 +273,7 @@
 
         let (base_class_id, trace_path) = {
             if last_part == s {
-                (ClassId::from_str(s)?, TracePath::default())
+                (ClassId::from_str(s)?, TracePath::empty())
             } else {
                 let base_class_id = ClassId::from_str(last_part)?;
                 let trace_path = TracePath::try_from(parts)?;
@@ -308,7 +313,7 @@
 impl From<ClassId> for PrefixedClassId {
     fn from(class_id: ClassId) -> Self {
         Self {
-            trace_path: Default::default(),
+            trace_path: TracePath::empty(),
             base_class_id: class_id,
         }
     }

ibc-apps/ics721-nft-transfer/types/src/data.rs

@@ -24,7 +24,7 @@
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, PartialEq, Eq, derive_more::From)]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
 pub struct Data(String);
 
 #[cfg(feature = "serde")]
@@ -88,7 +88,7 @@
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Ics721Data(BTreeMap<String, DataValue>);
 
 #[cfg(feature = "serde")]
@@ -100,7 +100,7 @@
     }
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct DataValue {
     value: String,
     mime: Option<Mime>,

ibc-apps/ics721-nft-transfer/types/src/memo.rs

@@ -24,7 +24,7 @@
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Memo(String);
 
 impl AsRef<str> for Memo {
@@ -45,6 +45,12 @@
     }
 }
 
+impl From<&str> for Memo {
+    fn from(memo: &str) -> Self {
+        Self(memo.to_owned())
+    }
+}
+
 impl FromStr for Memo {
     type Err = Infallible;
 

ibc-clients/ics07-tendermint/src/client_state.rs

@@ -112,8 +112,8 @@ mod tests {
             unbonding_period: Duration::new(128000, 0),
             max_clock_drift: Duration::new(3, 0),
             latest_height: Height::new(1, 10).expect("Never fails"),
-            proof_specs: ProofSpecs::default(),
-            upgrade_path: Default::default(),
+            proof_specs: ProofSpecs::cosmos(),
+            upgrade_path: Vec::new(),
             allow_update: AllowUpdate {
                 after_expiry: false,
                 after_misbehaviour: false,

ibc-clients/ics07-tendermint/types/src/client_state.rs

@@ -440,8 +440,8 @@ mod tests {
             unbonding_period: Duration::new(128000, 0),
             max_clock_drift: Duration::new(3, 0),
             latest_height: Height::new(0, 10).expect("Never fails"),
-            proof_specs: ProofSpecs::default(),
-            upgrade_path: Default::default(),
+            proof_specs: ProofSpecs::cosmos(),
+            upgrade_path: Vec::new(),
             allow_update: AllowUpdate {
                 after_expiry: false,
                 after_misbehaviour: false,

ibc-clients/ics07-tendermint/types/src/trust_threshold.rs

@@ -134,11 +134,11 @@ impl TryFrom<Fraction> for TrustThreshold {
     }
 }
 
-impl Default for TrustThreshold {
-    fn default() -> Self {
-        Self::ONE_THIRD
-    }
-}
+// impl Default for TrustThreshold {
+//     fn default() -> Self {
+//         Self::ONE_THIRD
+//     }
+// }
 
 impl Display for TrustThreshold {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {

ibc-core/ics03-connection/types/src/connection.rs

@@ -200,18 +200,6 @@
     }
 }
 
-impl Default for ConnectionEnd {
-    fn default() -> Self {
-        Self {
-            state: State::Uninitialized,
-            client_id: Default::default(),
-            counterparty: Default::default(),
-            versions: Vec::new(),
-            delay_period: ZERO_DURATION,
-        }
-    }
-}
-
 impl Protobuf<RawConnectionEnd> for ConnectionEnd {}
 
 impl TryFrom<RawConnectionEnd> for ConnectionEnd {
@@ -220,7 +208,13 @@
         let state = value.state.try_into()?;
 
         if state == State::Uninitialized {
-            return Ok(ConnectionEnd::default());
+            return ConnectionEnd::new(
+                State::Uninitialized,
+                "07-tendermint-0".into(),
+                Counterparty::new("07-tendermint-0".into(), None, CommitmentPrefix::empty()),
+                Vec::new(),
+                ZERO_DURATION,
+            );
         }
 
         if value.client_id.is_empty() {
@@ -378,7 +372,7 @@
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct Counterparty {
     pub client_id: ClientId,
     pub connection_id: Option<ConnectionId>,

ibc-core/ics03-connection/types/src/events.rs

@@ -29,7 +29,7 @@ pub const COUNTERPARTY_CLIENT_ID_ATTRIBUTE_KEY: &str = "counterparty_client_id";
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 struct Attributes {
     pub connection_id: ConnectionId,
     pub client_id: ClientId,
@@ -323,7 +323,7 @@ mod tests {
 
         let client_type = ClientType::from_str("07-tendermint")
             .expect("never fails because it's a valid client type");
-        let conn_id_on_a = ConnectionId::default();
+        let conn_id_on_a = ConnectionId::zero();
         let client_id_on_a = client_type.build_client_id(0);
         let conn_id_on_b = ConnectionId::new(1);
         let client_id_on_b = client_type.build_client_id(1);