Remove has route (#740)

* remove has route and refactor validate and execute functions

* add changelog

.changelog/unreleased/bug/503-update-unclog-instructions.md

@@ -0,0 +1,2 @@
+Remove Router::has_route
+  ([\#503](https://github.com/cosmos/ibc-rs/issues/503))

crates/ibc/src/core/handler.rs

@@ -5,7 +5,6 @@ use super::ics03_connection::handler::{
     conn_open_ack, conn_open_confirm, conn_open_init, conn_open_try,
 };
 use super::ics03_connection::msgs::ConnectionMsg;
-use super::ics04_channel::error::ChannelError;
 use super::ics04_channel::handler::acknowledgement::{
     acknowledgement_packet_execute, acknowledgement_packet_validate,
 };
@@ -72,9 +71,6 @@ where
             let module_id = ctx
                 .lookup_module_channel(&msg)
                 .map_err(ContextError::from)?;
-            if !ctx.has_route(&module_id) {
-                return Err(ChannelError::RouteNotFound).map_err(ContextError::from)?;
-            }
 
             match msg {
                 ChannelMsg::OpenInit(msg) => chan_open_init_validate(ctx, module_id, msg),
@@ -88,9 +84,6 @@ where
         }
         MsgEnvelope::Packet(msg) => {
             let module_id = ctx.lookup_module_packet(&msg).map_err(ContextError::from)?;
-            if !ctx.has_route(&module_id) {
-                return Err(ChannelError::RouteNotFound).map_err(ContextError::from)?;
-            }
 
             match msg {
                 PacketMsg::Recv(msg) => recv_packet_validate(ctx, msg),
@@ -135,9 +128,6 @@ where
             let module_id = ctx
                 .lookup_module_channel(&msg)
                 .map_err(ContextError::from)?;
-            if !ctx.has_route(&module_id) {
-                return Err(ChannelError::RouteNotFound).map_err(ContextError::from)?;
-            }
 
             match msg {
                 ChannelMsg::OpenInit(msg) => chan_open_init_execute(ctx, module_id, msg),
@@ -151,9 +141,6 @@ where
         }
         MsgEnvelope::Packet(msg) => {
             let module_id = ctx.lookup_module_packet(&msg).map_err(ContextError::from)?;
-            if !ctx.has_route(&module_id) {
-                return Err(ChannelError::RouteNotFound).map_err(ContextError::from)?;
-            }
 
             match msg {
                 PacketMsg::Recv(msg) => recv_packet_execute(ctx, module_id, msg),

crates/ibc/src/core/router.rs

@@ -24,9 +24,6 @@ pub trait Router {
     /// Returns a mutable reference to a `Module` registered against the specified `ModuleId`
     fn get_route_mut(&mut self, module_id: &ModuleId) -> Option<&mut dyn Module>;
 
-    /// Returns true if the `Router` has a `Module` registered against the specified `ModuleId`
-    fn has_route(&self, module_id: &ModuleId) -> bool;
-
     /// Return the module_id associated with a given port_id
     fn lookup_module_by_port(&self, port_id: &PortId) -> Option<ModuleId>;
 

crates/ibc/src/mock/context.rs

@@ -700,10 +700,6 @@ impl Router for MockContext {
         }
     }
 
-    fn has_route(&self, module_id: &ModuleId) -> bool {
-        self.router.get(module_id).is_some()
-    }
-
     fn lookup_module_by_port(&self, port_id: &PortId) -> Option<ModuleId> {
         self.ibc_store.lock().port_to_module.get(port_id).cloned()
     }