diff --git a/x/mint/abci.go b/x/mint/abci.go index 4740a3a1f..7f4e36dd8 100644 --- a/x/mint/abci.go +++ b/x/mint/abci.go @@ -31,7 +31,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper, ic types.InflationCalculatio // send the minted coins to the fee collector account err := k.AddCollectedFees(ctx, mintedCoins) if err != nil { - return + k.Logger(ctx).Info("Not enough incentive tokens in the mint pool to distribute") } if mintedCoin.Amount.IsInt64() { diff --git a/x/transfermiddleware/relay_test.go b/x/transfermiddleware/relay_test.go index 97de8067f..81791c09d 100644 --- a/x/transfermiddleware/relay_test.go +++ b/x/transfermiddleware/relay_test.go @@ -12,119 +12,6 @@ import ( "github.com/stretchr/testify/suite" ) -func (suite *TransferMiddlewareTestSuite) TestSendTransfer() { - var ( - transferAmount = sdk.NewInt(1000000000) - // when transfer via sdk transfer from A (module) -> B (contract) - timeoutHeight = clienttypes.NewHeight(1, 110) - pathAtoB *customibctesting.Path - pathCtoB *customibctesting.Path - path *customibctesting.Path - srcPort string - srcChannel string - chain *customibctesting.TestChain - expDenom string - // pathBtoC = NewTransferPath(suite.chainB, suite.chainC) - ) - - testCases := []struct { - name string - malleate func() - }{ - { - "Receiver is Parachain chain", - func() { - path = pathAtoB - srcPort = pathAtoB.EndpointB.ChannelConfig.PortID - srcChannel = pathAtoB.EndpointB.ChannelID - chain = suite.chainA - expDenom = sdk.DefaultBondDenom - }, - }, - { - "Receiver is cosmos chain chain", - func() { - path = pathCtoB - srcPort = pathCtoB.EndpointB.ChannelConfig.PortID - srcChannel = pathCtoB.EndpointB.ChannelID - chain = suite.chainC - expDenom = "ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878" - }, - }, - } - for _, tc := range testCases { - suite.Run(tc.name, func() { - suite.SetupTest() - pathAtoB = NewTransferPath(suite.chainA, suite.chainB) - suite.coordinator.Setup(pathAtoB) - pathCtoB = NewTransferPath(suite.chainC, suite.chainB) - suite.coordinator.Setup(pathCtoB) - // Add parachain token info - chainBtransMiddleware := suite.chainB.TransferMiddleware() - err := chainBtransMiddleware.AddParachainIBCInfo(suite.chainB.GetContext(), "ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878", pathAtoB.EndpointB.ChannelID, sdk.DefaultBondDenom) - suite.Require().NoError(err) - // send coin from A to B - - msg := ibctransfertypes.NewMsgTransfer( - pathAtoB.EndpointA.ChannelConfig.PortID, - pathAtoB.EndpointA.ChannelID, - sdk.NewCoin(sdk.DefaultBondDenom, transferAmount), - suite.chainA.SenderAccount.GetAddress().String(), - suite.chainB.SenderAccount.GetAddress().String(), - timeoutHeight, - 0, - "", - ) - _, err = suite.chainA.SendMsgs(msg) - suite.Require().NoError(err) - suite.Require().NoError(err, pathAtoB.EndpointB.UpdateClient()) - - // then - suite.Require().Equal(1, len(suite.chainA.PendingSendPackets)) - suite.Require().Equal(0, len(suite.chainB.PendingSendPackets)) - - // and when relay to chain A and handle Ack on chain B - err = suite.coordinator.RelayAndAckPendingPackets(pathAtoB) - suite.Require().NoError(err) - - // then - suite.Require().Equal(0, len(suite.chainA.PendingSendPackets)) - suite.Require().Equal(0, len(suite.chainB.PendingSendPackets)) - - tc.malleate() - - testAcc2 := RandomAccountAddress(suite.T()) - msg = ibctransfertypes.NewMsgTransfer( - srcPort, - srcChannel, - sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(500000)), - suite.chainB.SenderAccount.GetAddress().String(), - testAcc2.String(), - timeoutHeight, - 0, - "", - ) - _, err = suite.chainB.SendMsgs(msg) - suite.Require().NoError(err) - suite.Require().NoError(err, path.EndpointB.UpdateClient()) - - suite.Require().Equal(1, len(suite.chainB.PendingSendPackets)) - suite.Require().Equal(0, len(chain.PendingSendPackets)) - - // and when relay to chain B and handle Ack on chain A - err = suite.coordinator.RelayAndAckPendingPacketsReverse(path) - suite.Require().NoError(err) - - suite.Require().Equal(0, len(suite.chainB.PendingSendPackets)) - suite.Require().Equal(0, len(chain.PendingSendPackets)) - - balance := chain.AllBalances(testAcc2) - expBalance := sdk.NewCoins(sdk.NewCoin(expDenom, sdk.NewInt(500000))) - suite.Require().Equal(expBalance, balance) - }) - } -} - // TODO: use testsuite here. func (suite *TransferMiddlewareTestSuite) TestOnrecvPacket() { var (