rm prefix from Packet struct

Author: rnbguy

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

@@ -554,9 +554,9 @@ impl SendPacket {
             timeout_height_attr_on_b: packet.header.timeout_height_on_b.into(),
             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(),
+            port_id_attr_on_a: payload.header.source_port.into(),
             chan_id_attr_on_a: packet.header.target_client_on_source.into(),
-            port_id_attr_on_b: payload.header.target_port.1.into(),
+            port_id_attr_on_b: payload.header.target_port.into(),
             chan_id_attr_on_b: packet.header.source_client_on_target.into(),
         }
     }
@@ -652,9 +652,9 @@ impl ReceivePacket {
             timeout_height_attr_on_b: packet.header.timeout_height_on_b.into(),
             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(),
+            port_id_attr_on_a: payload.header.source_port.into(),
             chan_id_attr_on_a: packet.header.target_client_on_source.into(),
-            port_id_attr_on_b: payload.header.target_port.1.into(),
+            port_id_attr_on_b: payload.header.target_port.into(),
             chan_id_attr_on_b: packet.header.source_client_on_target.into(),
         }
     }
@@ -751,9 +751,9 @@ impl WriteAcknowledgement {
             timeout_height_attr_on_b: packet.header.timeout_height_on_b.into(),
             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(),
+            port_id_attr_on_a: payload.header.source_port.into(),
             chan_id_attr_on_a: packet.header.target_client_on_source.into(),
-            port_id_attr_on_b: payload.header.target_port.1.into(),
+            port_id_attr_on_b: payload.header.target_port.into(),
             chan_id_attr_on_b: packet.header.source_client_on_target.into(),
             acknowledgement: acknowledgement.into(),
         }
@@ -853,9 +853,9 @@ impl AcknowledgePacket {
             timeout_height_attr_on_b: packet.header.timeout_height_on_b.into(),
             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(),
+            port_id_attr_on_a: payload.header.source_port.into(),
             chan_id_attr_on_a: packet.header.target_client_on_source.into(),
-            port_id_attr_on_b: payload.header.target_port.1.into(),
+            port_id_attr_on_b: payload.header.target_port.into(),
             chan_id_attr_on_b: packet.header.source_client_on_target.into(),
         }
     }
@@ -943,9 +943,9 @@ impl TimeoutPacket {
             timeout_height_attr_on_b: packet.header.timeout_height_on_b.into(),
             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(),
+            port_id_attr_on_a: payload.header.source_port.into(),
             chan_id_attr_on_a: packet.header.target_client_on_source.into(),
-            port_id_attr_on_b: payload.header.target_port.1.into(),
+            port_id_attr_on_b: payload.header.target_port.into(),
             chan_id_attr_on_b: packet.header.source_client_on_target.into(),
         }
     }

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

@@ -30,8 +30,8 @@ pub enum PacketMsg {
 
 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::Recv(msg) => &msg.packet.payloads[0].header.target_port,
+        PacketMsg::Ack(msg) => &msg.packet.payloads[0].header.source_port,
+        PacketMsg::Timeout(msg) => &msg.packet.payloads[0].header.source_port,
     }
 }

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

@@ -1,6 +1,5 @@
 //! Defines the packet type
 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, PortId, Sequence};
 use ibc_primitives::prelude::*;
@@ -105,8 +104,8 @@ pub struct PacketHeader {
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub struct PayloadHeader {
-    pub source_port: (CommitmentPrefix, PortId),
-    pub target_port: (CommitmentPrefix, PortId),
+    pub source_port: PortId,
+    pub target_port: PortId,
 }
 
 #[cfg_attr(
@@ -196,7 +195,7 @@ impl core::fmt::Display for Packet {
             write!(
                 f,
                 "src_port:{}, dst_port:{}",
-                payload.header.source_port.1, payload.header.target_port.1
+                payload.header.source_port, payload.header.target_port
             )?;
         }
         Ok(())
@@ -247,8 +246,8 @@ impl TryFrom<RawPacket> for Packet {
             // TODO(rano): support multi payload; currently only one payload is supported
             payloads: vec![Payload {
                 header: PayloadHeader {
-                    source_port: (CommitmentPrefix::empty(), raw_pkt.source_port.parse()?),
-                    target_port: (CommitmentPrefix::empty(), raw_pkt.destination_port.parse()?),
+                    source_port: raw_pkt.source_port.parse()?,
+                    target_port: raw_pkt.destination_port.parse()?,
                 },
                 data: raw_pkt.data,
             }],
@@ -265,8 +264,8 @@ impl From<Packet> for RawPacket {
             timeout_height: packet.header.timeout_height_on_b.into(),
             timeout_timestamp: packet.header.timeout_timestamp_on_b.nanoseconds(),
             // TODO(rano): support multi payload; currently only one payload is supported
-            source_port: packet.payloads[0].header.source_port.1.to_string(),
-            destination_port: packet.payloads[0].header.target_port.1.to_string(),
+            source_port: packet.payloads[0].header.source_port.to_string(),
+            destination_port: packet.payloads[0].header.target_port.to_string(),
             data: packet.payloads[0].data.clone(),
         }
     }