refactor: add types test and check for is fee enabled + fix test

cosmos · May 4, 2022 · 248c4d6 · 248c4d6
1 parent cee78ba
commit 248c4d6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/modules/apps/29-fee/keeper/msg_server.go b/modules/apps/29-fee/keeper/msg_server.go
@@ -17,12 +17,15 @@ var _ types.MsgServer = Keeper{}
 func (k Keeper) RegisterCounterpartyAddress(goCtx context.Context, msg *types.MsgRegisterCounterpartyAddress) (*types.MsgRegisterCounterpartyAddressResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	// only register counterparty address if the channel exists
-	_, found := k.channelKeeper.GetChannel(ctx, msg.PortId, msg.ChannelId)
-	if !found {
+	// only register counterparty address if the channel exists and is fee enabled
+	if _, found := k.channelKeeper.GetChannel(ctx, msg.PortId, msg.ChannelId); !found {
 		return nil, channeltypes.ErrChannelNotFound
 	}
 
+	if !k.IsFeeEnabled(ctx, msg.PortId, msg.ChannelId) {
+		return nil, types.ErrFeeNotEnabled
+	}
+
 	k.SetCounterpartyAddress(
 		ctx, msg.Address, msg.CounterpartyAddress, msg.ChannelId,
 	)

diff --git a/modules/apps/29-fee/keeper/msg_server_test.go b/modules/apps/29-fee/keeper/msg_server_test.go
@@ -13,6 +13,7 @@ func (suite *KeeperTestSuite) TestRegisterCounterpartyAddress() {
 		sender       string
 		counterparty string
 		channelID    string
+		ctx          sdk.Context
 	)
 
 	testCases := []struct {
@@ -35,11 +36,18 @@ func (suite *KeeperTestSuite) TestRegisterCounterpartyAddress() {
 			false,
 			func() { channelID = "channel-22" },
 		},
+		{
+			"channel is not fee enabled",
+			false,
+			func() {
+				suite.chainA.GetSimApp().IBCFeeKeeper.DeleteFeeEnabled(ctx, suite.path.EndpointA.ChannelConfig.PortID, channelID)
+			},
+		},
 	}
 
 	for _, tc := range testCases {
 		suite.SetupTest()
-		ctx := suite.chainA.GetContext()
+		ctx = suite.chainA.GetContext()
 		suite.coordinator.Setup(suite.path) // setup channel
 
 		sender = suite.chainA.SenderAccount.GetAddress().String()
@@ -49,8 +57,7 @@ func (suite *KeeperTestSuite) TestRegisterCounterpartyAddress() {
 		tc.malleate()
 
 		msg := types.NewMsgRegisterCounterpartyAddress(sender, counterparty, suite.path.EndpointA.ChannelConfig.PortID, channelID)
-
-		_, err := suite.chainA.SendMsgs(msg)
+		_, err := suite.chainA.GetSimApp().IBCFeeKeeper.RegisterCounterpartyAddress(sdk.WrapSDKContext(ctx), msg)
 
 		if tc.expPass {
 			suite.Require().NoError(err) // message committed

diff --git a/modules/apps/29-fee/types/msgs_test.go b/modules/apps/29-fee/types/msgs_test.go
@@ -55,6 +55,13 @@ func TestMsgRegisterCountepartyAddressValidation(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"invalid portID",
+			func() {
+				msg.PortId = ""
+			},
+			false,
+		},
 	}
 
 	for i, tc := range testCases {