rm TimeoutOnClose

Author: rnbguy

ibc-eureka-core/ics04-channel/src/handler/mod.rs

@@ -3,10 +3,8 @@ mod acknowledgement;
 mod recv_packet;
 mod send_packet;
 mod timeout;
-mod timeout_on_close;
 
 pub use acknowledgement::*;
 pub use recv_packet::*;
 pub use send_packet::*;
 pub use timeout::*;
-pub use timeout_on_close::*;

ibc-eureka-core/ics04-channel/src/handler/timeout.rs

@@ -1,7 +1,7 @@
 use ibc_eureka_core_channel_types::commitment::compute_packet_commitment;
 use ibc_eureka_core_channel_types::error::ChannelError;
 use ibc_eureka_core_channel_types::events::TimeoutPacket;
-use ibc_eureka_core_channel_types::msgs::{MsgTimeout, MsgTimeoutOnClose};
+use ibc_eureka_core_channel_types::msgs::MsgTimeout;
 use ibc_eureka_core_client::context::prelude::*;
 use ibc_eureka_core_handler_types::events::{IbcEvent, MessageEvent};
 use ibc_eureka_core_host::types::path::{
@@ -11,46 +11,30 @@ use ibc_eureka_core_host::{ExecutionContext, ValidationContext};
 use ibc_eureka_core_router::module::Module;
 use ibc_primitives::prelude::*;
 
-use super::timeout_on_close;
-
-pub enum TimeoutMsgType {
-    Timeout(MsgTimeout),
-    TimeoutOnClose(MsgTimeoutOnClose),
-}
-
 pub fn timeout_packet_validate<ValCtx>(
     ctx_a: &ValCtx,
     module: &dyn Module,
-    timeout_msg_type: TimeoutMsgType,
+    msg: MsgTimeout,
 ) -> Result<(), ChannelError>
 where
     ValCtx: ValidationContext,
 {
-    match &timeout_msg_type {
-        TimeoutMsgType::Timeout(msg) => validate(ctx_a, msg),
-        TimeoutMsgType::TimeoutOnClose(msg) => timeout_on_close::validate(ctx_a, msg),
-    }?;
-
-    let (packet, signer) = match timeout_msg_type {
-        TimeoutMsgType::Timeout(msg) => (msg.packet, msg.signer),
-        TimeoutMsgType::TimeoutOnClose(msg) => (msg.packet, msg.signer),
-    };
+    validate(ctx_a, &msg)?;
+
+    let (packet, signer) = (msg.packet, msg.signer);
 
     module.on_timeout_packet_validate(&packet, &signer)
 }
 
 pub fn timeout_packet_execute<ExecCtx>(
     ctx_a: &mut ExecCtx,
     module: &mut dyn Module,
-    timeout_msg_type: TimeoutMsgType,
+    msg: MsgTimeout,
 ) -> Result<(), ChannelError>
 where
     ExecCtx: ExecutionContext,
 {
-    let (packet, signer) = match timeout_msg_type {
-        TimeoutMsgType::Timeout(msg) => (msg.packet, msg.signer),
-        TimeoutMsgType::TimeoutOnClose(msg) => (msg.packet, msg.signer),
-    };
+    let (packet, signer) = (msg.packet, msg.signer);
 
     let payload = &packet.payloads[0];
 

ibc-eureka-core/ics04-channel/src/handler/timeout_on_close.rs

@@ -26,14 +26,12 @@ pub enum PacketMsg {
     Recv(MsgRecvPacket),
     Ack(MsgAcknowledgement),
     Timeout(MsgTimeout),
-    TimeoutOnClose(MsgTimeoutOnClose),
 }
 
 pub fn packet_msg_to_port_id(msg: &PacketMsg) -> &PortId {
     match msg {
         PacketMsg::Recv(msg) => &msg.packet.payloads[0].header.target_port.1,
         PacketMsg::Ack(msg) => &msg.packet.payloads[0].header.source_port.1,
         PacketMsg::Timeout(msg) => &msg.packet.payloads[0].header.source_port.1,
-        PacketMsg::TimeoutOnClose(msg) => &msg.packet.payloads[0].header.source_port.1,
     }
 }

ibc-eureka-core/ics04-channel/types/src/msgs/mod.rs

@@ -1,6 +1,6 @@
 use ibc_eureka_core_channel::handler::{
     acknowledgement_packet_execute, acknowledgement_packet_validate, recv_packet_execute,
-    recv_packet_validate, timeout_packet_execute, timeout_packet_validate, TimeoutMsgType,
+    recv_packet_validate, timeout_packet_execute, timeout_packet_validate,
 };
 use ibc_eureka_core_channel::types::msgs::{packet_msg_to_port_id, PacketMsg};
 use ibc_eureka_core_client::context::{ClientExecutionContext, ClientValidationContext};
@@ -73,12 +73,7 @@ where
             match msg {
                 PacketMsg::Recv(msg) => recv_packet_validate(ctx, msg)?,
                 PacketMsg::Ack(msg) => acknowledgement_packet_validate(ctx, module, msg)?,
-                PacketMsg::Timeout(msg) => {
-                    timeout_packet_validate(ctx, module, TimeoutMsgType::Timeout(msg))?
-                }
-                PacketMsg::TimeoutOnClose(msg) => {
-                    timeout_packet_validate(ctx, module, TimeoutMsgType::TimeoutOnClose(msg))?
-                }
+                PacketMsg::Timeout(msg) => timeout_packet_validate(ctx, module, msg)?,
             }
         }
     };
@@ -123,12 +118,7 @@ where
             match msg {
                 PacketMsg::Recv(msg) => recv_packet_execute(ctx, module, msg)?,
                 PacketMsg::Ack(msg) => acknowledgement_packet_execute(ctx, module, msg)?,
-                PacketMsg::Timeout(msg) => {
-                    timeout_packet_execute(ctx, module, TimeoutMsgType::Timeout(msg))?
-                }
-                PacketMsg::TimeoutOnClose(msg) => {
-                    timeout_packet_execute(ctx, module, TimeoutMsgType::TimeoutOnClose(msg))?
-                }
+                PacketMsg::Timeout(msg) => timeout_packet_execute(ctx, module, msg)?,
             }
         }
     }

ibc-eureka-core/ics25-handler/src/entrypoint.rs

@@ -1,6 +1,6 @@
 use ibc_eureka_core_channel_types::msgs::{
-    MsgAcknowledgement, MsgRecvPacket, MsgTimeout, MsgTimeoutOnClose, PacketMsg,
-    ACKNOWLEDGEMENT_TYPE_URL, RECV_PACKET_TYPE_URL, TIMEOUT_ON_CLOSE_TYPE_URL, TIMEOUT_TYPE_URL,
+    MsgAcknowledgement, MsgRecvPacket, MsgTimeout, PacketMsg, ACKNOWLEDGEMENT_TYPE_URL,
+    RECV_PACKET_TYPE_URL, TIMEOUT_TYPE_URL,
 };
 #[allow(deprecated)]
 use ibc_eureka_core_client_types::msgs::{
@@ -64,11 +64,6 @@ impl TryFrom<Any> for MsgEnvelope {
                 let domain_msg = MsgTimeout::decode_vec(&any_msg.value)?;
                 Ok(MsgEnvelope::Packet(PacketMsg::Timeout(domain_msg)))
             }
-            TIMEOUT_ON_CLOSE_TYPE_URL => {
-                let domain_msg = MsgTimeoutOnClose::decode_vec(&any_msg.value)?;
-                Ok(MsgEnvelope::Packet(PacketMsg::TimeoutOnClose(domain_msg)))
-            }
-
             _ => Err(DecodingError::UnknownTypeUrl(any_msg.type_url))?,
         }
     }