From 274407ce4d722b4877f14c811074fe35a378f351 Mon Sep 17 00:00:00 2001 From: Gjermund Garaba Date: Fri, 14 Jun 2024 21:52:30 +0200 Subject: [PATCH] chore: use NewForwarding instead of direct init --- modules/apps/transfer/keeper/forwarding.go | 5 +- .../transfer/keeper/relay_forwarding_test.go | 77 +++++++------------ 2 files changed, 27 insertions(+), 55 deletions(-) diff --git a/modules/apps/transfer/keeper/forwarding.go b/modules/apps/transfer/keeper/forwarding.go index adc9449807c..7ae224473f2 100644 --- a/modules/apps/transfer/keeper/forwarding.go +++ b/modules/apps/transfer/keeper/forwarding.go @@ -104,10 +104,7 @@ func (k Keeper) forwardPacket(ctx sdk.Context, data types.FungibleTokenPacketDat memo = data.Forwarding.Memo nextForwardingPath = nil } else { - nextForwardingPath = &types.Forwarding{ - Hops: data.Forwarding.Hops[1:], - Memo: data.Forwarding.Memo, - } + nextForwardingPath = types.NewForwarding(data.Forwarding.Memo, data.Forwarding.Hops[1:]...) } // sending from the forward escrow address to the original receiver address. diff --git a/modules/apps/transfer/keeper/relay_forwarding_test.go b/modules/apps/transfer/keeper/relay_forwarding_test.go index 025c3707f79..ac4698003e1 100644 --- a/modules/apps/transfer/keeper/relay_forwarding_test.go +++ b/modules/apps/transfer/keeper/relay_forwarding_test.go @@ -28,15 +28,10 @@ func (suite *KeeperTestSuite) TestPathForwarding() { coin := sdk.NewCoin(sdk.DefaultBondDenom, amount) sender := suite.chainA.SenderAccounts[0].SenderAccount receiver := suite.chainA.SenderAccounts[1].SenderAccount - forwarding := types.Forwarding{ - Hops: []types.Hop{ - { - PortId: path2.EndpointA.ChannelConfig.PortID, - ChannelId: path2.EndpointA.ChannelID, - }, - }, - Memo: "", - } + forwarding := types.NewForwarding("", types.Hop{ + PortId: path2.EndpointA.ChannelConfig.PortID, + ChannelId: path2.EndpointA.ChannelID, + }) transferMsg := types.NewMsgTransfer( path1.EndpointA.ChannelConfig.PortID, @@ -46,7 +41,7 @@ func (suite *KeeperTestSuite) TestPathForwarding() { receiver.GetAddress().String(), suite.chainA.GetTimeoutHeight(), 0, "", - &forwarding, + forwarding, ) result, err := suite.chainA.SendMsgs(transferMsg) suite.Require().NoError(err) // message committed @@ -90,15 +85,10 @@ func (suite *KeeperTestSuite) TestEscrowsAreSetAfterForwarding() { coin := sdk.NewCoin(sdk.DefaultBondDenom, amount) sender := suite.chainA.SenderAccounts[0].SenderAccount receiver := suite.chainA.SenderAccounts[1].SenderAccount - forwarding := types.Forwarding{ - Hops: []types.Hop{ - { - PortId: path2.EndpointB.ChannelConfig.PortID, - ChannelId: path2.EndpointB.ChannelID, - }, - }, - Memo: "", - } + forwarding := types.NewForwarding("", types.Hop{ + PortId: path2.EndpointB.ChannelConfig.PortID, + ChannelId: path2.EndpointB.ChannelID, + }) transferMsg := types.NewMsgTransfer( path1.EndpointA.ChannelConfig.PortID, @@ -108,7 +98,7 @@ func (suite *KeeperTestSuite) TestEscrowsAreSetAfterForwarding() { receiver.GetAddress().String(), suite.chainA.GetTimeoutHeight(), 0, "", - &forwarding, + forwarding, ) result, err := suite.chainA.SendMsgs(transferMsg) @@ -173,15 +163,10 @@ func (suite *KeeperTestSuite) TestHappyPathForwarding() { coin = sdk.NewCoin(sdk.DefaultBondDenom, amount) sender := suite.chainA.SenderAccounts[0].SenderAccount receiver := suite.chainA.SenderAccounts[1].SenderAccount - forwarding := types.Forwarding{ - Hops: []types.Hop{ - { - PortId: path2.EndpointB.ChannelConfig.PortID, - ChannelId: path2.EndpointB.ChannelID, - }, - }, - Memo: "", - } + forwarding := types.NewForwarding("", types.Hop{ + PortId: path2.EndpointB.ChannelConfig.PortID, + ChannelId: path2.EndpointB.ChannelID, + }) transferMsg := types.NewMsgTransfer( path1.EndpointA.ChannelConfig.PortID, @@ -191,7 +176,7 @@ func (suite *KeeperTestSuite) TestHappyPathForwarding() { receiver.GetAddress().String(), suite.chainA.GetTimeoutHeight(), 0, "", - &forwarding, + forwarding, ) result, err := suite.chainA.SendMsgs(transferMsg) @@ -209,7 +194,7 @@ func (suite *KeeperTestSuite) TestHappyPathForwarding() { Denom: denom, Amount: amount.String(), }, - }, sender.GetAddress().String(), receiver.GetAddress().String(), "", &forwarding) + }, sender.GetAddress().String(), receiver.GetAddress().String(), "", forwarding) packetRecv := channeltypes.NewPacket(data.GetBytes(), 2, path1.EndpointA.ChannelConfig.PortID, path1.EndpointA.ChannelID, path1.EndpointB.ChannelConfig.PortID, path1.EndpointB.ChannelID, clienttypes.NewHeight(1, 100), 0) err = suite.chainB.GetSimApp().TransferKeeper.OnRecvPacket(suite.chainB.GetContext(), packetRecv, data) @@ -278,15 +263,10 @@ func (suite *KeeperTestSuite) TestSimplifiedHappyPathForwarding() { coin := sdk.NewCoin(sdk.DefaultBondDenom, amount) sender := suite.chainA.SenderAccounts[0].SenderAccount receiver := suite.chainA.SenderAccounts[1].SenderAccount - forwarding := types.Forwarding{ - Hops: []types.Hop{ - { - PortId: path2.EndpointB.ChannelConfig.PortID, - ChannelId: path2.EndpointB.ChannelID, - }, - }, - Memo: "", - } + forwarding := types.NewForwarding("", types.Hop{ + PortId: path2.EndpointB.ChannelConfig.PortID, + ChannelId: path2.EndpointB.ChannelID, + }) transferMsg := types.NewMsgTransfer( path1.EndpointA.ChannelConfig.PortID, @@ -296,7 +276,7 @@ func (suite *KeeperTestSuite) TestSimplifiedHappyPathForwarding() { receiver.GetAddress().String(), suite.chainA.GetTimeoutHeight(), 0, "", - &forwarding, + forwarding, ) result, err := suite.chainA.SendMsgs(transferMsg) @@ -472,15 +452,10 @@ func (suite *KeeperTestSuite) TestAcknowledgementFailureScenario5Forwarding() { sender = suite.chainC.SenderAccounts[0].SenderAccount receiver = suite.chainA.SenderAccounts[0].SenderAccount // Receiver is the A chain account - forwarding := types.Forwarding{ - Hops: []types.Hop{ - { - PortId: path1.EndpointB.ChannelConfig.PortID, - ChannelId: path1.EndpointB.ChannelID, - }, - }, - Memo: "", - } + forwarding := types.NewForwarding("", types.Hop{ + PortId: path1.EndpointB.ChannelConfig.PortID, + ChannelId: path1.EndpointB.ChannelID, + }) transferMsg = types.NewMsgTransfer( path2.EndpointB.ChannelConfig.PortID, @@ -490,7 +465,7 @@ func (suite *KeeperTestSuite) TestAcknowledgementFailureScenario5Forwarding() { receiver.GetAddress().String(), suite.chainA.GetTimeoutHeight(), 0, "", - &forwarding, + forwarding, ) result, err = suite.chainC.SendMsgs(transferMsg)