resolve conflict with a same name for MsgUpdateEpochParams from staking.

notional-labs · Feb 21, 2024 · 61dba08 · 61dba08
1 parent 3fa9991
commit 61dba08
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 80 deletions.
diff --git a/proto/composable/ibctransfermiddleware/v1beta1/tx.proto b/proto/composable/ibctransfermiddleware/v1beta1/tx.proto
@@ -13,13 +13,13 @@ option go_package = "x/ibctransfermiddleware/types";
 service Msg {
   option (cosmos.msg.v1.service) = true;
 
-  rpc UpdateEpochParams(MsgUpdateEpochParams) returns (MsgUpdateParamsEpochResponse);
+  rpc UpdateEpochParams(MsgUpdateCustomIbcParams) returns (MsgUpdateParamsCustomIbcResponse);
 }
 
 // MsgUpdateParams is the Msg/UpdateParams request type.
 //
 // Since: cosmos-sdk 0.47
-message MsgUpdateEpochParams {
+message MsgUpdateCustomIbcParams {
   option (cosmos.msg.v1.signer) = "authority";
   option (amino.name) = "composable/x/ibctransfermiddleware/MsgUpdateParams";
 
@@ -38,4 +38,4 @@ message MsgUpdateEpochParams {
 // MsgUpdateParams message.
 //
 // Since: cosmos-sdk 0.47
-message MsgUpdateParamsEpochResponse {}
+message MsgUpdateParamsCustomIbcResponse {}
diff --git a/x/ibctransfermiddleware/keeper/msg_server.go b/x/ibctransfermiddleware/keeper/msg_server.go
@@ -24,7 +24,7 @@ func NewMsgServerImpl(k Keeper) types.MsgServer {
 }
 
 // UpdateParams updates the params.
-func (ms msgServer) UpdateEpochParams(goCtx context.Context, req *types.MsgUpdateEpochParams) (*types.MsgUpdateParamsEpochResponse, error) {
+func (ms msgServer) UpdateEpochParams(goCtx context.Context, req *types.MsgUpdateCustomIbcParams) (*types.MsgUpdateParamsCustomIbcResponse, error) {
 	if ms.authority != req.Authority {
 		return nil, errorsmod.Wrapf(govtypes.ErrInvalidSigner, "invalid authority; expected %s, got %s", ms.authority, req.Authority)
 	}
@@ -34,5 +34,5 @@ func (ms msgServer) UpdateEpochParams(goCtx context.Context, req *types.MsgUpdat
 		return nil, err
 	}
 
-	return &types.MsgUpdateParamsEpochResponse{}, nil
+	return &types.MsgUpdateParamsCustomIbcResponse{}, nil
 }
diff --git a/x/ibctransfermiddleware/types/codec.go b/x/ibctransfermiddleware/types/codec.go
@@ -16,13 +16,13 @@ import (
 // RegisterLegacyAminoCodec registers the account interfaces and concrete types on the
 // provided LegacyAmino codec. These types are used for Amino JSON serialization
 func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
-	legacy.RegisterAminoMsg(cdc, &MsgUpdateEpochParams{}, "composable/MsgUpdateEpochParams")
+	legacy.RegisterAminoMsg(cdc, &MsgUpdateCustomIbcParams{}, "composable/MsgUpdateCustomIbcParams")
 }
 
 func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 	registry.RegisterImplementations(
 		(*sdk.Msg)(nil),
-		&MsgUpdateEpochParams{},
+		&MsgUpdateCustomIbcParams{},
 	)
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }

diff --git a/x/ibctransfermiddleware/types/msgs.go b/x/ibctransfermiddleware/types/msgs.go
@@ -5,21 +5,21 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-var _ sdk.Msg = &MsgUpdateEpochParams{}
+var _ sdk.Msg = &MsgUpdateCustomIbcParams{}
 
 // GetSignBytes implements the LegacyMsg interface.
-func (m MsgUpdateEpochParams) GetSignBytes() []byte {
+func (m MsgUpdateCustomIbcParams) GetSignBytes() []byte {
 	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
 }
 
 // GetSigners returns the expected signers for a MsgUpdateParams message.
-func (m *MsgUpdateEpochParams) GetSigners() []sdk.AccAddress {
+func (m *MsgUpdateCustomIbcParams) GetSigners() []sdk.AccAddress {
 	addr, _ := sdk.AccAddressFromBech32(m.Authority)
 	return []sdk.AccAddress{addr}
 }
 
 // ValidateBasic does a sanity check on the provided data.
-func (m *MsgUpdateEpochParams) ValidateBasic() error {
+func (m *MsgUpdateCustomIbcParams) ValidateBasic() error {
 	if _, err := sdk.AccAddressFromBech32(m.Authority); err != nil {
 		return errorsmod.Wrapf(err, "invalid authority address")
 	}