From 0bb239f9aea8e569791a9eee990128b926e429a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Colin=20Axn=C3=A9r?=
 <25233464+colin-axner@users.noreply.github.com>
Date: Wed, 16 Feb 2022 15:59:42 +0100
Subject: [PATCH] refactor: use mock module for OnAcknowledgePacket callback
 testing

---
 modules/apps/29-fee/fee_test.go        | 13 +++++++++++++
 modules/apps/29-fee/ibc_module_test.go | 20 ++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/modules/apps/29-fee/fee_test.go b/modules/apps/29-fee/fee_test.go
index 6df368364bf..88037046a69 100644
--- a/modules/apps/29-fee/fee_test.go
+++ b/modules/apps/29-fee/fee_test.go
@@ -80,3 +80,16 @@ func (suite *FeeTestSuite) CreateICS20Packet(coin sdk.Coin) channeltypes.Packet
 		0,
 	)
 }
+
+func (suite *FeeTestSuite) CreateMockPacket() channeltypes.Packet {
+	return channeltypes.NewPacket(
+		ibcmock.MockPacketData,
+		suite.chainA.SenderAccount.GetSequence(),
+		suite.path.EndpointA.ChannelConfig.PortID,
+		suite.path.EndpointA.ChannelID,
+		suite.path.EndpointB.ChannelConfig.PortID,
+		suite.path.EndpointB.ChannelID,
+		clienttypes.NewHeight(0, 100),
+		0,
+	)
+}
diff --git a/modules/apps/29-fee/ibc_module_test.go b/modules/apps/29-fee/ibc_module_test.go
index 8f1e4ad1f28..2ee9a535bb0 100644
--- a/modules/apps/29-fee/ibc_module_test.go
+++ b/modules/apps/29-fee/ibc_module_test.go
@@ -545,7 +545,7 @@ func (suite *FeeTestSuite) TestOnAcknowledgementPacket() {
 				suite.chainA.GetSimApp().IBCFeeKeeper.DeleteFeeInEscrow(suite.chainA.GetContext(), packetId)
 
 				ack = types.IncentivizedAcknowledgement{
-					Result:                channeltypes.NewResultAcknowledgement([]byte{1}).Acknowledgement(),
+					Result:                ibcmock.MockAcknowledgement.Acknowledgement(),
 					ForwardRelayerAddress: suite.chainA.SenderAccount.GetAddress().String(),
 				}.Acknowledgement()
 
@@ -566,7 +566,7 @@ func (suite *FeeTestSuite) TestOnAcknowledgementPacket() {
 			"channel is not fee not enabled, success",
 			func() {
 				suite.chainA.GetSimApp().IBCFeeKeeper.DeleteFeeEnabled(suite.chainA.GetContext(), suite.path.EndpointA.ChannelConfig.PortID, suite.path.EndpointA.ChannelID)
-				ack = channeltypes.NewResultAcknowledgement([]byte{1}).Acknowledgement()
+				ack = ibcmock.MockAcknowledgement.Acknowledgement()
 
 				expectedBalance = originalBalance
 			},
@@ -578,7 +578,7 @@ func (suite *FeeTestSuite) TestOnAcknowledgementPacket() {
 				blockedAddr := suite.chainA.GetSimApp().AccountKeeper.GetModuleAccount(suite.chainA.GetContext(), transfertypes.ModuleName).GetAddress()
 
 				ack = types.IncentivizedAcknowledgement{
-					Result:                channeltypes.NewResultAcknowledgement([]byte{1}).Acknowledgement(),
+					Result:                ibcmock.MockAcknowledgement.Acknowledgement(),
 					ForwardRelayerAddress: blockedAddr.String(),
 				}.Acknowledgement()
 
@@ -592,24 +592,20 @@ func (suite *FeeTestSuite) TestOnAcknowledgementPacket() {
 		tc := tc
 		suite.Run(tc.name, func() {
 			suite.SetupTest()
-			expectedRelayerBalance = sdk.Coins{} // reset
-
-			// open incentivized channel
 			suite.coordinator.Setup(suite.path)
+			packet := suite.CreateMockPacket()
 
-			// set up coin & ics20 packet
-			coin := ibctesting.TestCoin
-			packet := suite.CreateICS20Packet(coin)
+			expectedRelayerBalance = sdk.Coins{} // reset
 
 			// set up module and callbacks
-			module, _, err := suite.chainA.App.GetIBCKeeper().PortKeeper.LookupModuleByPort(suite.chainA.GetContext(), ibctesting.TransferPort)
+			module, _, err := suite.chainA.App.GetIBCKeeper().PortKeeper.LookupModuleByPort(suite.chainA.GetContext(), ibctesting.MockFeePort)
 			suite.Require().NoError(err)
 
 			cbs, ok := suite.chainA.App.GetIBCKeeper().Router.GetRoute(module)
 			suite.Require().True(ok)
 
 			// escrow the packet fee
-			packetId := channeltypes.NewPacketId(suite.path.EndpointA.ChannelID, suite.path.EndpointA.ChannelConfig.PortID, suite.chainA.SenderAccount.GetSequence())
+			packetId := channeltypes.NewPacketId(packet.GetSourceChannel(), packet.GetSourcePort(), packet.GetSequence())
 			identifiedFee = types.NewIdentifiedPacketFee(
 				packetId,
 				types.Fee{
@@ -627,7 +623,7 @@ func (suite *FeeTestSuite) TestOnAcknowledgementPacket() {
 
 			// must be changed explicitly
 			ack = types.IncentivizedAcknowledgement{
-				Result:                channeltypes.NewResultAcknowledgement([]byte{1}).Acknowledgement(),
+				Result:                ibcmock.MockAcknowledgement.Acknowledgement(),
 				ForwardRelayerAddress: relayerAddr.String(),
 			}.Acknowledgement()