use ChannelId

Author: rnbguy

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

@@ -618,9 +618,9 @@ impl SendPacket {
             timeout_timestamp_attr_on_b: packet.header.timeout_timestamp_on_b.into(),
             seq_attr_on_a: packet.header.seq_on_a.into(),
             port_id_attr_on_a: payload.header.source_port.1.into(),
-            chan_id_attr_on_a: ChannelId::from(packet.header.source_client).into(),
+            chan_id_attr_on_a: packet.header.source_client.into(),
             port_id_attr_on_b: payload.header.target_port.1.into(),
-            chan_id_attr_on_b: ChannelId::from(packet.header.target_client).into(),
+            chan_id_attr_on_b: packet.header.target_client.into(),
             channel_ordering_attr: channel_ordering.into(),
             conn_id_attr_on_a: src_connection_id.into(),
         }
@@ -730,9 +730,9 @@ impl ReceivePacket {
             timeout_timestamp_attr_on_b: packet.header.timeout_timestamp_on_b.into(),
             seq_attr_on_a: packet.header.seq_on_a.into(),
             port_id_attr_on_a: payload.header.source_port.1.into(),
-            chan_id_attr_on_a: ChannelId::from(packet.header.source_client).into(),
+            chan_id_attr_on_a: packet.header.source_client.into(),
             port_id_attr_on_b: payload.header.target_port.1.into(),
-            chan_id_attr_on_b: ChannelId::from(packet.header.target_client).into(),
+            chan_id_attr_on_b: packet.header.target_client.into(),
             channel_ordering_attr: channel_ordering.into(),
             conn_id_attr_on_b: dst_connection_id.into(),
         }
@@ -846,9 +846,9 @@ impl WriteAcknowledgement {
             timeout_timestamp_attr_on_b: packet.header.timeout_timestamp_on_b.into(),
             seq_attr_on_a: packet.header.seq_on_a.into(),
             port_id_attr_on_a: payload.header.source_port.1.into(),
-            chan_id_attr_on_a: ChannelId::from(packet.header.source_client).into(),
+            chan_id_attr_on_a: packet.header.source_client.into(),
             port_id_attr_on_b: payload.header.target_port.1.into(),
-            chan_id_attr_on_b: ChannelId::from(packet.header.target_client).into(),
+            chan_id_attr_on_b: packet.header.target_client.into(),
             acknowledgement: acknowledgement.into(),
             conn_id_attr_on_b: conn_id_on_b.into(),
         }
@@ -956,9 +956,9 @@ impl AcknowledgePacket {
             timeout_timestamp_attr_on_b: packet.header.timeout_timestamp_on_b.into(),
             seq_on_a: packet.header.seq_on_a.into(),
             port_id_attr_on_a: payload.header.source_port.1.into(),
-            chan_id_attr_on_a: ChannelId::from(packet.header.source_client).into(),
+            chan_id_attr_on_a: packet.header.source_client.into(),
             port_id_attr_on_b: payload.header.target_port.1.into(),
-            chan_id_attr_on_b: ChannelId::from(packet.header.target_client).into(),
+            chan_id_attr_on_b: packet.header.target_client.into(),
             channel_ordering_attr: channel_ordering.into(),
             conn_id_attr_on_a: src_connection_id.into(),
         }
@@ -1059,9 +1059,9 @@ impl TimeoutPacket {
             timeout_timestamp_attr_on_b: packet.header.timeout_timestamp_on_b.into(),
             seq_attr_on_a: packet.header.seq_on_a.into(),
             port_id_attr_on_a: payload.header.source_port.1.into(),
-            chan_id_attr_on_a: ChannelId::from(packet.header.source_client).into(),
+            chan_id_attr_on_a: packet.header.source_client.into(),
             port_id_attr_on_b: payload.header.target_port.1.into(),
-            chan_id_attr_on_b: ChannelId::from(packet.header.target_client).into(),
+            chan_id_attr_on_b: packet.header.target_client.into(),
             channel_ordering_attr: channel_ordering.into(),
         }
     }

ibc-eureka-core/ics04-channel/types/src/packet.rs

@@ -2,7 +2,7 @@
 use ibc_eureka_core_client_types::Height;
 use ibc_eureka_core_commitment_types::commitment::CommitmentPrefix;
 use ibc_eureka_core_host_types::error::DecodingError;
-use ibc_eureka_core_host_types::identifiers::{ChannelId, ClientId, PortId, Sequence};
+use ibc_eureka_core_host_types::identifiers::{ChannelId, PortId, Sequence};
 use ibc_primitives::prelude::*;
 use ibc_primitives::Timestamp;
 use ibc_proto::ibc::core::channel::v1::{Packet as RawPacket, PacketState as RawPacketState};
@@ -83,8 +83,8 @@ impl core::fmt::Display for PacketMsgType {
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub struct PacketHeader {
     pub seq_on_a: Sequence,
-    pub source_client: ClientId,
-    pub target_client: ClientId,
+    pub source_client: ChannelId,
+    pub target_client: ChannelId,
     pub timeout_height_on_b: TimeoutHeight,
     pub timeout_timestamp_on_b: TimeoutTimestamp,
 }