refactor: use mock module for ics29 escrow_test.go (#932)

cosmos · Feb 17, 2022 · 06f2730 · 06f2730
1 parent 9b2d96d
commit 06f2730
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/modules/apps/29-fee/keeper/escrow_test.go b/modules/apps/29-fee/keeper/escrow_test.go
@@ -5,8 +5,8 @@ import (
  "github.com/tendermint/tendermint/crypto/secp256k1"
 
  "github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types"
- transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
  channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
+ ibctesting "github.com/cosmos/ibc-go/v3/testing"
 )
 
 func (suite *KeeperTestSuite) TestEscrowPacketFee() {
@@ -84,7 +84,7 @@ func (suite *KeeperTestSuite) TestEscrowPacketFee() {
  receiveFee = defaultReceiveFee
  ackFee = defaultAckFee
  timeoutFee = defaultTimeoutFee
- packetId = channeltypes.NewPacketId(suite.path.EndpointA.ChannelID, transfertypes.PortID, uint64(1))
+ packetId = channeltypes.NewPacketId(suite.path.EndpointA.ChannelID, suite.path.EndpointA.ChannelConfig.PortID, uint64(1))
 
  tc.malleate()
  fee := types.Fee{
@@ -158,7 +158,7 @@ func (suite *KeeperTestSuite) TestDistributeFee() {
  reverseRelayer = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
  forwardRelayer = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address()).String()
 
- packetId := channeltypes.NewPacketId(suite.path.EndpointA.ChannelID, transfertypes.PortID, validSeq)
+ packetId := channeltypes.NewPacketId(suite.path.EndpointA.ChannelID, suite.path.EndpointA.ChannelConfig.PortID, validSeq)
  fee := types.Fee{
  RecvFee: defaultReceiveFee,
  AckFee: defaultAckFee,
@@ -223,7 +223,7 @@ func (suite *KeeperTestSuite) TestDistributeTimeoutFee() {
 
  packetId := channeltypes.NewPacketId(
  suite.path.EndpointA.ChannelID,
- transfertypes.PortID,
+ suite.path.EndpointA.ChannelConfig.PortID,
  1,
  )
 
@@ -268,56 +268,58 @@ func (suite *KeeperTestSuite) TestDistributeTimeoutFee() {
 }
 
 func (suite *KeeperTestSuite) TestRefundFeesOnChannel() {
+ suite.coordinator.Setup(suite.path)
+
  // setup
  refundAcc := suite.chainA.SenderAccount.GetAddress()
 
  // refundAcc balance before escrow
  prevBal := suite.chainA.GetSimApp().BankKeeper.GetAllBalances(suite.chainA.GetContext(), refundAcc)
 
  for i := 0; i < 5; i++ {
- packetId := channeltypes.NewPacketId("channel-0", transfertypes.PortID, uint64(i))
+ packetId := channeltypes.NewPacketId(suite.path.EndpointA.ChannelID, suite.path.EndpointA.ChannelConfig.PortID, uint64(i))
  fee := types.Fee{
  RecvFee: defaultReceiveFee,
  AckFee: defaultAckFee,
  TimeoutFee: defaultTimeoutFee,
  }
 
  identifiedPacketFee := types.NewIdentifiedPacketFee(packetId, fee, refundAcc.String(), []string{})
- suite.chainA.GetSimApp().IBCFeeKeeper.SetFeeEnabled(suite.chainA.GetContext(), transfertypes.PortID, "channel-0")
+ suite.chainA.GetSimApp().IBCFeeKeeper.SetFeeEnabled(suite.chainA.GetContext(), suite.path.EndpointA.ChannelConfig.PortID, suite.path.EndpointA.ChannelID)
  err := suite.chainA.GetSimApp().IBCFeeKeeper.EscrowPacketFee(suite.chainA.GetContext(), identifiedPacketFee)
  suite.Require().NoError(err)
  }
 
  // send a packet over a different channel to ensure this fee is not refunded
- packetId := channeltypes.NewPacketId("channel-1", transfertypes.PortID, 1)
+ packetId := channeltypes.NewPacketId("channel-1", ibctesting.MockFeePort, 1)
  fee := types.Fee{
  RecvFee: defaultReceiveFee,
  AckFee: defaultAckFee,
  TimeoutFee: defaultTimeoutFee,
  }
 
  identifiedPacketFee := types.NewIdentifiedPacketFee(packetId, fee, refundAcc.String(), []string{})
- suite.chainA.GetSimApp().IBCFeeKeeper.SetFeeEnabled(suite.chainA.GetContext(), transfertypes.PortID, "channel-1")
+ suite.chainA.GetSimApp().IBCFeeKeeper.SetFeeEnabled(suite.chainA.GetContext(), ibctesting.MockFeePort, "channel-1")
  err := suite.chainA.GetSimApp().IBCFeeKeeper.EscrowPacketFee(suite.chainA.GetContext(), identifiedPacketFee)
  suite.Require().NoError(err)
 
  // check that refunding all fees on channel-0 refunds all fees except for fee on channel-1
- err = suite.chainA.GetSimApp().IBCFeeKeeper.RefundFeesOnChannel(suite.chainA.GetContext(), transfertypes.PortID, "channel-0")
+ err = suite.chainA.GetSimApp().IBCFeeKeeper.RefundFeesOnChannel(suite.chainA.GetContext(), suite.path.EndpointA.ChannelConfig.PortID, suite.path.EndpointA.ChannelID)
  suite.Require().NoError(err, "refund fees returned unexpected error")
 
  // add fee sent to channel-1 to after balance to recover original balance
  afterBal := suite.chainA.GetSimApp().BankKeeper.GetAllBalances(suite.chainA.GetContext(), refundAcc)
  suite.Require().Equal(prevBal, afterBal.Add(fee.RecvFee...).Add(fee.AckFee...).Add(fee.TimeoutFee...), "refund account not back to original balance after refunding all tokens")
 
  // create escrow and then change module account balance to cause error on refund
- packetId = channeltypes.NewPacketId("channel-0", transfertypes.PortID, uint64(6))
+ packetId = channeltypes.NewPacketId(suite.path.EndpointA.ChannelID, suite.path.EndpointA.ChannelConfig.PortID, uint64(6))
 
  identifiedPacketFee = types.NewIdentifiedPacketFee(packetId, fee, refundAcc.String(), []string{})
  err = suite.chainA.GetSimApp().IBCFeeKeeper.EscrowPacketFee(suite.chainA.GetContext(), identifiedPacketFee)
  suite.Require().NoError(err)
 
  suite.chainA.GetSimApp().BankKeeper.SendCoinsFromModuleToAccount(suite.chainA.GetContext(), types.ModuleName, refundAcc, fee.TimeoutFee)
 
- err = suite.chainA.GetSimApp().IBCFeeKeeper.RefundFeesOnChannel(suite.chainA.GetContext(), transfertypes.PortID, "channel-0")
+ err = suite.chainA.GetSimApp().IBCFeeKeeper.RefundFeesOnChannel(suite.chainA.GetContext(), suite.path.EndpointA.ChannelConfig.PortID, suite.path.EndpointA.ChannelID)
  suite.Require().Error(err, "refund fees returned no error with insufficient balance on module account")
 }