chan open init Romains comments

modules/src/ics03_connection/connection.rs

@@ -7,8 +7,8 @@ use ibc_proto::ibc::core::connection::v1::{
 use tendermint_proto::Protobuf;
 
 use crate::ics03_connection::error::{Error, Kind};
+//use crate::ics03_connection::version::default_version_string;
 use crate::ics03_connection::version::validate_versions;
-use crate::ics03_connection::version::default_version_string;
 use crate::ics23_commitment::commitment::CommitmentPrefix;
 use crate::ics24_host::error::ValidationError;
 use crate::ics24_host::identifier::{ClientId, ConnectionId};
@@ -52,7 +52,6 @@ impl From<ConnectionEnd> for RawConnectionEnd {
     }
 }
 
-
 impl ConnectionEnd {
     pub fn new(
         state: State,
@@ -68,21 +67,6 @@ impl ConnectionEnd {
         })
     }
 
-    pub fn test_channel_new(
-        client_id: ClientId,
-        counterparty: Counterparty,
-    ) -> Result<Self, Error> {
-
-        ConnectionEnd::new(
-            State::Init,
-            client_id,
-            counterparty,
-            vec![default_version_string()],
-        )
-    }
-
-
-
     /// Getter for the state of this connection end.
     pub fn state(&self) -> &State {
         &self.state

modules/src/ics03_connection/msgs/conn_open_init.rs

@@ -114,9 +114,13 @@ impl From<MsgConnectionOpenInit> for RawMsgConnectionOpenInit {
 pub mod test_util {
     use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenInit as RawMsgConnectionOpenInit;
 
-    use crate::ics03_connection::msgs::test_util::get_dummy_counterparty;
+    use crate::ics03_connection::connection::{ConnectionEnd, Counterparty, State};
+    use crate::ics03_connection::error::Error;
     use crate::ics03_connection::version::default_version_string;
     use crate::test_utils::get_dummy_bech32_account;
+    use crate::{
+        ics03_connection::msgs::test_util::get_dummy_counterparty, ics24_host::identifier::ClientId,
+    };
 
     /// Returns a dummy message, for testing only.
     /// Other unit tests may import this if they depend on a MsgConnectionOpenInit.
@@ -129,6 +133,18 @@ pub mod test_util {
             signer: get_dummy_bech32_account(),
         }
     }
+
+    pub fn make_default_connection_end_for_client(
+        client_id: ClientId,
+        counterparty: Counterparty,
+    ) -> Result<ConnectionEnd, Error> {
+        return ConnectionEnd::new(
+            State::Init,
+            client_id,
+            counterparty,
+            vec![default_version_string()],
+        );
+    }
 }
 
 #[cfg(test)]

modules/src/ics04_channel/channel.rs

@@ -283,9 +283,6 @@ pub mod test_util {
 
     use ibc_proto::ibc::core::channel::v1::Channel as RawChannel;
     use ibc_proto::ibc::core::channel::v1::Counterparty as RawCounterparty;
-    // use crate::ics03_connection::msgs::conn_open_init::MsgConnectionOpenInit;
-    // use
-    //crate::ics03_connection::msgs::conn_open_init::test_util::get_dummy_msg_conn_open_init;
 
     /// Returns a dummy `RawCounterparty`, for testing only!
     pub fn get_dummy_raw_counterparty() -> RawCounterparty {
@@ -316,7 +313,6 @@ pub mod test_util {
         }
     }
 }
-//MsgConnectionOpenInit::try_from(get_dummy_msg_conn_open_init()).unwrap().connection_id()
 
 #[cfg(test)]
 mod tests {

modules/src/ics04_channel/context.rs

@@ -2,15 +2,12 @@
 //! the interface that any host chain must implement to be able to process any `ChannelMsg`.
 //! TODO make "ADR 004: IBC protocol implementation" for more details.
 //!
-//use crate::ics02_client::client_def::{AnyClientState, AnyConsensusState};
 use crate::ics03_connection::connection::ConnectionEnd;
 use crate::ics04_channel::channel::{ChannelEnd, State};
 use crate::ics04_channel::error::Error;
 use crate::ics04_channel::handler::ChannelResult;
 use crate::ics04_channel::version::{get_compatible_versions, pick_version};
-//use crate::ics23_commitment::commitment::CommitmentPrefix;
 use crate::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
-//use crate::Height;
 
 /// A context supplying all the necessary read-only dependencies for processing any `ConnectionMsg`.
 pub trait ChannelReader {

modules/src/ics04_channel/error.rs

@@ -3,13 +3,10 @@ use thiserror::Error;
 
 pub type Error = anomaly::Error<Kind>;
 
-use crate::ics24_host::identifier::{ConnectionId,ChannelId};
+use crate::ics24_host::identifier::{ChannelId, ConnectionId};
 
 #[derive(Clone, Debug, Error)]
 pub enum Kind {
-    #[error("not implemented yet")]
-    Niy,
-
     #[error("channel state unknown")]
     UnknownState,
 

modules/src/ics04_channel/handler/chan_open_init.rs

@@ -65,8 +65,9 @@ mod tests {
 
     use crate::handler::EventType;
 
-    use crate::ics03_connection::connection::ConnectionEnd;
     use crate::ics03_connection::msgs::conn_open_init::test_util::get_dummy_msg_conn_open_init;
+    use crate::ics03_connection::msgs::conn_open_init::test_util::make_default_connection_end_for_client;
+
     use crate::ics03_connection::msgs::conn_open_init::MsgConnectionOpenInit;
 
     use crate::ics04_channel::channel::{ChannelEnd, State};
@@ -103,7 +104,7 @@ mod tests {
         let msg_conn_init =
             MsgConnectionOpenInit::try_from(get_dummy_msg_conn_open_init()).unwrap();
 
-        let init_conn_end = &ConnectionEnd::test_channel_new(
+        let init_conn_end = make_default_connection_end_for_client(
             msg_conn_init.client_id().clone(),
             msg_conn_init.counterparty().clone(),
         )