refactor: add support for multiple events of same type in AssertEvents (#2995)

* refactor: add support for asserting multiple events of the same type

* change condition checking to make test pass

* review comment

* rename variable

Author: crodriguezvega

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)
+	}
 }

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