From fc3ff8de655f9afa6f408bfdd768caf44cd86fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?colin=20axn=C3=A9r?=
 <25233464+colin-axner@users.noreply.github.com>
Date: Wed, 9 Aug 2023 16:05:00 +0200
Subject: [PATCH] testing: fix usage on TimeoutPacket to use counterparty
 portID/channelID in nextSeqRecv query (#4319)

(cherry picked from commit 00a680cda52690a4ba835bf37f53acc41c01bc7a)

# Conflicts:
#	testing/endpoint.go
---
 testing/endpoint.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/testing/endpoint.go b/testing/endpoint.go
index f145804e4db..9a7b43b31b4 100644
--- a/testing/endpoint.go
+++ b/testing/endpoint.go
@@ -526,9 +526,16 @@ func (endpoint *Endpoint) TimeoutPacket(packet channeltypes.Packet) error {
 		return fmt.Errorf("unsupported order type %s", endpoint.ChannelConfig.Order)
 	}
 
+<<<<<<< HEAD
 	proof, proofHeight := endpoint.Counterparty.QueryProof(packetKey)
 	nextSeqRecv, found := endpoint.Counterparty.Chain.App.GetIBCKeeper().ChannelKeeper.GetNextSequenceRecv(endpoint.Counterparty.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID)
 	require.True(endpoint.Chain.T, found)
+=======
+	counterparty := endpoint.Counterparty
+	proof, proofHeight := counterparty.QueryProof(packetKey)
+	nextSeqRecv, found := counterparty.Chain.App.GetIBCKeeper().ChannelKeeper.GetNextSequenceRecv(counterparty.Chain.GetContext(), counterparty.ChannelConfig.PortID, counterparty.ChannelID)
+	require.True(endpoint.Chain.TB, found)
+>>>>>>> 00a680cd (testing: fix usage on TimeoutPacket to use counterparty portID/channelID in nextSeqRecv query (#4319))
 
 	timeoutMsg := channeltypes.NewMsgTimeout(
 		packet, nextSeqRecv,