Skip to content

Commit

Permalink
rm channel messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@rnbguy
rnbguy committed Oct 23, 2024
1 parent ed5af45 commit e83ceca
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 125 deletions.
24 changes: 12 additions & 12 deletions ibc-eureka-core/ics04-channel/src/handler/mod.rs
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
//! This module implements the processing logic for ICS4 (channel) messages.
mod acknowledgement;
mod chan_close_confirm;
mod chan_close_init;
mod chan_open_ack;
mod chan_open_confirm;
mod chan_open_init;
mod chan_open_try;
// mod chan_close_confirm;
// mod chan_close_init;
// mod chan_open_ack;
// mod chan_open_confirm;
// mod chan_open_init;
// mod chan_open_try;
mod recv_packet;
mod send_packet;
mod timeout;
mod timeout_on_close;

pub use acknowledgement::*;
pub use chan_close_confirm::*;
pub use chan_close_init::*;
pub use chan_open_ack::*;
pub use chan_open_confirm::*;
pub use chan_open_init::*;
pub use chan_open_try::*;
// pub use chan_close_confirm::*;
// pub use chan_close_init::*;
// pub use chan_open_ack::*;
// pub use chan_open_confirm::*;
// pub use chan_open_init::*;
// pub use chan_open_try::*;
pub use recv_packet::*;
pub use send_packet::*;
pub use timeout::*;
Expand Down
64 changes: 3 additions & 61 deletions ibc-eureka-core/ics25-handler/src/entrypoint.rs
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
use ibc_eureka_core_channel::handler::{
acknowledgement_packet_execute, acknowledgement_packet_validate, chan_close_confirm_execute,
chan_close_confirm_validate, chan_close_init_execute, chan_close_init_validate,
chan_open_ack_execute, chan_open_ack_validate, chan_open_confirm_execute,
chan_open_confirm_validate, chan_open_init_execute, chan_open_init_validate,
chan_open_try_execute, chan_open_try_validate, recv_packet_execute, recv_packet_validate,
timeout_packet_execute, timeout_packet_validate, TimeoutMsgType,
};
use ibc_eureka_core_channel::types::msgs::{
channel_msg_to_port_id, packet_msg_to_port_id, ChannelMsg, PacketMsg,
acknowledgement_packet_execute, acknowledgement_packet_validate, recv_packet_execute,
recv_packet_validate, timeout_packet_execute, timeout_packet_validate, TimeoutMsgType,
};
use ibc_eureka_core_channel::types::msgs::{packet_msg_to_port_id, PacketMsg};
use ibc_eureka_core_client::context::{ClientExecutionContext, ClientValidationContext};
use ibc_eureka_core_client::handler::{create_client, update_client, upgrade_client};
use ibc_eureka_core_client::types::error::ClientError;
use ibc_eureka_core_client::types::msgs::{ClientMsg, MsgUpdateOrMisbehaviour};
use ibc_eureka_core_connection::handler::{
conn_open_ack, conn_open_confirm, conn_open_init, conn_open_try,
};
use ibc_eureka_core_connection::types::msgs::ConnectionMsg;
use ibc_eureka_core_handler_types::error::HandlerError;
use ibc_eureka_core_handler_types::msgs::MsgEnvelope;
use ibc_eureka_core_host::types::error::HostError;
Expand Down Expand Up @@ -71,30 +61,6 @@ where
// authorized via a passing governance proposal
}
},
MsgEnvelope::Connection(msg) => match msg {
ConnectionMsg::OpenInit(msg) => conn_open_init::validate(ctx, msg)?,
ConnectionMsg::OpenTry(msg) => conn_open_try::validate(ctx, msg)?,
ConnectionMsg::OpenAck(msg) => conn_open_ack::validate(ctx, msg)?,
ConnectionMsg::OpenConfirm(msg) => conn_open_confirm::validate(ctx, &msg)?,
},
MsgEnvelope::Channel(msg) => {
let port_id = channel_msg_to_port_id(&msg);
let module_id = router.lookup_module(port_id).ok_or(RouterError::Host(
HostError::missing_state(format!("missing module ID for port {}", port_id.clone())),
))?;
let module = router
.get_route(&module_id)
.ok_or(RouterError::MissingModule)?;

match msg {
ChannelMsg::OpenInit(msg) => chan_open_init_validate(ctx, module, msg)?,
ChannelMsg::OpenTry(msg) => chan_open_try_validate(ctx, module, msg)?,
ChannelMsg::OpenAck(msg) => chan_open_ack_validate(ctx, module, msg)?,
ChannelMsg::OpenConfirm(msg) => chan_open_confirm_validate(ctx, module, msg)?,
ChannelMsg::CloseInit(msg) => chan_close_init_validate(ctx, module, msg)?,
ChannelMsg::CloseConfirm(msg) => chan_close_confirm_validate(ctx, module, msg)?,
}
}
MsgEnvelope::Packet(msg) => {
let port_id = packet_msg_to_port_id(&msg);
let module_id = router.lookup_module(port_id).ok_or(RouterError::Host(
Expand Down Expand Up @@ -145,30 +111,6 @@ where
// authorized via a passing governance proposal
}
},
MsgEnvelope::Connection(msg) => match msg {
ConnectionMsg::OpenInit(msg) => conn_open_init::execute(ctx, msg)?,
ConnectionMsg::OpenTry(msg) => conn_open_try::execute(ctx, msg)?,
ConnectionMsg::OpenAck(msg) => conn_open_ack::execute(ctx, msg)?,
ConnectionMsg::OpenConfirm(msg) => conn_open_confirm::execute(ctx, &msg)?,
},
MsgEnvelope::Channel(msg) => {
let port_id = channel_msg_to_port_id(&msg);
let module_id = router.lookup_module(port_id).ok_or(RouterError::Host(
HostError::missing_state(format!("missing module ID for port {}", port_id.clone())),
))?;
let module = router
.get_route_mut(&module_id)
.ok_or(RouterError::MissingModule)?;

match msg {
ChannelMsg::OpenInit(msg) => chan_open_init_execute(ctx, module, msg)?,
ChannelMsg::OpenTry(msg) => chan_open_try_execute(ctx, module, msg)?,
ChannelMsg::OpenAck(msg) => chan_open_ack_execute(ctx, module, msg)?,
ChannelMsg::OpenConfirm(msg) => chan_open_confirm_execute(ctx, module, msg)?,
ChannelMsg::CloseInit(msg) => chan_close_init_execute(ctx, module, msg)?,
ChannelMsg::CloseConfirm(msg) => chan_close_confirm_execute(ctx, module, msg)?,
}
}
MsgEnvelope::Packet(msg) => {
let port_id = packet_msg_to_port_id(&msg);
let module_id = router.lookup_module(port_id).ok_or(RouterError::Host(
Expand Down
80 changes: 28 additions & 52 deletions ibc-eureka-core/ics25-handler/types/src/msgs.rs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
use ibc_eureka_core_channel_types::msgs::{
ChannelMsg, MsgAcknowledgement, MsgChannelCloseConfirm, MsgChannelCloseInit, MsgChannelOpenAck,
MsgChannelOpenConfirm, MsgChannelOpenInit, MsgChannelOpenTry, MsgRecvPacket, MsgTimeout,
MsgTimeoutOnClose, PacketMsg, ACKNOWLEDGEMENT_TYPE_URL, CHAN_CLOSE_CONFIRM_TYPE_URL,
CHAN_CLOSE_INIT_TYPE_URL, CHAN_OPEN_ACK_TYPE_URL, CHAN_OPEN_CONFIRM_TYPE_URL,
CHAN_OPEN_INIT_TYPE_URL, CHAN_OPEN_TRY_TYPE_URL, RECV_PACKET_TYPE_URL,
TIMEOUT_ON_CLOSE_TYPE_URL, TIMEOUT_TYPE_URL,
MsgAcknowledgement, MsgRecvPacket, MsgTimeout, MsgTimeoutOnClose, PacketMsg,
ACKNOWLEDGEMENT_TYPE_URL, RECV_PACKET_TYPE_URL, TIMEOUT_ON_CLOSE_TYPE_URL, TIMEOUT_TYPE_URL,
};
#[allow(deprecated)]
use ibc_eureka_core_client_types::msgs::{
Expand All @@ -26,7 +22,7 @@ use ibc_proto::Protobuf;
#[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
pub enum MsgEnvelope {
Client(ClientMsg),
Channel(ChannelMsg),
// Channel(ChannelMsg),
Packet(PacketMsg),
}

Expand Down Expand Up @@ -55,51 +51,31 @@ impl TryFrom<Any> for MsgEnvelope {
Ok(MsgEnvelope::Client(ClientMsg::Misbehaviour(domain_msg)))
}

// ICS03
CONN_OPEN_INIT_TYPE_URL => {
let domain_msg = MsgConnectionOpenInit::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Connection(ConnectionMsg::OpenInit(domain_msg)))
}
CONN_OPEN_TRY_TYPE_URL => {
let domain_msg = MsgConnectionOpenTry::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Connection(ConnectionMsg::OpenTry(domain_msg)))
}
CONN_OPEN_ACK_TYPE_URL => {
let domain_msg = MsgConnectionOpenAck::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Connection(ConnectionMsg::OpenAck(domain_msg)))
}
CONN_OPEN_CONFIRM_TYPE_URL => {
let domain_msg = MsgConnectionOpenConfirm::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Connection(ConnectionMsg::OpenConfirm(
domain_msg,
)))
}

// ICS04 channel messages
CHAN_OPEN_INIT_TYPE_URL => {
let domain_msg = MsgChannelOpenInit::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Channel(ChannelMsg::OpenInit(domain_msg)))
}
CHAN_OPEN_TRY_TYPE_URL => {
let domain_msg = MsgChannelOpenTry::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Channel(ChannelMsg::OpenTry(domain_msg)))
}
CHAN_OPEN_ACK_TYPE_URL => {
let domain_msg = MsgChannelOpenAck::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Channel(ChannelMsg::OpenAck(domain_msg)))
}
CHAN_OPEN_CONFIRM_TYPE_URL => {
let domain_msg = MsgChannelOpenConfirm::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Channel(ChannelMsg::OpenConfirm(domain_msg)))
}
CHAN_CLOSE_INIT_TYPE_URL => {
let domain_msg = MsgChannelCloseInit::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Channel(ChannelMsg::CloseInit(domain_msg)))
}
CHAN_CLOSE_CONFIRM_TYPE_URL => {
let domain_msg = MsgChannelCloseConfirm::decode_vec(&any_msg.value)?;
Ok(MsgEnvelope::Channel(ChannelMsg::CloseConfirm(domain_msg)))
}
// // ICS04 channel messages
// CHAN_OPEN_INIT_TYPE_URL => {
// let domain_msg = MsgChannelOpenInit::decode_vec(&any_msg.value)?;
// Ok(MsgEnvelope::Channel(ChannelMsg::OpenInit(domain_msg)))
// }
// CHAN_OPEN_TRY_TYPE_URL => {
// let domain_msg = MsgChannelOpenTry::decode_vec(&any_msg.value)?;
// Ok(MsgEnvelope::Channel(ChannelMsg::OpenTry(domain_msg)))
// }
// CHAN_OPEN_ACK_TYPE_URL => {
// let domain_msg = MsgChannelOpenAck::decode_vec(&any_msg.value)?;
// Ok(MsgEnvelope::Channel(ChannelMsg::OpenAck(domain_msg)))
// }
// CHAN_OPEN_CONFIRM_TYPE_URL => {
// let domain_msg = MsgChannelOpenConfirm::decode_vec(&any_msg.value)?;
// Ok(MsgEnvelope::Channel(ChannelMsg::OpenConfirm(domain_msg)))
// }
// CHAN_CLOSE_INIT_TYPE_URL => {
// let domain_msg = MsgChannelCloseInit::decode_vec(&any_msg.value)?;
// Ok(MsgEnvelope::Channel(ChannelMsg::CloseInit(domain_msg)))
// }
// CHAN_CLOSE_CONFIRM_TYPE_URL => {
// let domain_msg = MsgChannelCloseConfirm::decode_vec(&any_msg.value)?;
// Ok(MsgEnvelope::Channel(ChannelMsg::CloseConfirm(domain_msg)))
// }
// ICS04 packet messages
RECV_PACKET_TYPE_URL => {
let domain_msg = MsgRecvPacket::decode_vec(&any_msg.value)?;
Expand Down

0 comments on commit e83ceca

Please sign in to comment.