Fix conversions related to MockHeader and ClientType::Mock

CHANGELOG.md

@@ -8,8 +8,15 @@
   - Add CLI git hash ([#1094])
   - Fix unwraps in `packet query` CLIs ([#1114])
 
+### BUG FIXES
+
+- [ibc]
+  - Fix stack overflow in `MockHeader` implementation ([#1192])
+  - Align `as_str` and `from_str` behavior in `ClientType` ([#1192])
+
 [#1094]: https://github.com/informalsystems/ibc-rs/issues/1094
 [#1114]: https://github.com/informalsystems/ibc-rs/issues/1114
+[#1192]: https://github.com/informalsystems/ibc-rs/issues/1192
 
 ## v0.6.0
 *July 12th, 2021*

modules/src/ics02_client/client_type.rs

@@ -14,20 +14,25 @@ pub enum ClientType {
 }
 
 impl ClientType {
+    const TENDERMINT_STR: &'static str = "07-tendermint";
+
+    #[cfg_attr(not(test), allow(dead_code))]
+    const MOCK_STR: &'static str = "9999-mock";
+
     /// Yields the identifier of this client type as a string
-    pub fn as_string(&self) -> &'static str {
+    pub fn as_str(&self) -> &'static str {
         match self {
-            Self::Tendermint => "07-tendermint",
+            Self::Tendermint => Self::TENDERMINT_STR,
 
             #[cfg(any(test, feature = "mocks"))]
-            Self::Mock => "9999-mock",
+            Self::Mock => Self::MOCK_STR,
         }
     }
 }
 
 impl fmt::Display for ClientType {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "ClientType({})", self.as_string())
+        write!(f, "ClientType({})", self.as_str())
     }
 }
 
@@ -36,10 +41,10 @@ impl std::str::FromStr for ClientType {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "07-tendermint" => Ok(Self::Tendermint),
+            Self::TENDERMINT_STR => Ok(Self::Tendermint),
 
             #[cfg(any(test, feature = "mocks"))]
-            "mock" => Ok(Self::Mock),
+            Self::MOCK_STR => Ok(Self::Mock),
 
             _ => Err(error::Kind::UnknownClientType(s.to_string()).into()),
         }
@@ -65,7 +70,7 @@ mod tests {
 
     #[test]
     fn parse_mock_client_type() {
-        let client_type = ClientType::from_str("mock");
+        let client_type = ClientType::from_str("9999-mock");
 
         match client_type {
             Ok(ClientType::Mock) => (),
@@ -85,4 +90,20 @@ mod tests {
             _ => panic!("parse didn't fail"),
         }
     }
+
+    #[test]
+    fn parse_mock_as_string_result() {
+        let client_type = ClientType::Mock;
+        let type_string = client_type.as_str();
+        let client_type_from_str = ClientType::from_str(type_string).unwrap();
+        assert_eq!(client_type_from_str, client_type);
+    }
+
+    #[test]
+    fn parse_tendermint_as_string_result() {
+        let client_type = ClientType::Tendermint;
+        let type_string = client_type.as_str();
+        let client_type_from_str = ClientType::from_str(type_string).unwrap();
+        assert_eq!(client_type_from_str, client_type);
+    }
 }

modules/src/ics24_host/identifier.rs

@@ -168,10 +168,10 @@ impl ClientId {
     /// chain, for example, will have the prefix '07-tendermint'.
     pub fn prefix(client_type: ClientType) -> &'static str {
         match client_type {
-            ClientType::Tendermint => ClientType::Tendermint.as_string(),
+            ClientType::Tendermint => ClientType::Tendermint.as_str(),
 
             #[cfg(any(test, feature = "mocks"))]
-            ClientType::Mock => ClientType::Mock.as_string(),
+            ClientType::Mock => ClientType::Mock.as_str(),
         }
     }
 

modules/src/mock/header.rs

@@ -40,14 +40,18 @@ impl TryFrom<RawMockHeader> for MockHeader {
 
 impl From<MockHeader> for RawMockHeader {
     fn from(value: MockHeader) -> Self {
-        value.into()
+        RawMockHeader {
+            height: Some(value.height.into()),
+            timestamp: value.timestamp.as_nanoseconds(),
+        }
     }
 }
 
 impl MockHeader {
     pub fn height(&self) -> Height {
         self.height
     }
+
     pub fn new(height: Height) -> Self {
         Self {
             height,
@@ -68,11 +72,11 @@ impl Header for MockHeader {
     }
 
     fn height(&self) -> Height {
-        todo!()
+        self.height
     }
 
     fn wrap_any(self) -> AnyHeader {
-        todo!()
+        AnyHeader::Mock(self)
     }
 }
 
@@ -81,3 +85,22 @@ impl From<MockHeader> for AnyConsensusState {
         AnyConsensusState::Mock(MockConsensusState(h))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn encode_any() {
+        let header = MockHeader::new(Height::new(1, 10));
+        let bytes = header.wrap_any().encode_vec().unwrap();
+
+        assert_eq!(
+            &bytes,
+            &[
+                10, 16, 47, 105, 98, 99, 46, 109, 111, 99, 107, 46, 72, 101, 97, 100, 101, 114, 18,
+                6, 10, 4, 8, 1, 16, 10,
+            ]
+        );
+    }
+}