Fix merge conflicts

cosmos · Sep 17, 2024 · cacf482 · cacf482
2 parents a5cad7f + 8d36c68
commit cacf482
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 28 deletions.
diff --git a/...ed/improvements/1336-remove-faulty-receipt-check-during-recv-packet-validate.md b/...ed/improvements/1336-remove-faulty-receipt-check-during-recv-packet-validate.md
@@ -0,0 +1,3 @@
+- [ibc-testkit] Remove redundant path constructions in the implementation of
+  `ValidationContext` for `MockIbcStore`
+  ([#1338](https://github.com/cosmos/ibc-rs/pull/1338)).
diff --git a/ibc-testkit/src/testapp/ibc/core/core_ctx.rs b/ibc-testkit/src/testapp/ibc/core/core_ctx.rs
@@ -130,10 +130,7 @@ where
 
     fn channel_end(&self, channel_end_path: &ChannelEndPath) -> Result<ChannelEnd, HostError> {
         self.channel_end_store
-            .get(
-                StoreHeight::Pending,
-                &ChannelEndPath::new(&channel_end_path.0, &channel_end_path.1),
-            )
+            .get(StoreHeight::Pending, channel_end_path)
             .ok_or(HostError::missing_state(format!(
                 "missing channel {} in port {}",
                 channel_end_path.1.clone(),
@@ -143,32 +140,23 @@ where
 
     fn get_next_sequence_send(&self, seq_send_path: &SeqSendPath) -> Result<Sequence, HostError> {
         self.send_sequence_store
-            .get(
-                StoreHeight::Pending,
-                &SeqSendPath::new(&seq_send_path.0, &seq_send_path.1),
-            )
+            .get(StoreHeight::Pending, seq_send_path)
             .ok_or(HostError::failed_to_retrieve(
                 "failed to retrieve send packet sequence",
             ))
     }
 
     fn get_next_sequence_recv(&self, seq_recv_path: &SeqRecvPath) -> Result<Sequence, HostError> {
         self.recv_sequence_store
-            .get(
-                StoreHeight::Pending,
-                &SeqRecvPath::new(&seq_recv_path.0, &seq_recv_path.1),
-            )
+            .get(StoreHeight::Pending, seq_recv_path)
             .ok_or(HostError::failed_to_retrieve(
                 "failed to retrieve recv packet sequence",
             ))
     }
 
     fn get_next_sequence_ack(&self, seq_ack_path: &SeqAckPath) -> Result<Sequence, HostError> {
         self.ack_sequence_store
-            .get(
-                StoreHeight::Pending,
-                &SeqAckPath::new(&seq_ack_path.0, &seq_ack_path.1),
-            )
+            .get(StoreHeight::Pending, seq_ack_path)
             .ok_or(HostError::failed_to_retrieve(
                 "failed to retrieve ack packet sequence",
             ))
@@ -179,14 +167,7 @@ where
         commitment_path: &CommitmentPath,
     ) -> Result<PacketCommitment, HostError> {
         self.packet_commitment_store
-            .get(
-                StoreHeight::Pending,
-                &CommitmentPath::new(
-                    &commitment_path.port_id,
-                    &commitment_path.channel_id,
-                    commitment_path.sequence,
-                ),
-            )
+            .get(StoreHeight::Pending, commitment_path)
             .ok_or(HostError::failed_to_retrieve(
                 "failed to retrieve packet commitment",
             ))
@@ -208,10 +189,7 @@ where
         ack_path: &AckPath,
     ) -> Result<AcknowledgementCommitment, HostError> {
         self.packet_ack_store
-            .get(
-                StoreHeight::Pending,
-                &AckPath::new(&ack_path.port_id, &ack_path.channel_id, ack_path.sequence),
-            )
+            .get(StoreHeight::Pending, ack_path)
             .ok_or(HostError::failed_to_retrieve(format!(
                 "failed to retrieve packet acknowledgment {}",
                 ack_path.sequence