chan open init

modules/src/ics04_channel/channel.rs

@@ -337,7 +337,7 @@ pub mod test_util {
             state: 1,
             ordering: 0,
             counterparty: Some(get_dummy_raw_counterparty()),
-            connection_hops: vec!["srcconnection".to_string()],
+            connection_hops: vec!["defaultConnection-0".to_string()],
             version: "ics20".to_string(), // The version is not validated.
         }
     }

modules/src/ics04_channel/context.rs

@@ -70,7 +70,7 @@ pub trait ChannelKeeper {
 
                 self.store_connection_channels(
                     &result.channel_end.connection_hops()[0].clone(),
-                    &(result.port_id.clone(), channel_id.clone()),
+                    &(result.port_id.clone(), channel_id),
                 )?;
             }
             State::TryOpen => {

modules/src/ics04_channel/handler/chan_open_init.rs

@@ -111,8 +111,7 @@ mod tests {
             msg_conn_init.delay_period,
         );
 
-        // let cid = ConnectionId::default();
-        let ccid = <ConnectionId as FromStr>::from_str("srcconnection");
+        let ccid = <ConnectionId as FromStr>::from_str("defaultConnection-0");
         let cid = match ccid {
             Ok(v) => v,
             Err(_e) => ConnectionId::default(),
@@ -136,17 +135,15 @@ mod tests {
             },
             Test {
                 name: "Good parameters".to_string(),
-                ctx: context
-                    .with_connection_capability(
-                        MsgChannelOpenInit::try_from(get_dummy_raw_msg_chan_open_init())
-                            .unwrap()
-                            .port_id()
-                            .clone(),
-                        cid.clone(),
-                        init_conn_end.clone(),
-                    )
-                    .clone(),
-                msg: ChannelMsg::ChannelOpenInit(msg_chan_init.clone()),
+                ctx: context.with_connection_capability(
+                    MsgChannelOpenInit::try_from(get_dummy_raw_msg_chan_open_init())
+                        .unwrap()
+                        .port_id()
+                        .clone(),
+                    cid,
+                    init_conn_end,
+                ),
+                msg: ChannelMsg::ChannelOpenInit(msg_chan_init),
                 want_pass: true,
             },
         ]

modules/src/ics05_port/capabilities.rs

@@ -14,3 +14,9 @@ impl Capability {
         Self { index: 0x0 }
     }
 }
+
+impl Default for Capability {
+    fn default() -> Self {
+        Self::new()
+    }
+}

modules/src/ics26_routing/handler.rs

@@ -200,6 +200,8 @@ mod tests {
             res
         );
 
+        ctx = MockContext::add_port(&mut ctx, msg_chan_init.port_id().clone());
+
         // Figure out the ID of the client that was just created.
         // TODO: Create a "search by attribute key" API for HandlerOutput to simplify the following
         let mut events = res.unwrap().events;

modules/src/mock/context.rs

@@ -318,6 +318,14 @@ impl MockContext {
         }
         Ok(())
     }
+    pub fn add_port(&self, port_id: PortId) -> Self {
+        let mut port_capabilities = self.port_capabilities.clone();
+        port_capabilities.insert(port_id, Capability::new());
+        Self {
+            port_capabilities,
+            ..self.clone()
+        }
+    }
 }
 
 impl ICS26Context for MockContext {}
@@ -329,7 +337,7 @@ impl PortReader for MockContext {
     }
 
     fn autenthenticate(&self, _cap: &Capability, _port_id: &PortId) -> bool {
-        return true;
+        true
     }
 }
 
@@ -391,11 +399,11 @@ impl ChannelReader for MockContext {
     }
 
     fn port_capability(&self, port_id: &PortId) -> Option<Capability> {
-        return PortReader::lookup_module_by_port(self, port_id);
+        PortReader::lookup_module_by_port(self, port_id)
     }
 
     fn capability_authentification(&self, port_id: &PortId, cap: &Capability) -> bool {
-        return PortReader::autenthenticate(self, cap, port_id);
+        PortReader::autenthenticate(self, cap, port_id)
     }
 }
 
@@ -449,19 +457,20 @@ impl ChannelKeeper for MockContext {
         cid: &ConnectionId,
         port_channel_id: &(PortId, ChannelId),
     ) -> Result<(), ICS4Error> {
-        Ok(match self.connection_channels.get(cid) {
+        match self.connection_channels.get(cid) {
             Some(v) => {
                 let mut modv = v.clone();
                 modv.push(port_channel_id.clone());
-                &self.connection_channels.remove(cid);
+                self.connection_channels.remove(cid);
                 self.connection_channels.insert(cid.clone(), modv);
             }
             None => {
                 let mut modv = Vec::new();
                 modv.push(port_channel_id.clone());
                 self.connection_channels.insert(cid.clone(), modv);
             }
-        })
+        }
+        Ok(())
     }
 }