From 61dba0826f1c89562767c9e15c15b85f10a4d513 Mon Sep 17 00:00:00 2001 From: rustdev Date: Wed, 21 Feb 2024 16:20:24 +0000 Subject: [PATCH] resolve conflict with a same name for MsgUpdateEpochParams from staking. --- .../ibctransfermiddleware/v1beta1/tx.proto | 6 +- x/ibctransfermiddleware/keeper/msg_server.go | 4 +- x/ibctransfermiddleware/types/codec.go | 4 +- x/ibctransfermiddleware/types/msgs.go | 8 +- x/ibctransfermiddleware/types/tx.pb.go | 139 +++++++++--------- 5 files changed, 81 insertions(+), 80 deletions(-) diff --git a/proto/composable/ibctransfermiddleware/v1beta1/tx.proto b/proto/composable/ibctransfermiddleware/v1beta1/tx.proto index 781979b09..c695e2daf 100644 --- 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 index e9d5a6e77..806ecde36 100644 --- 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 index c8986807f..e22a34195 100644 --- 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 index 4418aa784..c4ceec79a 100644 --- 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") } diff --git a/x/ibctransfermiddleware/types/tx.pb.go b/x/ibctransfermiddleware/types/tx.pb.go index ae3aab62a..7235fb024 100644 --- a/x/ibctransfermiddleware/types/tx.pb.go +++ b/x/ibctransfermiddleware/types/tx.pb.go @@ -34,7 +34,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgUpdateParams is the Msg/UpdateParams request type. // // Since: cosmos-sdk 0.47 -type MsgUpdateEpochParams struct { +type MsgUpdateCustomIbcParams struct { // authority is the address that controls the module (defaults to x/gov unless // overwritten). Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` @@ -44,18 +44,18 @@ type MsgUpdateEpochParams struct { Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` } -func (m *MsgUpdateEpochParams) Reset() { *m = MsgUpdateEpochParams{} } -func (m *MsgUpdateEpochParams) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateEpochParams) ProtoMessage() {} -func (*MsgUpdateEpochParams) Descriptor() ([]byte, []int) { +func (m *MsgUpdateCustomIbcParams) Reset() { *m = MsgUpdateCustomIbcParams{} } +func (m *MsgUpdateCustomIbcParams) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateCustomIbcParams) ProtoMessage() {} +func (*MsgUpdateCustomIbcParams) Descriptor() ([]byte, []int) { return fileDescriptor_bf5c053de6965bca, []int{0} } -func (m *MsgUpdateEpochParams) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateCustomIbcParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateEpochParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateCustomIbcParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateEpochParams.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateCustomIbcParams.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -65,26 +65,26 @@ func (m *MsgUpdateEpochParams) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *MsgUpdateEpochParams) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateEpochParams.Merge(m, src) +func (m *MsgUpdateCustomIbcParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateCustomIbcParams.Merge(m, src) } -func (m *MsgUpdateEpochParams) XXX_Size() int { +func (m *MsgUpdateCustomIbcParams) XXX_Size() int { return m.Size() } -func (m *MsgUpdateEpochParams) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateEpochParams.DiscardUnknown(m) +func (m *MsgUpdateCustomIbcParams) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateCustomIbcParams.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateEpochParams proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateCustomIbcParams proto.InternalMessageInfo -func (m *MsgUpdateEpochParams) GetAuthority() string { +func (m *MsgUpdateCustomIbcParams) GetAuthority() string { if m != nil { return m.Authority } return "" } -func (m *MsgUpdateEpochParams) GetParams() Params { +func (m *MsgUpdateCustomIbcParams) GetParams() Params { if m != nil { return m.Params } @@ -95,21 +95,21 @@ func (m *MsgUpdateEpochParams) GetParams() Params { // MsgUpdateParams message. // // Since: cosmos-sdk 0.47 -type MsgUpdateParamsEpochResponse struct { +type MsgUpdateParamsCustomIbcResponse struct { } -func (m *MsgUpdateParamsEpochResponse) Reset() { *m = MsgUpdateParamsEpochResponse{} } -func (m *MsgUpdateParamsEpochResponse) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateParamsEpochResponse) ProtoMessage() {} -func (*MsgUpdateParamsEpochResponse) Descriptor() ([]byte, []int) { +func (m *MsgUpdateParamsCustomIbcResponse) Reset() { *m = MsgUpdateParamsCustomIbcResponse{} } +func (m *MsgUpdateParamsCustomIbcResponse) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateParamsCustomIbcResponse) ProtoMessage() {} +func (*MsgUpdateParamsCustomIbcResponse) Descriptor() ([]byte, []int) { return fileDescriptor_bf5c053de6965bca, []int{1} } -func (m *MsgUpdateParamsEpochResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateParamsCustomIbcResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateParamsEpochResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateParamsCustomIbcResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateParamsEpochResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateParamsCustomIbcResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -119,21 +119,21 @@ func (m *MsgUpdateParamsEpochResponse) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *MsgUpdateParamsEpochResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateParamsEpochResponse.Merge(m, src) +func (m *MsgUpdateParamsCustomIbcResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateParamsCustomIbcResponse.Merge(m, src) } -func (m *MsgUpdateParamsEpochResponse) XXX_Size() int { +func (m *MsgUpdateParamsCustomIbcResponse) XXX_Size() int { return m.Size() } -func (m *MsgUpdateParamsEpochResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateParamsEpochResponse.DiscardUnknown(m) +func (m *MsgUpdateParamsCustomIbcResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateParamsCustomIbcResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateParamsEpochResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateParamsCustomIbcResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgUpdateEpochParams)(nil), "composable.ibctransfermiddleware.v1beta1.MsgUpdateEpochParams") - proto.RegisterType((*MsgUpdateParamsEpochResponse)(nil), "composable.ibctransfermiddleware.v1beta1.MsgUpdateParamsEpochResponse") + proto.RegisterType((*MsgUpdateCustomIbcParams)(nil), "composable.ibctransfermiddleware.v1beta1.MsgUpdateCustomIbcParams") + proto.RegisterType((*MsgUpdateParamsCustomIbcResponse)(nil), "composable.ibctransfermiddleware.v1beta1.MsgUpdateParamsCustomIbcResponse") } func init() { @@ -141,7 +141,7 @@ func init() { } var fileDescriptor_bf5c053de6965bca = []byte{ - // 367 bytes of a gzipped FileDescriptorProto + // 378 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4c, 0xce, 0xcf, 0x2d, 0xc8, 0x2f, 0x4e, 0x4c, 0xca, 0x49, 0xd5, 0xcf, 0x4c, 0x4a, 0x2e, 0x29, 0x4a, 0xcc, 0x2b, 0x4e, 0x4b, 0x2d, 0xca, 0xcd, 0x4c, 0x49, 0xc9, 0x49, 0x2d, 0x4f, 0x2c, 0x4a, 0xd5, 0x2f, 0x33, 0x4c, @@ -150,21 +150,22 @@ var fileDescriptor_bf5c053de6965bca = []byte{ 0x3f, 0xb7, 0x38, 0x5d, 0xbf, 0xcc, 0x10, 0x44, 0x41, 0x8c, 0x90, 0x12, 0x4c, 0xcc, 0xcd, 0xcc, 0xcb, 0xd7, 0x07, 0x93, 0x50, 0x21, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0x30, 0x53, 0x1f, 0xc4, 0x82, 0x8a, 0x4a, 0x42, 0x4c, 0x88, 0x87, 0x48, 0x40, 0x38, 0x50, 0x29, 0x17, 0xa2, 0x5d, 0x8e, 0xdd, - 0x91, 0x60, 0x53, 0x94, 0x5e, 0x31, 0x72, 0x89, 0xf8, 0x16, 0xa7, 0x87, 0x16, 0xa4, 0x24, 0x96, - 0xa4, 0xba, 0x16, 0xe4, 0x27, 0x67, 0x04, 0x24, 0x16, 0x25, 0xe6, 0x16, 0x0b, 0x99, 0x71, 0x71, - 0x26, 0x96, 0x96, 0x64, 0xe4, 0x17, 0x65, 0x96, 0x54, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x3a, - 0x49, 0x5c, 0xda, 0xa2, 0x2b, 0x02, 0x75, 0x83, 0x63, 0x4a, 0x4a, 0x51, 0x6a, 0x71, 0x71, 0x70, - 0x49, 0x51, 0x66, 0x5e, 0x7a, 0x10, 0x42, 0xa9, 0x50, 0x30, 0x17, 0x5b, 0x01, 0xd8, 0x04, 0x09, - 0x26, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x03, 0x3d, 0x62, 0x83, 0x4b, 0x0f, 0x62, 0xb3, 0x13, 0xe7, - 0x89, 0x7b, 0xf2, 0x0c, 0x2b, 0x9e, 0x6f, 0xd0, 0x62, 0x0c, 0x82, 0x1a, 0x65, 0xe5, 0xda, 0xf4, - 0x7c, 0x83, 0x16, 0xc2, 0x92, 0xae, 0xe7, 0x1b, 0xb4, 0x8c, 0x90, 0xbc, 0x5f, 0x81, 0x23, 0x00, - 0xe0, 0x1e, 0x83, 0x98, 0xac, 0x24, 0xc7, 0x25, 0x83, 0x26, 0x04, 0xf6, 0x71, 0x50, 0x6a, 0x71, - 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0xd1, 0x2a, 0x46, 0x2e, 0x66, 0xdf, 0xe2, 0x74, 0xa1, 0xd9, 0x8c, - 0x5c, 0x82, 0x98, 0x21, 0x62, 0x47, 0xbc, 0x4f, 0xb0, 0x85, 0xa8, 0x94, 0x1b, 0x19, 0xfa, 0xb1, - 0xb8, 0x52, 0x8a, 0xb5, 0x01, 0x14, 0x36, 0x4e, 0xe6, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, - 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, - 0x2c, 0xc7, 0x10, 0x25, 0x8b, 0x2b, 0x3c, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x31, - 0x6f, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x35, 0x13, 0xa7, 0xfb, 0x02, 0x00, 0x00, + 0x91, 0x60, 0x53, 0x94, 0xde, 0x31, 0x72, 0x49, 0xf8, 0x16, 0xa7, 0x87, 0x16, 0xa4, 0x24, 0x96, + 0xa4, 0x3a, 0x97, 0x16, 0x97, 0xe4, 0xe7, 0x7a, 0x26, 0x25, 0x07, 0x24, 0x16, 0x25, 0xe6, 0x16, + 0x0b, 0x99, 0x71, 0x71, 0x26, 0x96, 0x96, 0x64, 0xe4, 0x17, 0x65, 0x96, 0x54, 0x4a, 0x30, 0x2a, + 0x30, 0x6a, 0x70, 0x3a, 0x49, 0x5c, 0xda, 0xa2, 0x2b, 0x02, 0x75, 0x87, 0x63, 0x4a, 0x4a, 0x51, + 0x6a, 0x71, 0x71, 0x70, 0x49, 0x51, 0x66, 0x5e, 0x7a, 0x10, 0x42, 0xa9, 0x50, 0x30, 0x17, 0x5b, + 0x01, 0xd8, 0x04, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x03, 0x3d, 0x62, 0x83, 0x4c, 0x0f, + 0x62, 0xb3, 0x13, 0xe7, 0x89, 0x7b, 0xf2, 0x0c, 0x2b, 0x9e, 0x6f, 0xd0, 0x62, 0x0c, 0x82, 0x1a, + 0x65, 0xe5, 0xda, 0xf4, 0x7c, 0x83, 0x16, 0xc2, 0x92, 0xae, 0xe7, 0x1b, 0xb4, 0x8c, 0x90, 0x82, + 0xa0, 0x02, 0x47, 0x20, 0xc0, 0x3d, 0x07, 0x31, 0x59, 0x49, 0x89, 0x4b, 0x01, 0x4d, 0x08, 0xee, + 0xeb, 0xa0, 0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0xa3, 0x4d, 0x8c, 0x5c, 0xcc, 0xbe, 0xc5, + 0xe9, 0x42, 0x8b, 0x19, 0xb9, 0x04, 0x21, 0x2a, 0x5d, 0x0b, 0xf2, 0x93, 0x33, 0xa0, 0xa1, 0xe2, + 0x44, 0xbc, 0x6f, 0x70, 0x85, 0xac, 0x94, 0x17, 0x19, 0x66, 0xe0, 0x70, 0xad, 0x14, 0x6b, 0x03, + 0x28, 0x9c, 0x9c, 0xcc, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, + 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x16, + 0x57, 0xd8, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x53, 0x82, 0x31, 0x20, 0x00, 0x00, + 0xff, 0xff, 0x6a, 0x14, 0xf9, 0x95, 0x0b, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -179,7 +180,7 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MsgClient interface { - UpdateEpochParams(ctx context.Context, in *MsgUpdateEpochParams, opts ...grpc.CallOption) (*MsgUpdateParamsEpochResponse, error) + UpdateEpochParams(ctx context.Context, in *MsgUpdateCustomIbcParams, opts ...grpc.CallOption) (*MsgUpdateParamsCustomIbcResponse, error) } type msgClient struct { @@ -190,8 +191,8 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { return &msgClient{cc} } -func (c *msgClient) UpdateEpochParams(ctx context.Context, in *MsgUpdateEpochParams, opts ...grpc.CallOption) (*MsgUpdateParamsEpochResponse, error) { - out := new(MsgUpdateParamsEpochResponse) +func (c *msgClient) UpdateEpochParams(ctx context.Context, in *MsgUpdateCustomIbcParams, opts ...grpc.CallOption) (*MsgUpdateParamsCustomIbcResponse, error) { + out := new(MsgUpdateParamsCustomIbcResponse) err := c.cc.Invoke(ctx, "/composable.ibctransfermiddleware.v1beta1.Msg/UpdateEpochParams", in, out, opts...) if err != nil { return nil, err @@ -201,14 +202,14 @@ func (c *msgClient) UpdateEpochParams(ctx context.Context, in *MsgUpdateEpochPar // MsgServer is the server API for Msg service. type MsgServer interface { - UpdateEpochParams(context.Context, *MsgUpdateEpochParams) (*MsgUpdateParamsEpochResponse, error) + UpdateEpochParams(context.Context, *MsgUpdateCustomIbcParams) (*MsgUpdateParamsCustomIbcResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. type UnimplementedMsgServer struct { } -func (*UnimplementedMsgServer) UpdateEpochParams(ctx context.Context, req *MsgUpdateEpochParams) (*MsgUpdateParamsEpochResponse, error) { +func (*UnimplementedMsgServer) UpdateEpochParams(ctx context.Context, req *MsgUpdateCustomIbcParams) (*MsgUpdateParamsCustomIbcResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateEpochParams not implemented") } @@ -217,7 +218,7 @@ func RegisterMsgServer(s grpc1.Server, srv MsgServer) { } func _Msg_UpdateEpochParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUpdateEpochParams) + in := new(MsgUpdateCustomIbcParams) if err := dec(in); err != nil { return nil, err } @@ -229,7 +230,7 @@ func _Msg_UpdateEpochParams_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: "/composable.ibctransfermiddleware.v1beta1.Msg/UpdateEpochParams", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateEpochParams(ctx, req.(*MsgUpdateEpochParams)) + return srv.(MsgServer).UpdateEpochParams(ctx, req.(*MsgUpdateCustomIbcParams)) } return interceptor(ctx, in, info, handler) } @@ -247,7 +248,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Metadata: "composable/ibctransfermiddleware/v1beta1/tx.proto", } -func (m *MsgUpdateEpochParams) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateCustomIbcParams) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -257,12 +258,12 @@ func (m *MsgUpdateEpochParams) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateEpochParams) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateCustomIbcParams) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateEpochParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateCustomIbcParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -287,7 +288,7 @@ func (m *MsgUpdateEpochParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgUpdateParamsEpochResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateParamsCustomIbcResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -297,12 +298,12 @@ func (m *MsgUpdateParamsEpochResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateParamsEpochResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateParamsCustomIbcResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateParamsEpochResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateParamsCustomIbcResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -321,7 +322,7 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *MsgUpdateEpochParams) Size() (n int) { +func (m *MsgUpdateCustomIbcParams) Size() (n int) { if m == nil { return 0 } @@ -336,7 +337,7 @@ func (m *MsgUpdateEpochParams) Size() (n int) { return n } -func (m *MsgUpdateParamsEpochResponse) Size() (n int) { +func (m *MsgUpdateParamsCustomIbcResponse) Size() (n int) { if m == nil { return 0 } @@ -351,7 +352,7 @@ func sovTx(x uint64) (n int) { func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *MsgUpdateEpochParams) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateCustomIbcParams) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -374,10 +375,10 @@ func (m *MsgUpdateEpochParams) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateEpochParams: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateCustomIbcParams: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateEpochParams: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateCustomIbcParams: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -466,7 +467,7 @@ func (m *MsgUpdateEpochParams) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateParamsEpochResponse) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateParamsCustomIbcResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -489,10 +490,10 @@ func (m *MsgUpdateParamsEpochResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateParamsEpochResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateParamsCustomIbcResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateParamsEpochResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateParamsCustomIbcResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: