From 35a59b15732b4de1cc1cc09d88c83ec06ac5b9d6 Mon Sep 17 00:00:00 2001 From: colin axner <25233464+colin-axner@users.noreply.github.com> Date: Wed, 22 Jul 2020 12:01:57 +0200 Subject: [PATCH] rename MsgPacket to MsgRecvPacket (#6813) --- proto/ibc/channel/channel.proto | 4 +- x/ibc/04-channel/client/rest/tx.go | 2 +- x/ibc/04-channel/types/channel.pb.go | 216 +++++++++++++-------------- x/ibc/04-channel/types/codec.go | 3 +- x/ibc/04-channel/types/msgs.go | 22 +-- x/ibc/04-channel/types/msgs_test.go | 38 ++--- x/ibc/handler.go | 2 +- x/ibc/handler_test.go | 2 +- 8 files changed, 144 insertions(+), 145 deletions(-) diff --git a/proto/ibc/channel/channel.proto b/proto/ibc/channel/channel.proto index 6d7911d9e..f316b4c26 100644 --- a/proto/ibc/channel/channel.proto +++ b/proto/ibc/channel/channel.proto @@ -65,8 +65,8 @@ message MsgChannelCloseConfirm { bytes signer = 5 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; } -// MsgPacket receives incoming IBC packet -message MsgPacket { +// MsgRecvPacket receives incoming IBC packet +message MsgRecvPacket { Packet packet = 1 [(gogoproto.nullable) = false]; bytes proof = 2; uint64 proof_height = 3 [(gogoproto.moretags) = "yaml:\"proof_height\""]; diff --git a/x/ibc/04-channel/client/rest/tx.go b/x/ibc/04-channel/client/rest/tx.go index 39439283d..c62a1232e 100644 --- a/x/ibc/04-channel/client/rest/tx.go +++ b/x/ibc/04-channel/client/rest/tx.go @@ -365,7 +365,7 @@ func recvPacketHandlerFn(clientCtx client.Context) http.HandlerFunc { } // create the message - msg := types.NewMsgPacket( + msg := types.NewMsgRecvPacket( req.Packet, req.Proofs, req.Height, diff --git a/x/ibc/04-channel/types/channel.pb.go b/x/ibc/04-channel/types/channel.pb.go index c7f20d623..67b20bde3 100644 --- a/x/ibc/04-channel/types/channel.pb.go +++ b/x/ibc/04-channel/types/channel.pb.go @@ -566,26 +566,26 @@ func (m *MsgChannelCloseConfirm) GetSigner() github_com_cosmos_cosmos_sdk_types. return nil } -// MsgPacket receives incoming IBC packet -type MsgPacket struct { +// MsgRecvPacket receives incoming IBC packet +type MsgRecvPacket struct { Packet Packet `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"` Proof []byte `protobuf:"bytes,2,opt,name=proof,proto3" json:"proof,omitempty"` ProofHeight uint64 `protobuf:"varint,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height,omitempty" yaml:"proof_height"` Signer github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,4,opt,name=signer,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"signer,omitempty"` } -func (m *MsgPacket) Reset() { *m = MsgPacket{} } -func (m *MsgPacket) String() string { return proto.CompactTextString(m) } -func (*MsgPacket) ProtoMessage() {} -func (*MsgPacket) Descriptor() ([]byte, []int) { +func (m *MsgRecvPacket) Reset() { *m = MsgRecvPacket{} } +func (m *MsgRecvPacket) String() string { return proto.CompactTextString(m) } +func (*MsgRecvPacket) ProtoMessage() {} +func (*MsgRecvPacket) Descriptor() ([]byte, []int) { return fileDescriptor_9277922ccfb7f043, []int{6} } -func (m *MsgPacket) XXX_Unmarshal(b []byte) error { +func (m *MsgRecvPacket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgPacket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgRecvPacket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgPacket.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgRecvPacket.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -595,40 +595,40 @@ func (m *MsgPacket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *MsgPacket) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgPacket.Merge(m, src) +func (m *MsgRecvPacket) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRecvPacket.Merge(m, src) } -func (m *MsgPacket) XXX_Size() int { +func (m *MsgRecvPacket) XXX_Size() int { return m.Size() } -func (m *MsgPacket) XXX_DiscardUnknown() { - xxx_messageInfo_MsgPacket.DiscardUnknown(m) +func (m *MsgRecvPacket) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRecvPacket.DiscardUnknown(m) } -var xxx_messageInfo_MsgPacket proto.InternalMessageInfo +var xxx_messageInfo_MsgRecvPacket proto.InternalMessageInfo -func (m *MsgPacket) GetPacket() Packet { +func (m *MsgRecvPacket) GetPacket() Packet { if m != nil { return m.Packet } return Packet{} } -func (m *MsgPacket) GetProof() []byte { +func (m *MsgRecvPacket) GetProof() []byte { if m != nil { return m.Proof } return nil } -func (m *MsgPacket) GetProofHeight() uint64 { +func (m *MsgRecvPacket) GetProofHeight() uint64 { if m != nil { return m.ProofHeight } return 0 } -func (m *MsgPacket) GetSigner() github_com_cosmos_cosmos_sdk_types.AccAddress { +func (m *MsgRecvPacket) GetSigner() github_com_cosmos_cosmos_sdk_types.AccAddress { if m != nil { return m.Signer } @@ -1043,7 +1043,7 @@ func init() { proto.RegisterType((*MsgChannelOpenConfirm)(nil), "ibc.channel.MsgChannelOpenConfirm") proto.RegisterType((*MsgChannelCloseInit)(nil), "ibc.channel.MsgChannelCloseInit") proto.RegisterType((*MsgChannelCloseConfirm)(nil), "ibc.channel.MsgChannelCloseConfirm") - proto.RegisterType((*MsgPacket)(nil), "ibc.channel.MsgPacket") + proto.RegisterType((*MsgRecvPacket)(nil), "ibc.channel.MsgRecvPacket") proto.RegisterType((*MsgTimeout)(nil), "ibc.channel.MsgTimeout") proto.RegisterType((*MsgAcknowledgement)(nil), "ibc.channel.MsgAcknowledgement") proto.RegisterType((*Channel)(nil), "ibc.channel.Channel") @@ -1056,88 +1056,88 @@ func init() { func init() { proto.RegisterFile("ibc/channel/channel.proto", fileDescriptor_9277922ccfb7f043) } var fileDescriptor_9277922ccfb7f043 = []byte{ - // 1281 bytes of a gzipped FileDescriptorProto + // 1284 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xfa, 0x6f, 0xfc, 0xf2, 0xcf, 0x99, 0xa4, 0xa9, 0xe3, 0x16, 0xaf, 0xb5, 0x70, 0xb0, - 0x2a, 0xea, 0xd0, 0x3f, 0x80, 0xd4, 0x13, 0xb6, 0xe3, 0xaa, 0x2b, 0x1a, 0x3b, 0x9a, 0xb8, 0x48, - 0xf4, 0x62, 0x6d, 0x76, 0xa7, 0xf6, 0xca, 0xf1, 0x8e, 0xd9, 0xdd, 0xb4, 0xcd, 0x37, 0xa8, 0x22, - 0x51, 0xb8, 0xa3, 0x48, 0x48, 0x9c, 0xf8, 0x04, 0x7c, 0x02, 0xa4, 0x4a, 0x1c, 0xe8, 0x81, 0x03, - 0x02, 0x69, 0x41, 0xe9, 0x8d, 0xa3, 0x8f, 0x9c, 0xd0, 0xce, 0xcc, 0xda, 0xbb, 0x4e, 0xe9, 0x21, - 0x46, 0x32, 0x48, 0x9c, 0x76, 0xde, 0x7b, 0xbf, 0x79, 0xf3, 0xde, 0xef, 0x4d, 0xde, 0x9b, 0x18, - 0xb6, 0xcc, 0x03, 0x7d, 0x5b, 0xef, 0x69, 0x96, 0x45, 0x0e, 0x83, 0x6f, 0x65, 0x68, 0x53, 0x97, - 0xa2, 0x45, 0xf3, 0x40, 0xaf, 0x08, 0x55, 0x61, 0xa3, 0x4b, 0xbb, 0x94, 0xe9, 0xb7, 0xfd, 0x15, - 0x87, 0x28, 0x5f, 0xc4, 0x01, 0xed, 0x3a, 0xdd, 0x3a, 0x07, 0xb5, 0x86, 0xc4, 0x52, 0x2d, 0xd3, - 0x45, 0xef, 0x43, 0x66, 0x48, 0x6d, 0xb7, 0x63, 0x1a, 0x79, 0xa9, 0x24, 0x95, 0xb3, 0xb5, 0xab, - 0x67, 0x9e, 0x9c, 0xde, 0xa3, 0xb6, 0xab, 0xee, 0x8c, 0x3c, 0x79, 0xe5, 0x58, 0x1b, 0x1c, 0xde, - 0x51, 0x04, 0x44, 0xc1, 0x69, 0x7f, 0xa5, 0x1a, 0xa8, 0x0a, 0x20, 0x8e, 0xf3, 0x77, 0xc6, 0xd9, - 0x4e, 0xe5, 0xcc, 0x93, 0xb3, 0xc2, 0x3f, 0xdb, 0xbc, 0xc6, 0x37, 0x4f, 0x80, 0x0a, 0xce, 0x0a, - 0x41, 0x35, 0xd0, 0x6d, 0xc8, 0x08, 0x21, 0x9f, 0x28, 0x49, 0xe5, 0xc5, 0x9b, 0x1b, 0x95, 0x50, - 0x16, 0x15, 0xe1, 0xa8, 0x96, 0x7c, 0xe1, 0xc9, 0x31, 0x1c, 0x40, 0x91, 0x0a, 0x69, 0xc7, 0xec, - 0x5a, 0xc4, 0xce, 0x27, 0x4b, 0x52, 0x79, 0xa9, 0x76, 0xe3, 0x4f, 0x4f, 0xbe, 0xde, 0x35, 0xdd, - 0xde, 0xd1, 0x41, 0x45, 0xa7, 0x83, 0x6d, 0x9d, 0x3a, 0x03, 0xea, 0x88, 0xcf, 0x75, 0xc7, 0xe8, - 0x6f, 0xbb, 0xc7, 0x43, 0xe2, 0x54, 0xaa, 0xba, 0x5e, 0x35, 0x0c, 0x9b, 0x38, 0x0e, 0x16, 0x0e, - 0x94, 0x9f, 0x12, 0xb0, 0x16, 0x65, 0xa4, 0x6d, 0x1f, 0xff, 0xe7, 0x08, 0xc1, 0xb0, 0xa1, 0xd3, - 0x23, 0xcb, 0x25, 0xf6, 0x50, 0xb3, 0xdd, 0xe3, 0xce, 0x63, 0x62, 0x3b, 0x26, 0xb5, 0x18, 0x3d, - 0xd9, 0x9a, 0x3c, 0xf2, 0xe4, 0x2b, 0xe2, 0xd4, 0xd7, 0xa0, 0x14, 0xbc, 0x1e, 0x56, 0x7f, 0xc2, - 0xb5, 0xe8, 0x36, 0xc0, 0xd0, 0xa6, 0xf4, 0x51, 0xc7, 0xb4, 0x4c, 0x37, 0x9f, 0x62, 0x44, 0x5f, - 0x9a, 0xc4, 0x3f, 0xb1, 0x29, 0x38, 0xcb, 0x04, 0x76, 0x95, 0xee, 0xc0, 0x12, 0xb7, 0xf4, 0x88, - 0xd9, 0xed, 0xb9, 0xf9, 0x74, 0x49, 0x2a, 0x27, 0x6b, 0x97, 0x47, 0x9e, 0xbc, 0x1e, 0xde, 0xc7, - 0xad, 0x0a, 0x5e, 0x64, 0xe2, 0x3d, 0x26, 0x85, 0xca, 0x9a, 0x99, 0xb5, 0xac, 0x5f, 0x9d, 0x2b, - 0x6b, 0x55, 0xef, 0xcf, 0xb1, 0xac, 0x7f, 0x57, 0xa0, 0xc4, 0x0c, 0x05, 0xba, 0x01, 0x9c, 0xf7, - 0x8e, 0x6b, 0x1f, 0x8b, 0x3f, 0x84, 0x8d, 0x91, 0x27, 0xe7, 0xc2, 0x3c, 0xbb, 0xf6, 0xb1, 0x82, - 0x17, 0xd8, 0xda, 0xbf, 0xd7, 0xd3, 0xd5, 0x49, 0x5d, 0xa8, 0x3a, 0xe9, 0x59, 0xab, 0xf3, 0x43, - 0x1c, 0x2e, 0x45, 0xab, 0x53, 0xa7, 0xd6, 0x23, 0xd3, 0x1e, 0xcc, 0xb1, 0x42, 0x63, 0x36, 0x35, - 0xbd, 0xcf, 0xca, 0xf2, 0x1a, 0x36, 0x35, 0xbd, 0x1f, 0xb0, 0xe9, 0x5f, 0xa7, 0x69, 0x36, 0x93, - 0x17, 0x62, 0x33, 0x35, 0x2b, 0x9b, 0xbf, 0x48, 0xb0, 0x3e, 0x61, 0xb3, 0x7e, 0x48, 0x1d, 0x32, - 0xe7, 0xae, 0x3e, 0x49, 0x2e, 0x31, 0x6b, 0x72, 0x3f, 0xc6, 0x61, 0x73, 0x2a, 0xb9, 0xf9, 0xdf, - 0x95, 0x68, 0x6b, 0x4c, 0x5c, 0xb0, 0x35, 0xce, 0xe9, 0xba, 0xfc, 0x2a, 0x41, 0x76, 0xd7, 0xe9, - 0xee, 0x69, 0x7a, 0x9f, 0xb8, 0xe8, 0x06, 0xa4, 0x87, 0x6c, 0xc5, 0x38, 0x5c, 0xbc, 0xb9, 0x1e, - 0x19, 0x37, 0x1c, 0x24, 0xa6, 0x8d, 0x00, 0xa2, 0x0d, 0x48, 0xb1, 0xd0, 0x18, 0x77, 0x4b, 0x98, - 0x0b, 0xe7, 0xb2, 0x4b, 0x5c, 0x28, 0xbb, 0x99, 0xe7, 0xf9, 0xb7, 0x71, 0x80, 0x5d, 0xa7, 0xdb, - 0x36, 0x07, 0x84, 0x1e, 0xfd, 0x4b, 0xd2, 0xfb, 0x18, 0x90, 0x45, 0x9e, 0xba, 0x1d, 0x87, 0x7c, - 0x76, 0x44, 0x2c, 0x9d, 0x74, 0x6c, 0xa2, 0x3f, 0x16, 0xe5, 0x7f, 0x6b, 0xe4, 0xc9, 0x5b, 0xdc, - 0xc3, 0x79, 0x8c, 0x82, 0x73, 0xbe, 0x72, 0x5f, 0xe8, 0x30, 0xd1, 0x1f, 0xff, 0x93, 0x37, 0xe1, - 0x39, 0x7f, 0x0d, 0x56, 0xf5, 0xbe, 0x45, 0x9f, 0x1c, 0x12, 0xa3, 0x4b, 0x06, 0xc4, 0xba, 0x10, - 0x67, 0x65, 0x58, 0xd5, 0xa2, 0x5e, 0x04, 0x7b, 0xd3, 0xea, 0x09, 0xbb, 0x89, 0x37, 0xb1, 0x3b, - 0xa7, 0x3f, 0x8d, 0xcf, 0xe3, 0x90, 0x11, 0x5d, 0x00, 0x95, 0x21, 0xe5, 0xb8, 0x9a, 0x4b, 0x18, - 0x09, 0x2b, 0x37, 0x51, 0x84, 0x84, 0x7d, 0xdf, 0x82, 0x39, 0x00, 0x55, 0x60, 0x81, 0xda, 0x06, - 0xb1, 0x4d, 0xab, 0xcb, 0xb2, 0x9e, 0x06, 0xb7, 0x7c, 0x23, 0x1e, 0x63, 0x50, 0x1d, 0x96, 0xc2, - 0xe3, 0x5c, 0xbc, 0xf3, 0xb6, 0xa2, 0xef, 0xbc, 0x10, 0x40, 0x70, 0x1d, 0xd9, 0x84, 0xea, 0xb0, - 0xaa, 0x53, 0xcb, 0x22, 0xba, 0x6b, 0x52, 0xab, 0xd3, 0xa3, 0x43, 0x27, 0x9f, 0x2c, 0x25, 0xca, - 0xd9, 0x5a, 0x61, 0xe4, 0xc9, 0x9b, 0xc1, 0x5b, 0x22, 0x02, 0x50, 0xf0, 0xca, 0x44, 0x73, 0x8f, - 0x0e, 0x1d, 0x94, 0x87, 0x4c, 0xf0, 0x10, 0xf1, 0xb9, 0xcb, 0xe2, 0x40, 0xbc, 0x93, 0x7c, 0xf6, - 0xb5, 0x1c, 0x53, 0xfe, 0x88, 0xc3, 0x9a, 0x6a, 0x10, 0xcb, 0x35, 0x1f, 0x99, 0xc4, 0xf8, 0x9f, - 0x19, 0xff, 0xd5, 0xf5, 0xf6, 0x64, 0xea, 0xa4, 0xd9, 0xec, 0x80, 0xc9, 0xd4, 0x19, 0xcf, 0x98, - 0x77, 0x23, 0x33, 0x26, 0xc3, 0x70, 0xcb, 0x91, 0x19, 0x13, 0x1a, 0x27, 0x82, 0xec, 0xe7, 0x12, - 0x2c, 0x85, 0x93, 0x9b, 0xdf, 0x7c, 0x13, 0x01, 0xfd, 0x96, 0x80, 0xb4, 0x98, 0x12, 0x05, 0x58, - 0x08, 0x1a, 0x13, 0x8b, 0x25, 0x89, 0xc7, 0x32, 0xfa, 0x10, 0x16, 0x1d, 0x7a, 0x64, 0xeb, 0xa4, - 0xe3, 0x07, 0x20, 0x0e, 0xdc, 0x1c, 0x79, 0x32, 0xe2, 0x67, 0x84, 0x8c, 0x0a, 0x06, 0x2e, 0xf9, - 0x49, 0xa0, 0x8f, 0x60, 0x45, 0xd8, 0xc2, 0xff, 0xf1, 0x64, 0x6b, 0x5b, 0x23, 0x4f, 0xbe, 0x14, - 0xd9, 0x2b, 0xec, 0x0a, 0x5e, 0xe6, 0x8a, 0xe0, 0x26, 0xde, 0x85, 0x9c, 0x41, 0x1c, 0xd7, 0xb4, - 0x34, 0x56, 0x4a, 0x76, 0x3e, 0xff, 0x97, 0xe7, 0xca, 0xc8, 0x93, 0x2f, 0x73, 0x1f, 0xd3, 0x08, - 0x05, 0xaf, 0x86, 0x54, 0x2c, 0x92, 0x16, 0xac, 0x87, 0x51, 0x41, 0x38, 0xac, 0xf2, 0xb5, 0xe2, - 0xc8, 0x93, 0x0b, 0xe7, 0x5d, 0x8d, 0x63, 0x42, 0x21, 0x6d, 0x10, 0x18, 0x82, 0xa4, 0xa1, 0xb9, - 0x1a, 0x7f, 0x29, 0x63, 0xb6, 0xf6, 0xd3, 0x75, 0xf9, 0x54, 0x0a, 0xba, 0x5c, 0x86, 0x75, 0xb9, - 0x50, 0xba, 0x51, 0xbb, 0x82, 0x97, 0x85, 0x62, 0xdc, 0xe9, 0xd6, 0x02, 0x84, 0xff, 0x75, 0x5c, - 0x6d, 0x30, 0xcc, 0x2f, 0x30, 0x27, 0x57, 0x47, 0x9e, 0x9c, 0x8f, 0x3a, 0x19, 0x43, 0x14, 0x9c, - 0x13, 0xba, 0x76, 0xa0, 0x12, 0x15, 0xfe, 0x5e, 0x82, 0x75, 0x5e, 0xe1, 0xaa, 0xde, 0xaf, 0xd3, - 0xc1, 0xc0, 0x74, 0x59, 0x93, 0x9e, 0xdf, 0xcb, 0x2a, 0x7c, 0xd1, 0x12, 0x53, 0x17, 0x0d, 0x41, - 0xb2, 0xa7, 0x39, 0x3d, 0xfe, 0x46, 0xc0, 0x6c, 0xcd, 0xf3, 0xb8, 0xf6, 0x9d, 0x04, 0x29, 0xd6, - 0x78, 0xd0, 0x07, 0x20, 0xef, 0xb7, 0xab, 0xed, 0x46, 0xe7, 0x41, 0x53, 0x6d, 0xaa, 0x6d, 0xb5, - 0x7a, 0x5f, 0x7d, 0xd8, 0xd8, 0xe9, 0x3c, 0x68, 0xee, 0xef, 0x35, 0xea, 0xea, 0x5d, 0xb5, 0xb1, - 0x93, 0x8b, 0x15, 0xd6, 0x4e, 0x4e, 0x4b, 0xcb, 0x11, 0x00, 0xca, 0x03, 0xf0, 0x7d, 0xbe, 0x32, - 0x27, 0x15, 0x16, 0x4e, 0x4e, 0x4b, 0x49, 0x7f, 0x8d, 0x8a, 0xb0, 0xcc, 0x2d, 0x6d, 0xfc, 0x69, - 0x6b, 0xaf, 0xd1, 0xcc, 0xc5, 0x0b, 0x8b, 0x27, 0xa7, 0xa5, 0x8c, 0x10, 0x27, 0x3b, 0x99, 0x31, - 0xc1, 0x77, 0x32, 0xcb, 0x55, 0x58, 0xe2, 0x96, 0xfa, 0xfd, 0xd6, 0x7e, 0x63, 0x27, 0x97, 0x2c, - 0xc0, 0xc9, 0x69, 0x29, 0xcd, 0xa5, 0x42, 0xf2, 0xd9, 0x37, 0xc5, 0xd8, 0xb5, 0x27, 0x90, 0x62, - 0x4d, 0x10, 0xbd, 0x03, 0x9b, 0x2d, 0xbc, 0xd3, 0xc0, 0x9d, 0x66, 0xab, 0xd9, 0x98, 0x8a, 0x97, - 0xb9, 0xf4, 0xf5, 0x48, 0x81, 0x55, 0x8e, 0x7a, 0xd0, 0x64, 0xdf, 0xc6, 0x4e, 0x4e, 0x2a, 0x2c, - 0x9f, 0x9c, 0x96, 0xb2, 0x63, 0x85, 0x1f, 0x30, 0xc7, 0x04, 0x08, 0x11, 0xb0, 0x10, 0xf9, 0xc1, - 0xb5, 0xdd, 0x17, 0x67, 0x45, 0xe9, 0xe5, 0x59, 0x51, 0xfa, 0xfd, 0xac, 0x28, 0x7d, 0xf9, 0xaa, - 0x18, 0x7b, 0xf9, 0xaa, 0x18, 0xfb, 0xf9, 0x55, 0x31, 0xf6, 0xf0, 0xd6, 0x1b, 0x67, 0xe7, 0xd3, - 0x6d, 0xf3, 0x40, 0xdf, 0x7e, 0xef, 0xf6, 0xf5, 0xe0, 0x37, 0x28, 0x36, 0x4c, 0x0f, 0xd2, 0xec, - 0xf7, 0xa5, 0x5b, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x95, 0x61, 0xbf, 0x9f, 0x12, 0x00, - 0x00, + 0x14, 0xf7, 0xfa, 0x6f, 0xfc, 0x12, 0x27, 0xce, 0x24, 0x4d, 0x1d, 0xb7, 0x78, 0xad, 0x85, 0x83, + 0x55, 0x51, 0x87, 0xfe, 0x01, 0xa4, 0x9e, 0xb0, 0x1d, 0x57, 0x5d, 0xd1, 0xd8, 0xd1, 0xc4, 0x45, + 0xa2, 0x17, 0x6b, 0xb3, 0x3b, 0xb5, 0x57, 0x8e, 0x77, 0xcc, 0xee, 0xa6, 0x6d, 0xbe, 0x41, 0x15, + 0x89, 0xc2, 0x1d, 0x45, 0x42, 0xe2, 0xc4, 0x27, 0xe0, 0x13, 0x20, 0x55, 0xe2, 0x40, 0x0f, 0x1c, + 0x10, 0x87, 0x2d, 0x4a, 0x6f, 0x1c, 0x7d, 0xe4, 0x84, 0x76, 0x66, 0xd6, 0xde, 0x75, 0x4a, 0x0f, + 0x09, 0x92, 0x41, 0xe2, 0xb4, 0xf3, 0xde, 0xfb, 0xcd, 0xcc, 0x7b, 0xbf, 0xf7, 0xf2, 0xde, 0xc4, + 0xb0, 0x69, 0xee, 0xeb, 0x5b, 0x7a, 0x5f, 0xb3, 0x2c, 0x72, 0x10, 0x7c, 0xab, 0x23, 0x9b, 0xba, + 0x14, 0x2d, 0x9a, 0xfb, 0x7a, 0x55, 0xa8, 0x8a, 0xeb, 0x3d, 0xda, 0xa3, 0x4c, 0xbf, 0xe5, 0xaf, + 0x38, 0x44, 0xf9, 0x2a, 0x0e, 0x68, 0xc7, 0xe9, 0x35, 0x38, 0xa8, 0x3d, 0x22, 0x96, 0x6a, 0x99, + 0x2e, 0xfa, 0x10, 0x32, 0x23, 0x6a, 0xbb, 0x5d, 0xd3, 0x28, 0x48, 0x65, 0xa9, 0x92, 0xad, 0x5f, + 0x3d, 0xf5, 0xe4, 0xf4, 0x2e, 0xb5, 0x5d, 0x75, 0x7b, 0xec, 0xc9, 0xcb, 0x47, 0xda, 0xf0, 0xe0, + 0x8e, 0x22, 0x20, 0x0a, 0x4e, 0xfb, 0x2b, 0xd5, 0x40, 0x35, 0x00, 0x71, 0x9d, 0xbf, 0x33, 0xce, + 0x76, 0x2a, 0xa7, 0x9e, 0x9c, 0x15, 0xe7, 0xb3, 0xcd, 0xab, 0x7c, 0xf3, 0x14, 0xa8, 0xe0, 0xac, + 0x10, 0x54, 0x03, 0xdd, 0x86, 0x8c, 0x10, 0x0a, 0x89, 0xb2, 0x54, 0x59, 0xbc, 0xb9, 0x5e, 0x0d, + 0x45, 0x51, 0x15, 0x07, 0xd5, 0x93, 0x2f, 0x3c, 0x39, 0x86, 0x03, 0x28, 0x52, 0x21, 0xed, 0x98, + 0x3d, 0x8b, 0xd8, 0x85, 0x64, 0x59, 0xaa, 0x2c, 0xd5, 0x6f, 0xfc, 0xe9, 0xc9, 0xd7, 0x7b, 0xa6, + 0xdb, 0x3f, 0xdc, 0xaf, 0xea, 0x74, 0xb8, 0xa5, 0x53, 0x67, 0x48, 0x1d, 0xf1, 0xb9, 0xee, 0x18, + 0x83, 0x2d, 0xf7, 0x68, 0x44, 0x9c, 0x6a, 0x4d, 0xd7, 0x6b, 0x86, 0x61, 0x13, 0xc7, 0xc1, 0xe2, + 0x00, 0xe5, 0x97, 0x04, 0xac, 0x46, 0x19, 0xe9, 0xd8, 0x47, 0xff, 0x39, 0x42, 0x30, 0xac, 0xeb, + 0xf4, 0xd0, 0x72, 0x89, 0x3d, 0xd2, 0x6c, 0xf7, 0xa8, 0xfb, 0x98, 0xd8, 0x8e, 0x49, 0x2d, 0x46, + 0x4f, 0xb6, 0x2e, 0x8f, 0x3d, 0xf9, 0x8a, 0xb8, 0xf5, 0x0d, 0x28, 0x05, 0xaf, 0x85, 0xd5, 0x9f, + 0x71, 0x2d, 0xba, 0x0d, 0x30, 0xb2, 0x29, 0x7d, 0xd4, 0x35, 0x2d, 0xd3, 0x2d, 0xa4, 0x18, 0xd1, + 0x97, 0xa6, 0xfe, 0x4f, 0x6d, 0x0a, 0xce, 0x32, 0x81, 0x95, 0xd2, 0x1d, 0x58, 0xe2, 0x96, 0x3e, + 0x31, 0x7b, 0x7d, 0xb7, 0x90, 0x2e, 0x4b, 0x95, 0x64, 0xfd, 0xf2, 0xd8, 0x93, 0xd7, 0xc2, 0xfb, + 0xb8, 0x55, 0xc1, 0x8b, 0x4c, 0xbc, 0xc7, 0xa4, 0x50, 0x5a, 0x33, 0x17, 0x4d, 0xeb, 0x37, 0x67, + 0xd2, 0x5a, 0xd3, 0x07, 0x73, 0x4c, 0xeb, 0xdf, 0x25, 0x28, 0x71, 0x81, 0x04, 0xdd, 0x00, 0xce, + 0x7b, 0xd7, 0xb5, 0x8f, 0xc4, 0x1f, 0xc2, 0xfa, 0xd8, 0x93, 0xf3, 0x61, 0x9e, 0x5d, 0xfb, 0x48, + 0xc1, 0x0b, 0x6c, 0xed, 0xd7, 0xf5, 0x6c, 0x76, 0x52, 0xe7, 0xca, 0x4e, 0xfa, 0xa2, 0xd9, 0xf9, + 0x29, 0x0e, 0x97, 0xa2, 0xd9, 0x69, 0x50, 0xeb, 0x91, 0x69, 0x0f, 0xe7, 0x98, 0xa1, 0x09, 0x9b, + 0x9a, 0x3e, 0x60, 0x69, 0x79, 0x03, 0x9b, 0x9a, 0x3e, 0x08, 0xd8, 0xf4, 0xcb, 0x69, 0x96, 0xcd, + 0xe4, 0xb9, 0xd8, 0x4c, 0x5d, 0x94, 0xcd, 0xdf, 0x24, 0x58, 0x9b, 0xb2, 0xd9, 0x38, 0xa0, 0x0e, + 0x99, 0x73, 0x57, 0x9f, 0x06, 0x97, 0xb8, 0x68, 0x70, 0x3f, 0xc7, 0x61, 0x63, 0x26, 0xb8, 0xf9, + 0xd7, 0x4a, 0xb4, 0x35, 0x26, 0xce, 0xd9, 0x1a, 0xe7, 0x54, 0x2e, 0xaf, 0x24, 0xc8, 0xed, 0x38, + 0x3d, 0x4c, 0xf4, 0xc7, 0xbb, 0x9a, 0x3e, 0x20, 0x2e, 0xba, 0x01, 0xe9, 0x11, 0x5b, 0x31, 0x1e, + 0x17, 0x6f, 0xae, 0x45, 0x46, 0x0e, 0x07, 0x89, 0x89, 0x23, 0x80, 0x68, 0x1d, 0x52, 0xcc, 0x3d, + 0xc6, 0xdf, 0x12, 0xe6, 0xc2, 0x99, 0x08, 0x13, 0xe7, 0x8a, 0xf0, 0xc2, 0x33, 0xfd, 0xfb, 0x38, + 0xc0, 0x8e, 0xd3, 0xeb, 0x98, 0x43, 0x42, 0x0f, 0xff, 0x25, 0xe1, 0x7d, 0x0a, 0xc8, 0x22, 0x4f, + 0xdd, 0xae, 0x43, 0xbe, 0x38, 0x24, 0x96, 0x4e, 0xba, 0x36, 0xd1, 0x1f, 0x8b, 0x12, 0x78, 0x67, + 0xec, 0xc9, 0x9b, 0xfc, 0x84, 0xb3, 0x18, 0x05, 0xe7, 0x7d, 0xe5, 0x9e, 0xd0, 0xf9, 0x69, 0xfb, + 0x27, 0xab, 0xe1, 0x39, 0x7f, 0x11, 0xd6, 0xf4, 0x81, 0x45, 0x9f, 0x1c, 0x10, 0xa3, 0x47, 0x86, + 0xc4, 0x3a, 0x17, 0x67, 0x15, 0x58, 0xd1, 0xa2, 0xa7, 0x08, 0xf6, 0x66, 0xd5, 0x53, 0x76, 0x13, + 0x6f, 0x63, 0x77, 0x4e, 0x7f, 0x1e, 0x5f, 0xc6, 0x21, 0x23, 0x3a, 0x01, 0xaa, 0x40, 0xca, 0x71, + 0x35, 0x97, 0x30, 0x12, 0x96, 0x6f, 0xa2, 0x08, 0x09, 0x7b, 0xbe, 0x05, 0x73, 0x00, 0xaa, 0xc2, + 0x02, 0xb5, 0x0d, 0x62, 0x9b, 0x56, 0x8f, 0x45, 0x3d, 0x0b, 0x6e, 0xfb, 0x46, 0x3c, 0xc1, 0xa0, + 0x06, 0x2c, 0x85, 0x47, 0xba, 0x78, 0xeb, 0x6d, 0x46, 0xdf, 0x7a, 0x21, 0x80, 0xe0, 0x3a, 0xb2, + 0x09, 0x35, 0x60, 0x45, 0xa7, 0x96, 0x45, 0x74, 0xd7, 0xa4, 0x56, 0xb7, 0x4f, 0x47, 0x4e, 0x21, + 0x59, 0x4e, 0x54, 0xb2, 0xf5, 0xe2, 0xd8, 0x93, 0x37, 0x82, 0xf7, 0x44, 0x04, 0xa0, 0xe0, 0xe5, + 0xa9, 0xe6, 0x1e, 0x1d, 0x39, 0xa8, 0x00, 0x99, 0xe0, 0x31, 0xe2, 0x73, 0x97, 0xc5, 0x81, 0x78, + 0x27, 0xf9, 0xec, 0x5b, 0x39, 0xa6, 0xfc, 0x11, 0x87, 0x55, 0xd5, 0x20, 0x96, 0x6b, 0x3e, 0x32, + 0x89, 0xf1, 0x3f, 0x33, 0xfe, 0xcb, 0xeb, 0xdd, 0xe9, 0xe4, 0x49, 0xb3, 0xf9, 0x01, 0xd3, 0xc9, + 0x33, 0x99, 0x33, 0xef, 0x47, 0xe6, 0x4c, 0x86, 0xe1, 0x72, 0x91, 0x39, 0x13, 0x1a, 0x29, 0x82, + 0xec, 0xe7, 0x12, 0x2c, 0x85, 0x83, 0x9b, 0xdf, 0x8c, 0x13, 0x0e, 0xbd, 0x4a, 0x40, 0x5a, 0x4c, + 0x89, 0x22, 0x2c, 0x04, 0x8d, 0x89, 0xf9, 0x92, 0xc4, 0x13, 0x19, 0x7d, 0x0c, 0x8b, 0x0e, 0x3d, + 0xb4, 0x75, 0xd2, 0xf5, 0x1d, 0x10, 0x17, 0x6e, 0x8c, 0x3d, 0x19, 0xf1, 0x3b, 0x42, 0x46, 0x05, + 0x03, 0x97, 0xfc, 0x20, 0xd0, 0x27, 0xb0, 0x2c, 0x6c, 0xe1, 0xff, 0x7a, 0xb2, 0xf5, 0xcd, 0xb1, + 0x27, 0x5f, 0x8a, 0xec, 0x15, 0x76, 0x05, 0xe7, 0xb8, 0x22, 0xa8, 0xc4, 0xbb, 0x90, 0x37, 0x88, + 0xe3, 0x9a, 0x96, 0xc6, 0x52, 0xc9, 0xee, 0xe7, 0xff, 0xf6, 0x5c, 0x19, 0x7b, 0xf2, 0x65, 0x7e, + 0xc6, 0x2c, 0x42, 0xc1, 0x2b, 0x21, 0x15, 0xf3, 0xa4, 0x0d, 0x6b, 0x61, 0x54, 0xe0, 0x0e, 0xcb, + 0x7c, 0xbd, 0x34, 0xf6, 0xe4, 0xe2, 0xd9, 0xa3, 0x26, 0x3e, 0xa1, 0x90, 0x36, 0x70, 0x0c, 0x41, + 0xd2, 0xd0, 0x5c, 0x8d, 0xbf, 0x96, 0x31, 0x5b, 0xfb, 0xe1, 0xba, 0x7c, 0x2a, 0x05, 0x5d, 0x2e, + 0xc3, 0xba, 0x5c, 0x28, 0xdc, 0xa8, 0x5d, 0xc1, 0x39, 0xa1, 0x98, 0x74, 0xba, 0xd5, 0x00, 0xe1, + 0x7f, 0x1d, 0x57, 0x1b, 0x8e, 0x0a, 0x0b, 0xec, 0x90, 0xab, 0x63, 0x4f, 0x2e, 0x44, 0x0f, 0x99, + 0x40, 0x14, 0x9c, 0x17, 0xba, 0x4e, 0xa0, 0x12, 0x19, 0xfe, 0x51, 0x82, 0x35, 0x9e, 0xe1, 0x9a, + 0x3e, 0x68, 0xd0, 0xe1, 0xd0, 0x74, 0x59, 0x93, 0x9e, 0xdf, 0xeb, 0x2a, 0x5c, 0x68, 0x89, 0x99, + 0x42, 0x43, 0x90, 0xec, 0x6b, 0x4e, 0x9f, 0xbf, 0x11, 0x30, 0x5b, 0xf3, 0x38, 0xae, 0xfd, 0x20, + 0x41, 0x8a, 0x35, 0x1e, 0xf4, 0x11, 0xc8, 0x7b, 0x9d, 0x5a, 0xa7, 0xd9, 0x7d, 0xd0, 0x52, 0x5b, + 0x6a, 0x47, 0xad, 0xdd, 0x57, 0x1f, 0x36, 0xb7, 0xbb, 0x0f, 0x5a, 0x7b, 0xbb, 0xcd, 0x86, 0x7a, + 0x57, 0x6d, 0x6e, 0xe7, 0x63, 0xc5, 0xd5, 0xe3, 0x93, 0x72, 0x2e, 0x02, 0x40, 0x05, 0x00, 0xbe, + 0xcf, 0x57, 0xe6, 0xa5, 0xe2, 0xc2, 0xf1, 0x49, 0x39, 0xe9, 0xaf, 0x51, 0x09, 0x72, 0xdc, 0xd2, + 0xc1, 0x9f, 0xb7, 0x77, 0x9b, 0xad, 0x7c, 0xbc, 0xb8, 0x78, 0x7c, 0x52, 0xce, 0x08, 0x71, 0xba, + 0x93, 0x19, 0x13, 0x7c, 0x27, 0xb3, 0x5c, 0x85, 0x25, 0x6e, 0x69, 0xdc, 0x6f, 0xef, 0x35, 0xb7, + 0xf3, 0xc9, 0x22, 0x1c, 0x9f, 0x94, 0xd3, 0x5c, 0x2a, 0x26, 0x9f, 0x7d, 0x57, 0x8a, 0x5d, 0x7b, + 0x02, 0x29, 0xd6, 0x04, 0xd1, 0x7b, 0xb0, 0xd1, 0xc6, 0xdb, 0x4d, 0xdc, 0x6d, 0xb5, 0x5b, 0xcd, + 0x19, 0x7f, 0xd9, 0x91, 0xbe, 0x1e, 0x29, 0xb0, 0xc2, 0x51, 0x0f, 0x5a, 0xec, 0xdb, 0xdc, 0xce, + 0x4b, 0xc5, 0xdc, 0xf1, 0x49, 0x39, 0x3b, 0x51, 0xf8, 0x0e, 0x73, 0x4c, 0x80, 0x10, 0x0e, 0x0b, + 0x91, 0x5f, 0x5c, 0xdf, 0x79, 0x71, 0x5a, 0x92, 0x5e, 0x9e, 0x96, 0xa4, 0xdf, 0x4f, 0x4b, 0xd2, + 0xd7, 0xaf, 0x4b, 0xb1, 0x97, 0xaf, 0x4b, 0xb1, 0x5f, 0x5f, 0x97, 0x62, 0x0f, 0x6f, 0xbd, 0x75, + 0x76, 0x3e, 0xdd, 0x32, 0xf7, 0xf5, 0xad, 0x0f, 0x6e, 0x5f, 0x0f, 0x7e, 0x87, 0x62, 0xc3, 0x74, + 0x3f, 0xcd, 0x7e, 0x63, 0xba, 0xf5, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5e, 0xbb, 0x3c, 0x45, + 0xa3, 0x12, 0x00, 0x00, } func (m *MsgChannelOpenInit) Marshal() (dAtA []byte, err error) { @@ -1486,7 +1486,7 @@ func (m *MsgChannelCloseConfirm) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *MsgPacket) Marshal() (dAtA []byte, err error) { +func (m *MsgRecvPacket) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1496,12 +1496,12 @@ func (m *MsgPacket) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgPacket) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgRecvPacket) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgRecvPacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2122,7 +2122,7 @@ func (m *MsgChannelCloseConfirm) Size() (n int) { return n } -func (m *MsgPacket) Size() (n int) { +func (m *MsgRecvPacket) Size() (n int) { if m == nil { return 0 } @@ -3590,7 +3590,7 @@ func (m *MsgChannelCloseConfirm) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgPacket) Unmarshal(dAtA []byte) error { +func (m *MsgRecvPacket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3613,10 +3613,10 @@ func (m *MsgPacket) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgPacket: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRecvPacket: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgPacket: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRecvPacket: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/ibc/04-channel/types/codec.go b/x/ibc/04-channel/types/codec.go index 01b4bbe03..37397e750 100644 --- a/x/ibc/04-channel/types/codec.go +++ b/x/ibc/04-channel/types/codec.go @@ -20,7 +20,6 @@ func RegisterCodec(cdc *codec.Codec) { cdc.RegisterConcrete(&MsgChannelOpenConfirm{}, "ibc/channel/MsgChannelOpenConfirm", nil) cdc.RegisterConcrete(&MsgChannelCloseInit{}, "ibc/channel/MsgChannelCloseInit", nil) cdc.RegisterConcrete(&MsgChannelCloseConfirm{}, "ibc/channel/MsgChannelCloseConfirm", nil) - cdc.RegisterConcrete(&MsgPacket{}, "ibc/channel/MsgPacket", nil) cdc.RegisterConcrete(&MsgAcknowledgement{}, "ibc/channel/MsgAcknowledgement", nil) cdc.RegisterConcrete(&MsgTimeout{}, "ibc/channel/MsgTimeout", nil) } @@ -36,7 +35,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgChannelOpenConfirm{}, &MsgChannelCloseInit{}, &MsgChannelCloseConfirm{}, - &MsgPacket{}, + &MsgRecvPacket{}, &MsgAcknowledgement{}, &MsgTimeout{}, ) diff --git a/x/ibc/04-channel/types/msgs.go b/x/ibc/04-channel/types/msgs.go index 82ae49104..e5549af1a 100644 --- a/x/ibc/04-channel/types/msgs.go +++ b/x/ibc/04-channel/types/msgs.go @@ -332,14 +332,14 @@ func (msg MsgChannelCloseConfirm) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{msg.Signer} } -var _ sdk.Msg = &MsgPacket{} +var _ sdk.Msg = &MsgRecvPacket{} -// NewMsgPacket constructs new MsgPacket -func NewMsgPacket( +// NewMsgRecvPacket constructs new MsgRecvPacket +func NewMsgRecvPacket( packet Packet, proof []byte, proofHeight uint64, signer sdk.AccAddress, -) *MsgPacket { - return &MsgPacket{ +) *MsgRecvPacket { + return &MsgRecvPacket{ Packet: packet, Proof: proof, ProofHeight: proofHeight, @@ -348,12 +348,12 @@ func NewMsgPacket( } // Route implements sdk.Msg -func (msg MsgPacket) Route() string { +func (msg MsgRecvPacket) Route() string { return host.RouterKey } // ValidateBasic implements sdk.Msg -func (msg MsgPacket) ValidateBasic() error { +func (msg MsgRecvPacket) ValidateBasic() error { if len(msg.Proof) == 0 { return sdkerrors.Wrap(commitmenttypes.ErrInvalidProof, "cannot submit an empty proof") } @@ -368,24 +368,24 @@ func (msg MsgPacket) ValidateBasic() error { } // GetSignBytes implements sdk.Msg -func (msg MsgPacket) GetSignBytes() []byte { +func (msg MsgRecvPacket) GetSignBytes() []byte { return sdk.MustSortJSON(SubModuleCdc.MustMarshalJSON(msg)) } // GetDataSignBytes returns the base64-encoded bytes used for the // data field when signing the packet. -func (msg MsgPacket) GetDataSignBytes() []byte { +func (msg MsgRecvPacket) GetDataSignBytes() []byte { s := "\"" + base64.StdEncoding.EncodeToString(msg.Packet.Data) + "\"" return []byte(s) } // GetSigners implements sdk.Msg -func (msg MsgPacket) GetSigners() []sdk.AccAddress { +func (msg MsgRecvPacket) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{msg.Signer} } // Type implements sdk.Msg -func (msg MsgPacket) Type() string { +func (msg MsgRecvPacket) Type() string { return "recv_packet" } diff --git a/x/ibc/04-channel/types/msgs_test.go b/x/ibc/04-channel/types/msgs_test.go index 452701d2a..210fa163b 100644 --- a/x/ibc/04-channel/types/msgs_test.go +++ b/x/ibc/04-channel/types/msgs_test.go @@ -371,25 +371,25 @@ func (suite *MsgTestSuite) TestMsgChannelCloseConfirm() { } } -// TestMsgPacketType tests Type for MsgPacket. -func (suite *MsgTestSuite) TestMsgPacketType() { - msg := types.NewMsgPacket(packet, suite.proof, 1, addr1) +// TestMsgRecvPacketType tests Type for MsgRecvPacket. +func (suite *MsgTestSuite) TestMsgRecvPacketType() { + msg := types.NewMsgRecvPacket(packet, suite.proof, 1, addr1) suite.Equal("recv_packet", msg.Type()) } -// TestMsgPacketValidation tests ValidateBasic for MsgPacket -func (suite *MsgTestSuite) TestMsgPacketValidation() { - testMsgs := []*types.MsgPacket{ - types.NewMsgPacket(packet, suite.proof, 1, addr1), // valid msg - types.NewMsgPacket(packet, suite.proof, 0, addr1), // proof height is zero - types.NewMsgPacket(packet, emptyProof, 1, addr1), // empty proof - types.NewMsgPacket(packet, suite.proof, 1, emptyAddr), // missing signer address - types.NewMsgPacket(unknownPacket, suite.proof, 1, addr1), // unknown packet +// TestMsgRecvPacketValidation tests ValidateBasic for MsgRecvPacket +func (suite *MsgTestSuite) TestMsgRecvPacketValidation() { + testMsgs := []*types.MsgRecvPacket{ + types.NewMsgRecvPacket(packet, suite.proof, 1, addr1), // valid msg + types.NewMsgRecvPacket(packet, suite.proof, 0, addr1), // proof height is zero + types.NewMsgRecvPacket(packet, emptyProof, 1, addr1), // empty proof + types.NewMsgRecvPacket(packet, suite.proof, 1, emptyAddr), // missing signer address + types.NewMsgRecvPacket(unknownPacket, suite.proof, 1, addr1), // unknown packet } testCases := []struct { - msg *types.MsgPacket + msg *types.MsgRecvPacket expPass bool errMsg string }{ @@ -410,21 +410,21 @@ func (suite *MsgTestSuite) TestMsgPacketValidation() { } } -// TestMsgPacketGetSignBytes tests GetSignBytes for MsgPacket -func (suite *MsgTestSuite) TestMsgPacketGetSignBytes() { - msg := types.NewMsgPacket(packet, suite.proof, 1, addr1) +// TestMsgRecvPacketGetSignBytes tests GetSignBytes for MsgRecvPacket +func (suite *MsgTestSuite) TestMsgRecvPacketGetSignBytes() { + msg := types.NewMsgRecvPacket(packet, suite.proof, 1, addr1) res := msg.GetSignBytes() expected := fmt.Sprintf( - `{"type":"ibc/channel/MsgPacket","value":{"packet":{"data":%s,"destination_channel":"testcpchannel","destination_port":"testcpport","sequence":"1","source_channel":"testchannel","source_port":"testportid","timeout_height":"100","timeout_timestamp":"100"},"proof":"Co0BCi4KCmljczIzOmlhdmwSA0tFWRobChkKA0tFWRIFVkFMVUUaCwgBGAEgASoDAAICClsKDGljczIzOnNpbXBsZRIMaWF2bFN0b3JlS2V5Gj0KOwoMaWF2bFN0b3JlS2V5EiAcIiDXSHQRSvh/Wa07MYpTK0B4XtbaXtzxBED76xk0WhoJCAEYASABKgEA","proof_height":"1","signer":"cosmos1w3jhxarpv3j8yvg4ufs4x"}}`, + `{"packet":{"data":%s,"destination_channel":"testcpchannel","destination_port":"testcpport","sequence":"1","source_channel":"testchannel","source_port":"testportid","timeout_height":"100","timeout_timestamp":"100"},"proof":"Co0BCi4KCmljczIzOmlhdmwSA0tFWRobChkKA0tFWRIFVkFMVUUaCwgBGAEgASoDAAICClsKDGljczIzOnNpbXBsZRIMaWF2bFN0b3JlS2V5Gj0KOwoMaWF2bFN0b3JlS2V5EiAcIiDXSHQRSvh/Wa07MYpTK0B4XtbaXtzxBED76xk0WhoJCAEYASABKgEA","proof_height":"1","signer":"cosmos1w3jhxarpv3j8yvg4ufs4x"}`, string(msg.GetDataSignBytes()), ) suite.Equal(expected, string(res)) } -// TestMsgPacketGetSigners tests GetSigners for MsgPacket -func (suite *MsgTestSuite) TestMsgPacketGetSigners() { - msg := types.NewMsgPacket(packet, suite.proof, 1, addr1) +// TestMsgRecvPacketGetSigners tests GetSigners for MsgRecvPacket +func (suite *MsgTestSuite) TestMsgRecvPacketGetSigners() { + msg := types.NewMsgRecvPacket(packet, suite.proof, 1, addr1) res := msg.GetSigners() expected := "[746573746164647231]" diff --git a/x/ibc/handler.go b/x/ibc/handler.go index ac58ef23d..5f9d62ee8 100644 --- a/x/ibc/handler.go +++ b/x/ibc/handler.go @@ -167,7 +167,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler { return channel.HandleMsgChannelCloseConfirm(ctx, k.ChannelKeeper, cap, msg) // IBC packet msgs get routed to the appropriate module callback - case *channeltypes.MsgPacket: + case *channeltypes.MsgRecvPacket: // Lookup module by channel capability module, cap, err := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.Packet.DestinationPort, msg.Packet.DestinationChannel) if err != nil { diff --git a/x/ibc/handler_test.go b/x/ibc/handler_test.go index 5fa3b9946..c7482cccb 100644 --- a/x/ibc/handler_test.go +++ b/x/ibc/handler_test.go @@ -137,7 +137,7 @@ func (suite *HandlerTestSuite) TestHandleRecvPacket() { packetKey := host.KeyPacketCommitment(packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence()) proof, proofHeight := suite.chainA.QueryProof(packetKey) - msg := channeltypes.NewMsgPacket(packet, proof, proofHeight, suite.chainB.SenderAccount.GetAddress()) + msg := channeltypes.NewMsgRecvPacket(packet, proof, proofHeight, suite.chainB.SenderAccount.GetAddress()) // ante-handle RecvPacket _, err := handler(suite.chainB.GetContext(), msg)