Moved ClientId::suffix() into cosmos.rs

modules/src/ics24_host/identifier.rs

@@ -179,26 +179,6 @@ impl ClientId {
     pub fn as_bytes(&self) -> &[u8] {
         &self.0.as_bytes()
     }
-
-    /// Returns the suffix counter of this client.
-    /// Returns `None` if the client identifier is malformed
-    /// and the suffix could not be parsed.
-    /// ```rust
-    /// # use ibc::ics24_host::identifier::ClientId;
-    /// # use ibc::ics02_client::client_type::ClientType;
-    /// # use std::str::FromStr;
-    /// let cl_a = ClientId::new(ClientType::Mock, 670).unwrap();
-    /// assert_eq!(cl_a.suffix(), Some(670));
-    /// let cl_b = ClientId::from_str("nosuffix_client").unwrap();
-    /// assert_eq!(cl_b.suffix(), None);
-    /// ```
-    pub fn suffix(&self) -> Option<u64> {
-        self.as_str()
-            .split('-')
-            .last()
-            .map(|e| e.parse::<u64>().ok())
-            .flatten()
-    }
 }
 
 /// This implementation provides a `to_string` method.

relayer/src/chain/cosmos.rs

@@ -511,10 +511,9 @@ impl Chain for CosmosSdkChain {
 
         // Sort by client identifier counter
         clients.sort_by(|a, b| {
-            a.client_id
-                .suffix()
+            client_id_suffix(&a.client_id)
                 .unwrap_or(0) // Fallback to `0` suffix (no sorting) if client id is malformed
-                .cmp(&b.client_id.suffix().unwrap_or(0))
+                .cmp(&client_id_suffix(&b.client_id).unwrap_or(0))
         });
 
         Ok(clients)
@@ -1505,3 +1504,15 @@ fn encode_to_bech32(address: &str, account_prefix: &str) -> Result<String, Error
 
     Ok(encoded)
 }
+
+/// Returns the suffix counter for a CosmosSDK client id.
+/// Returns `None` if the client identifier is malformed
+/// and the suffix could not be parsed.
+pub fn client_id_suffix(client_id: &ClientId) -> Option<u64> {
+    client_id
+        .as_str()
+        .split('-')
+        .last()
+        .map(|e| e.parse::<u64>().ok())
+        .flatten()
+}