feat: provide Into<String> and AsRef<str> for identifier types

cosmos · Nov 20, 2023 · f716de5 · f716de5
1 parent bf77378
commit f716de5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/.changelog/unreleased/features/974-id-into-string.md b/.changelog/unreleased/features/974-id-into-string.md
@@ -0,0 +1,2 @@
+- Provide `Into<String>` and `AsRef<str>` for all identifiers types.
+  ([#974](https://github.com/cosmos/ibc-rs/pull/974))
diff --git a/crates/ibc/src/core/ics24_host/identifier.rs b/crates/ibc/src/core/ics24_host/identifier.rs
@@ -157,6 +157,18 @@ impl FromStr for ChainId {
     }
 }
 
+impl AsRef<str> for ChainId {
+    fn as_ref(&self) -> &str {
+        &self.id
+    }
+}
+
+impl From<ChainId> for String {
+    fn from(chain_id: ChainId) -> String {
+        chain_id.id
+    }
+}
+
 impl Display for ChainId {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
         write!(f, "{}", self.id)
@@ -240,6 +252,12 @@ impl Display for ClientId {
     }
 }
 
+impl AsRef<str> for ClientId {
+    fn as_ref(&self) -> &str {
+        self.0.as_str()
+    }
+}
+
 impl FromStr for ClientId {
     type Err = IdentifierError;
 
@@ -282,7 +300,7 @@ impl PartialEq<str> for ClientId {
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Into)]
 pub struct ConnectionId(String);
 
 impl ConnectionId {
@@ -324,6 +342,12 @@ impl Display for ConnectionId {
     }
 }
 
+impl AsRef<str> for ConnectionId {
+    fn as_ref(&self) -> &str {
+        self.0.as_str()
+    }
+}
+
 impl FromStr for ConnectionId {
     type Err = IdentifierError;
 
@@ -366,7 +390,7 @@ impl PartialEq<str> for ConnectionId {
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Into)]
 pub struct PortId(String);
 
 impl PortId {
@@ -429,7 +453,7 @@ impl AsRef<str> for PortId {
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Into)]
 pub struct ChannelId(String);
 
 impl ChannelId {