Merge commit 'a418ee2' into faddat/integrated-branch

modules/apps/29-fee/keeper/msg_server.go

@@ -118,8 +118,8 @@ func (k Keeper) PayPacketFee(goCtx context.Context, msg *types.MsgPayPacketFee)
 	return &types.MsgPayPacketFeeResponse{}, nil
 }
 
-// PayPacketFee defines a rpc handler method for MsgPayPacketFee
-// PayPacketFee is an open callback that may be called by any module/user that wishes to escrow funds in order to
+// PayPacketFeeAsync defines a rpc handler method for MsgPayPacketFeeAsync
+// PayPacketFeeAsync is an open callback that may be called by any module/user that wishes to escrow funds in order to
 // incentivize the relaying of a known packet. Only packets which have been sent and have not gone through the
 // packet life cycle may be incentivized.
 func (k Keeper) PayPacketFeeAsync(goCtx context.Context, msg *types.MsgPayPacketFeeAsync) (*types.MsgPayPacketFeeAsyncResponse, error) {

modules/apps/29-fee/types/msgs.go

@@ -6,26 +6,17 @@ import (
 	errorsmod "cosmossdk.io/errors"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	legacytx "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 	host "github.com/cosmos/ibc-go/v8/modules/core/24-host"
 	ibcerrors "github.com/cosmos/ibc-go/v8/modules/core/errors"
 )
 
-// msg types
-const (
-	TypeMsgPayPacketFee      = "payPacketFee"
-	TypeMsgPayPacketFeeAsync = "payPacketFeeAsync"
-)
-
 var (
-	_ sdk.Msg            = (*MsgRegisterPayee)(nil)
-	_ sdk.Msg            = (*MsgRegisterCounterpartyPayee)(nil)
-	_ sdk.Msg            = (*MsgPayPacketFee)(nil)
-	_ sdk.Msg            = (*MsgPayPacketFeeAsync)(nil)
-	_ legacytx.LegacyMsg = (*MsgPayPacketFee)(nil)
-	_ legacytx.LegacyMsg = (*MsgPayPacketFeeAsync)(nil)
+	_ sdk.Msg = (*MsgRegisterPayee)(nil)
+	_ sdk.Msg = (*MsgRegisterCounterpartyPayee)(nil)
+	_ sdk.Msg = (*MsgPayPacketFee)(nil)
+	_ sdk.Msg = (*MsgPayPacketFeeAsync)(nil)
 )
 
 // NewMsgRegisterPayee creates a new instance of MsgRegisterPayee
@@ -162,21 +153,6 @@ func (msg MsgPayPacketFee) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{signer}
 }
 
-// Type implements legacytx.LegacyMsg
-func (MsgPayPacketFee) Type() string {
-	return TypeMsgPayPacketFee
-}
-
-// Route implements legacytx.LegacyMsg
-func (MsgPayPacketFee) Route() string {
-	return RouterKey
-}
-
-// GetSignBytes implements legacytx.LegacyMsg
-func (msg MsgPayPacketFee) GetSignBytes() []byte {
-	return sdk.MustSortJSON(amino.MustMarshalJSON(&msg))
-}
-
 // NewMsgPayPacketAsync creates a new instance of MsgPayPacketFee
 func NewMsgPayPacketFeeAsync(packetID channeltypes.PacketId, packetFee PacketFee) *MsgPayPacketFeeAsync {
 	return &MsgPayPacketFeeAsync{
@@ -203,18 +179,3 @@ func (msg MsgPayPacketFeeAsync) GetSigners() []sdk.AccAddress {
 	}
 	return []sdk.AccAddress{signer}
 }
-
-// Type implements legacytx.LegacyMsg
-func (MsgPayPacketFeeAsync) Type() string {
-	return TypeMsgPayPacketFeeAsync
-}
-
-// Route implements legacytx.LegacyMsg
-func (MsgPayPacketFeeAsync) Route() string {
-	return RouterKey
-}
-
-// GetSignBytes implements legacytx.LegacyMsg
-func (msg MsgPayPacketFeeAsync) GetSignBytes() []byte {
-	return sdk.MustSortJSON(amino.MustMarshalJSON(&msg))
-}

modules/apps/29-fee/types/msgs_test.go

@@ -234,20 +234,6 @@ func TestPayPacketFeeGetSigners(t *testing.T) {
 	require.Equal(t, []sdk.AccAddress{refundAddr}, msg.GetSigners())
 }
 
-func TestMsgPayPacketFeeRoute(t *testing.T) {
-	var msg types.MsgPayPacketFee
-	require.Equal(t, types.RouterKey, msg.Route())
-}
-
-func TestMsgPayPacketFeeGetSignBytes(t *testing.T) {
-	fee := types.NewFee(defaultRecvFee, defaultAckFee, defaultTimeoutFee)
-	msg := types.NewMsgPayPacketFee(fee, ibctesting.MockFeePort, ibctesting.FirstChannelID, defaultAccAddress, nil)
-
-	require.NotPanics(t, func() {
-		_ = msg.GetSignBytes()
-	})
-}
-
 func TestMsgPayPacketFeeAsyncValidation(t *testing.T) {
 	var msg *types.MsgPayPacketFeeAsync
 
@@ -382,20 +368,3 @@ func TestPayPacketFeeAsyncGetSigners(t *testing.T) {
 
 	require.Equal(t, []sdk.AccAddress{refundAddr}, msg.GetSigners())
 }
-
-func TestMsgPayPacketFeeAsyncRoute(t *testing.T) {
-	var msg types.MsgPayPacketFeeAsync
-	require.Equal(t, types.RouterKey, msg.Route())
-}
-
-func TestMsgPayPacketFeeAsyncGetSignBytes(t *testing.T) {
-	packetID := channeltypes.NewPacketID(ibctesting.MockFeePort, ibctesting.FirstChannelID, 1)
-	fee := types.NewFee(defaultRecvFee, defaultAckFee, defaultTimeoutFee)
-	packetFee := types.NewPacketFee(fee, defaultAccAddress, nil)
-
-	msg := types.NewMsgPayPacketFeeAsync(packetID, packetFee)
-
-	require.NotPanics(t, func() {
-		_ = msg.GetSignBytes()
-	})
-}