diff --git a/modules/apps/29-fee/keeper/events_test.go b/modules/apps/29-fee/keeper/events_test.go index ff34462af72..5bb1357a61b 100644 --- a/modules/apps/29-fee/keeper/events_test.go +++ b/modules/apps/29-fee/keeper/events_test.go @@ -143,23 +143,26 @@ func (suite *KeeperTestSuite) TestDistributeFeeEvent() { suite.Require().NoError(err) suite.Require().NotNil(res) - // calculate the total paid out fees using "distribute_fee" events - var totalPaid sdk.Coins - for _, event := range res.Events { - if event.Type == types.EventTypeDistributeFee { - for _, attr := range event.Attributes { - switch string(attr.Key) { - case types.AttributeKeyFee: - coins, err := sdk.ParseCoinsNormalized(string(attr.Value)) - suite.Require().NoError(err) - - totalPaid = totalPaid.Add(coins...) - } - } - - } + events := res.GetEvents() + expectedEvents := sdk.Events{ + sdk.NewEvent( + types.EventTypeDistributeFee, + sdk.NewAttribute(types.AttributeKeyReceiver, suite.chainA.SenderAccount.GetAddress().String()), + sdk.NewAttribute(types.AttributeKeyFee, defaultRecvFee.String()), + ), + sdk.NewEvent( + types.EventTypeDistributeFee, + sdk.NewAttribute(types.AttributeKeyReceiver, suite.chainA.SenderAccount.GetAddress().String()), + sdk.NewAttribute(types.AttributeKeyFee, defaultAckFee.String()), + ), + sdk.NewEvent( + types.EventTypeDistributeFee, + sdk.NewAttribute(types.AttributeKeyReceiver, suite.chainA.SenderAccount.GetAddress().String()), + sdk.NewAttribute(types.AttributeKeyFee, defaultTimeoutFee.String()), + ), } - // assert the total fees paid out equal the total incentivization fees escrowed - suite.Require().Equal(fee.Total(), totalPaid) + for _, evt := range expectedEvents { + suite.Require().Contains(events, evt) + } } diff --git a/modules/apps/transfer/keeper/msg_server_test.go b/modules/apps/transfer/keeper/msg_server_test.go index e457d3894cb..e11b2b1dfce 100644 --- a/modules/apps/transfer/keeper/msg_server_test.go +++ b/modules/apps/transfer/keeper/msg_server_test.go @@ -9,9 +9,7 @@ import ( ) func (suite *KeeperTestSuite) TestMsgTransfer() { - var ( - msg *types.MsgTransfer - ) + var msg *types.MsgTransfer testCases := []struct { name string