certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix testdata proto-gen (#6568)

This commit is contained in:
Aaron Craelius 2020-07-01 11:26:29 -04:00 committed by GitHub
parent 0f0723dd78
commit 99ea4b759a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
baseapp/baseapp_test.go
View File

@ -1555,7 +1555,7 @@ func TestGRPCQuery(t *testing.T) {
reqQuery := abci.RequestQuery{ reqQuery := abci.RequestQuery{
Data: reqBz, Data: reqBz,
Path: "/cosmos_sdk.codec.v1.TestService/SayHello", Path: "/testdata.TestService/SayHello",
} }
resQuery := app.Query(reqQuery) resQuery := app.Query(reqQuery)

4
client/context_test.go
View File

@ -109,7 +109,7 @@ func TestContext_PrintOutput(t *testing.T) {
err = ctx.PrintOutput(hasAnimal) err = ctx.PrintOutput(hasAnimal)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, require.Equal(t,
`{"animal":{"@type":"/cosmos_sdk.codec.v1.Dog","size":"big","name":"Spot"},"x":"10"} `{"animal":{"@type":"/testdata.Dog","size":"big","name":"Spot"},"x":"10"}
`, string(buf.Bytes())) `, string(buf.Bytes()))
// yaml // yaml
@ -120,7 +120,7 @@ func TestContext_PrintOutput(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, require.Equal(t,
`animal: `animal:
'@type': /cosmos_sdk.codec.v1.Dog '@type': /testdata.Dog
name: Spot name: Spot
size: big size: big
x: "10" x: "10"

109
codec/testdata/proto.pb.go vendored
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: codec/testdata/proto.proto // source: proto.proto
package testdata package testdata
@ -37,7 +37,7 @@ func (m *Dog) Reset() { *m = Dog{} }
func (m *Dog) String() string { return proto.CompactTextString(m) } func (m *Dog) String() string { return proto.CompactTextString(m) }
func (*Dog) ProtoMessage() {} func (*Dog) ProtoMessage() {}
func (*Dog) Descriptor() ([]byte, []int) { func (*Dog) Descriptor() ([]byte, []int) {
return fileDescriptor_ae1353846770e6e2, []int{0} return fileDescriptor_2fcc84b9998d60d8, []int{0}
} }
func (m *Dog) XXX_Unmarshal(b []byte) error { func (m *Dog) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -89,7 +89,7 @@ func (m *Cat) Reset() { *m = Cat{} }
func (m *Cat) String() string { return proto.CompactTextString(m) } func (m *Cat) String() string { return proto.CompactTextString(m) }
func (*Cat) ProtoMessage() {} func (*Cat) ProtoMessage() {}
func (*Cat) Descriptor() ([]byte, []int) { func (*Cat) Descriptor() ([]byte, []int) {
return fileDescriptor_ae1353846770e6e2, []int{1} return fileDescriptor_2fcc84b9998d60d8, []int{1}
} }
func (m *Cat) XXX_Unmarshal(b []byte) error { func (m *Cat) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -141,7 +141,7 @@ func (m *HasAnimal) Reset() { *m = HasAnimal{} }
func (m *HasAnimal) String() string { return proto.CompactTextString(m) } func (m *HasAnimal) String() string { return proto.CompactTextString(m) }
func (*HasAnimal) ProtoMessage() {} func (*HasAnimal) ProtoMessage() {}
func (*HasAnimal) Descriptor() ([]byte, []int) { func (*HasAnimal) Descriptor() ([]byte, []int) {
return fileDescriptor_ae1353846770e6e2, []int{2} return fileDescriptor_2fcc84b9998d60d8, []int{2}
} }
func (m *HasAnimal) XXX_Unmarshal(b []byte) error { func (m *HasAnimal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -192,7 +192,7 @@ func (m *HasHasAnimal) Reset() { *m = HasHasAnimal{} }
func (m *HasHasAnimal) String() string { return proto.CompactTextString(m) } func (m *HasHasAnimal) String() string { return proto.CompactTextString(m) }
func (*HasHasAnimal) ProtoMessage() {} func (*HasHasAnimal) ProtoMessage() {}
func (*HasHasAnimal) Descriptor() ([]byte, []int) { func (*HasHasAnimal) Descriptor() ([]byte, []int) {
return fileDescriptor_ae1353846770e6e2, []int{3} return fileDescriptor_2fcc84b9998d60d8, []int{3}
} }
func (m *HasHasAnimal) XXX_Unmarshal(b []byte) error { func (m *HasHasAnimal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -236,7 +236,7 @@ func (m *HasHasHasAnimal) Reset() { *m = HasHasHasAnimal{} }
func (m *HasHasHasAnimal) String() string { return proto.CompactTextString(m) } func (m *HasHasHasAnimal) String() string { return proto.CompactTextString(m) }
func (*HasHasHasAnimal) ProtoMessage() {} func (*HasHasHasAnimal) ProtoMessage() {}
func (*HasHasHasAnimal) Descriptor() ([]byte, []int) { func (*HasHasHasAnimal) Descriptor() ([]byte, []int) {
return fileDescriptor_ae1353846770e6e2, []int{4} return fileDescriptor_2fcc84b9998d60d8, []int{4}
} }
func (m *HasHasHasAnimal) XXX_Unmarshal(b []byte) error { func (m *HasHasHasAnimal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -280,7 +280,7 @@ func (m *EchoRequest) Reset() { *m = EchoRequest{} }
func (m *EchoRequest) String() string { return proto.CompactTextString(m) } func (m *EchoRequest) String() string { return proto.CompactTextString(m) }
func (*EchoRequest) ProtoMessage() {} func (*EchoRequest) ProtoMessage() {}
func (*EchoRequest) Descriptor() ([]byte, []int) { func (*EchoRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_ae1353846770e6e2, []int{5} return fileDescriptor_2fcc84b9998d60d8, []int{5}
} }
func (m *EchoRequest) XXX_Unmarshal(b []byte) error { func (m *EchoRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -324,7 +324,7 @@ func (m *EchoResponse) Reset() { *m = EchoResponse{} }
func (m *EchoResponse) String() string { return proto.CompactTextString(m) } func (m *EchoResponse) String() string { return proto.CompactTextString(m) }
func (*EchoResponse) ProtoMessage() {} func (*EchoResponse) ProtoMessage() {}
func (*EchoResponse) Descriptor() ([]byte, []int) { func (*EchoResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_ae1353846770e6e2, []int{6} return fileDescriptor_2fcc84b9998d60d8, []int{6}
} }
func (m *EchoResponse) XXX_Unmarshal(b []byte) error { func (m *EchoResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -368,7 +368,7 @@ func (m *SayHelloRequest) Reset() { *m = SayHelloRequest{} }
func (m *SayHelloRequest) String() string { return proto.CompactTextString(m) } func (m *SayHelloRequest) String() string { return proto.CompactTextString(m) }
func (*SayHelloRequest) ProtoMessage() {} func (*SayHelloRequest) ProtoMessage() {}
func (*SayHelloRequest) Descriptor() ([]byte, []int) { func (*SayHelloRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_ae1353846770e6e2, []int{7} return fileDescriptor_2fcc84b9998d60d8, []int{7}
} }
func (m *SayHelloRequest) XXX_Unmarshal(b []byte) error { func (m *SayHelloRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -412,7 +412,7 @@ func (m *SayHelloResponse) Reset() { *m = SayHelloResponse{} }
func (m *SayHelloResponse) String() string { return proto.CompactTextString(m) } func (m *SayHelloResponse) String() string { return proto.CompactTextString(m) }
func (*SayHelloResponse) ProtoMessage() {} func (*SayHelloResponse) ProtoMessage() {}
func (*SayHelloResponse) Descriptor() ([]byte, []int) { func (*SayHelloResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_ae1353846770e6e2, []int{8} return fileDescriptor_2fcc84b9998d60d8, []int{8}
} }
func (m *SayHelloResponse) XXX_Unmarshal(b []byte) error { func (m *SayHelloResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -449,48 +449,47 @@ func (m *SayHelloResponse) GetGreeting() string {
} }
func init() { func init() {
proto.RegisterType((*Dog)(nil), "cosmos_sdk.codec.v1.Dog") proto.RegisterType((*Dog)(nil), "testdata.Dog")
proto.RegisterType((*Cat)(nil), "cosmos_sdk.codec.v1.Cat") proto.RegisterType((*Cat)(nil), "testdata.Cat")
proto.RegisterType((*HasAnimal)(nil), "cosmos_sdk.codec.v1.HasAnimal") proto.RegisterType((*HasAnimal)(nil), "testdata.HasAnimal")
proto.RegisterType((*HasHasAnimal)(nil), "cosmos_sdk.codec.v1.HasHasAnimal") proto.RegisterType((*HasHasAnimal)(nil), "testdata.HasHasAnimal")
proto.RegisterType((*HasHasHasAnimal)(nil), "cosmos_sdk.codec.v1.HasHasHasAnimal") proto.RegisterType((*HasHasHasAnimal)(nil), "testdata.HasHasHasAnimal")
proto.RegisterType((*EchoRequest)(nil), "cosmos_sdk.codec.v1.EchoRequest") proto.RegisterType((*EchoRequest)(nil), "testdata.EchoRequest")
proto.RegisterType((*EchoResponse)(nil), "cosmos_sdk.codec.v1.EchoResponse") proto.RegisterType((*EchoResponse)(nil), "testdata.EchoResponse")
proto.RegisterType((*SayHelloRequest)(nil), "cosmos_sdk.codec.v1.SayHelloRequest") proto.RegisterType((*SayHelloRequest)(nil), "testdata.SayHelloRequest")
proto.RegisterType((*SayHelloResponse)(nil), "cosmos_sdk.codec.v1.SayHelloResponse") proto.RegisterType((*SayHelloResponse)(nil), "testdata.SayHelloResponse")
} }
func init() { proto.RegisterFile("codec/testdata/proto.proto", fileDescriptor_ae1353846770e6e2) } func init() { proto.RegisterFile("proto.proto", fileDescriptor_2fcc84b9998d60d8) }
var fileDescriptor_ae1353846770e6e2 = []byte{ var fileDescriptor_2fcc84b9998d60d8 = []byte{
// 429 bytes of a gzipped FileDescriptorProto // 414 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xc1, 0x6e, 0xd3, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x8e, 0xd3, 0x40,
0x10, 0x40, 0xb3, 0xa4, 0x2d, 0xcd, 0xc4, 0xa2, 0x68, 0xe9, 0x21, 0xf8, 0x60, 0x15, 0x8b, 0x8a, 0x10, 0x86, 0xb3, 0xe4, 0xee, 0x48, 0xc6, 0x16, 0x87, 0x56, 0x07, 0xca, 0xb9, 0xb0, 0x90, 0x25,
0x4a, 0xd0, 0xb5, 0x68, 0xc5, 0x85, 0x5b, 0x29, 0x15, 0x91, 0x10, 0x17, 0x17, 0x09, 0x89, 0x4b, 0xc4, 0x49, 0x70, 0x6b, 0xe9, 0x4e, 0xd7, 0xd0, 0x85, 0x10, 0x91, 0x86, 0xc6, 0xa1, 0xa2, 0x41,
0xb5, 0xb1, 0x07, 0xdb, 0x8a, 0xed, 0x2d, 0x9e, 0x4d, 0xd4, 0xf0, 0x15, 0xfc, 0x0b, 0x3f, 0xc1, 0x1b, 0x67, 0xb0, 0xad, 0xd8, 0xde, 0xe0, 0xdd, 0x44, 0x09, 0x2f, 0x40, 0xcb, 0x63, 0x51, 0xa6,
0xb1, 0x47, 0x8e, 0x28, 0xf9, 0x11, 0xe4, 0x5d, 0x3b, 0x09, 0xa8, 0x2a, 0xbd, 0xd8, 0x33, 0xab, 0xa4, 0x44, 0xc9, 0x8b, 0x20, 0xef, 0xda, 0x71, 0x14, 0x21, 0x94, 0xc6, 0x9e, 0x19, 0xff, 0xff,
0x37, 0xcf, 0xb3, 0x3b, 0x5e, 0x70, 0x23, 0x15, 0x63, 0x14, 0x68, 0x24, 0x1d, 0x4b, 0x2d, 0x83, 0xb7, 0xe3, 0x99, 0x05, 0x6b, 0x5e, 0x08, 0x25, 0x98, 0x7e, 0xd2, 0x8e, 0x42, 0xa9, 0xa6, 0x5c,
0xcb, 0x4a, 0x69, 0x25, 0xcc, 0x93, 0x3f, 0x8a, 0x14, 0x15, 0x8a, 0x2e, 0x28, 0x1e, 0x0b, 0x83, 0x71, 0xe7, 0x3a, 0x12, 0x22, 0x4a, 0xd1, 0xd7, 0xf5, 0xc9, 0xe2, 0xab, 0xcf, 0xf3, 0xb5, 0x11,
0x89, 0xe9, 0x4b, 0xf7, 0x71, 0xa2, 0x54, 0x92, 0xa3, 0x05, 0x47, 0x93, 0x2f, 0x81, 0x2c, 0x67, 0x79, 0xb7, 0xd0, 0x7e, 0x2f, 0x22, 0x4a, 0xe1, 0x4c, 0x26, 0xdf, 0xb1, 0x47, 0x5e, 0x90, 0x9b,
0x96, 0xf7, 0x0f, 0xa1, 0xfb, 0x56, 0x25, 0x9c, 0xc3, 0x06, 0x65, 0xdf, 0x70, 0xc0, 0xf6, 0xd8, 0x6e, 0xa0, 0xe3, 0xb2, 0x96, 0xf3, 0x0c, 0x7b, 0x8f, 0x4c, 0xad, 0x8c, 0xbd, 0x07, 0x68, 0x0f,
0x41, 0x2f, 0x34, 0x71, 0xbd, 0x56, 0xca, 0x02, 0x07, 0xf7, 0xec, 0x5a, 0x1d, 0xfb, 0xaf, 0xa0, 0xb8, 0xa2, 0x3d, 0x78, 0x9c, 0x89, 0x3c, 0x99, 0x61, 0x51, 0x39, 0xea, 0x94, 0x5e, 0xc1, 0x79,
0x7b, 0x2a, 0x35, 0x1f, 0xc0, 0xfd, 0x42, 0x95, 0xd9, 0x18, 0xab, 0xa6, 0xa2, 0x4d, 0xf9, 0x2e, 0x9a, 0x2c, 0x51, 0x6a, 0xd7, 0x79, 0x60, 0x12, 0xef, 0x03, 0x74, 0x47, 0x5c, 0xf6, 0xf3, 0x24,
0x6c, 0xe6, 0xd9, 0x14, 0xc9, 0x54, 0x6d, 0x86, 0x36, 0xf1, 0xdf, 0x41, 0x6f, 0x28, 0xe9, 0xa4, 0xe3, 0x29, 0x7d, 0x03, 0x17, 0x5c, 0x47, 0xda, 0x6b, 0xdd, 0x5d, 0x31, 0xd3, 0x1e, 0xab, 0xdb,
0xcc, 0x0a, 0x99, 0xf3, 0x17, 0xb0, 0x25, 0x4d, 0x64, 0x6a, 0xfb, 0x47, 0xbb, 0xc2, 0xb6, 0x27, 0x63, 0xfd, 0x7c, 0x1d, 0x54, 0x1a, 0x6a, 0x03, 0x59, 0x69, 0x58, 0x3b, 0x20, 0x2b, 0x6f, 0x00,
0xda, 0xf6, 0xc4, 0x49, 0x39, 0x0b, 0x1b, 0x86, 0x3b, 0xc0, 0xae, 0x8c, 0xac, 0x1b, 0xb2, 0x2b, 0xf6, 0x88, 0xcb, 0x86, 0x75, 0x0f, 0x10, 0x73, 0xf9, 0xe5, 0x04, 0x5e, 0x37, 0xae, 0x4d, 0xde,
0xff, 0x14, 0x9c, 0xa1, 0xa4, 0x95, 0xeb, 0x18, 0x20, 0x95, 0x74, 0x71, 0x07, 0x5f, 0x2f, 0x6d, 0x47, 0xb8, 0x34, 0x90, 0x86, 0xf3, 0x16, 0x9e, 0x94, 0x9c, 0x13, 0x59, 0x76, 0x7c, 0xe0, 0xf5,
0x8b, 0xfc, 0x0f, 0xb0, 0x63, 0x25, 0x2b, 0xcf, 0x6b, 0x78, 0x50, 0x7b, 0xee, 0xe8, 0x72, 0xd2, 0x5e, 0x81, 0x35, 0x0c, 0x63, 0x11, 0xe0, 0xb7, 0x05, 0x4a, 0x33, 0x1b, 0x94, 0x92, 0x47, 0xb8,
0xb5, 0x5a, 0xff, 0x19, 0xf4, 0xcf, 0xa2, 0x54, 0x85, 0xf8, 0x75, 0x82, 0x64, 0xcf, 0x06, 0x89, 0x9f, 0x8d, 0x49, 0xbd, 0x1b, 0xb0, 0x8d, 0x50, 0xce, 0x45, 0x2e, 0xf1, 0x3f, 0xca, 0x97, 0x70,
0x64, 0x82, 0xcb, 0xb3, 0xb1, 0xa9, 0x7f, 0x00, 0x8e, 0x05, 0xe9, 0x52, 0x95, 0x84, 0xb7, 0x90, 0x39, 0xe6, 0xeb, 0x11, 0xa6, 0xe9, 0x1e, 0x5b, 0x6f, 0x83, 0x1c, 0x6c, 0x83, 0xc1, 0xd3, 0x46,
0xfb, 0xb0, 0x73, 0x2e, 0x67, 0x43, 0xcc, 0xf3, 0xa5, 0xb6, 0x9d, 0x06, 0x5b, 0x9b, 0x86, 0x80, 0x56, 0x41, 0x1d, 0xe8, 0x44, 0x05, 0xa2, 0x4a, 0xf2, 0xa8, 0xd2, 0xee, 0xf3, 0xbb, 0x1f, 0x04,
0x87, 0x2b, 0xac, 0x91, 0xba, 0xb0, 0x9d, 0x54, 0x88, 0x3a, 0x2b, 0x93, 0x86, 0x5d, 0xe6, 0x47, 0xac, 0x4f, 0x28, 0xd5, 0x18, 0x8b, 0x65, 0x12, 0x22, 0x7d, 0x80, 0xb3, 0xb2, 0x21, 0xfa, 0x8c,
0x3f, 0x18, 0xf4, 0x3f, 0x22, 0xe9, 0x73, 0xac, 0xa6, 0x59, 0x84, 0xfc, 0x3d, 0x6c, 0xd4, 0x0d, 0xd5, 0x57, 0x85, 0x1d, 0xfc, 0x89, 0xf3, 0xfc, 0xb8, 0x5c, 0x1d, 0xd1, 0x87, 0x4e, 0x7d, 0x2c,
0xf1, 0x3d, 0x71, 0xc3, 0x5f, 0x23, 0xd6, 0x36, 0xe5, 0x3e, 0xb9, 0x85, 0x68, 0x3e, 0xfc, 0x09, 0xbd, 0x6e, 0x34, 0x47, 0x1d, 0x3b, 0xce, 0xbf, 0x3e, 0x19, 0xc4, 0xbb, 0xe1, 0xaf, 0xad, 0x4b,
0xb6, 0xdb, 0x66, 0xf8, 0xd3, 0x1b, 0xf1, 0x7f, 0xb6, 0xe4, 0xee, 0xff, 0x87, 0xb2, 0xe2, 0x37, 0x36, 0x5b, 0x97, 0xfc, 0xd9, 0xba, 0xe4, 0xe7, 0xce, 0x6d, 0x6d, 0x76, 0x6e, 0xeb, 0xf7, 0xce,
0x67, 0x3f, 0xe7, 0x1e, 0xbb, 0x9e, 0x7b, 0xec, 0xf7, 0xdc, 0x63, 0xdf, 0x17, 0x5e, 0xe7, 0x7a, 0x6d, 0x7d, 0x7e, 0x1d, 0x25, 0x2a, 0x5e, 0x4c, 0x58, 0x28, 0x32, 0x3f, 0x14, 0x32, 0x13, 0xb2,
0xe1, 0x75, 0x7e, 0x2d, 0xbc, 0xce, 0xe7, 0xe7, 0x49, 0xa6, 0xd3, 0xc9, 0x48, 0x44, 0xaa, 0x08, 0x7a, 0xdd, 0xca, 0xe9, 0xcc, 0x0f, 0xc5, 0x14, 0x43, 0xbf, 0xe6, 0x4e, 0x2e, 0xf4, 0x5a, 0xee,
0xac, 0xaa, 0x79, 0x1d, 0x52, 0x3c, 0x0e, 0xfe, 0xbe, 0x25, 0xa3, 0x2d, 0x33, 0xc2, 0xe3, 0x3f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x38, 0x43, 0xe8, 0xad, 0xf8, 0x02, 0x00, 0x00,
0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0x4f, 0x91, 0x9b, 0x3e, 0x03, 0x00, 0x00,
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
@ -519,7 +518,7 @@ func NewTestServiceClient(cc grpc1.ClientConn) TestServiceClient {
func (c *testServiceClient) Echo(ctx context.Context, in *EchoRequest, opts ...grpc.CallOption) (*EchoResponse, error) { func (c *testServiceClient) Echo(ctx context.Context, in *EchoRequest, opts ...grpc.CallOption) (*EchoResponse, error) {
out := new(EchoResponse) out := new(EchoResponse)
err := c.cc.Invoke(ctx, "/cosmos_sdk.codec.v1.TestService/Echo", in, out, opts...) err := c.cc.Invoke(ctx, "/testdata.TestService/Echo", in, out, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -528,7 +527,7 @@ func (c *testServiceClient) Echo(ctx context.Context, in *EchoRequest, opts ...g
func (c *testServiceClient) SayHello(ctx context.Context, in *SayHelloRequest, opts ...grpc.CallOption) (*SayHelloResponse, error) { func (c *testServiceClient) SayHello(ctx context.Context, in *SayHelloRequest, opts ...grpc.CallOption) (*SayHelloResponse, error) {
out := new(SayHelloResponse) out := new(SayHelloResponse)
err := c.cc.Invoke(ctx, "/cosmos_sdk.codec.v1.TestService/SayHello", in, out, opts...) err := c.cc.Invoke(ctx, "/testdata.TestService/SayHello", in, out, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -566,7 +565,7 @@ func _TestService_Echo_Handler(srv interface{}, ctx context.Context, dec func(in
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/cosmos_sdk.codec.v1.TestService/Echo", FullMethod: "/testdata.TestService/Echo",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(TestServiceServer).Echo(ctx, req.(*EchoRequest)) return srv.(TestServiceServer).Echo(ctx, req.(*EchoRequest))
@ -584,7 +583,7 @@ func _TestService_SayHello_Handler(srv interface{}, ctx context.Context, dec fun
} }
info := &grpc.UnaryServerInfo{ info := &grpc.UnaryServerInfo{
Server: srv, Server: srv,
FullMethod: "/cosmos_sdk.codec.v1.TestService/SayHello", FullMethod: "/testdata.TestService/SayHello",
} }
handler := func(ctx context.Context, req interface{}) (interface{}, error) { handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(TestServiceServer).SayHello(ctx, req.(*SayHelloRequest)) return srv.(TestServiceServer).SayHello(ctx, req.(*SayHelloRequest))
@ -593,7 +592,7 @@ func _TestService_SayHello_Handler(srv interface{}, ctx context.Context, dec fun
} }
var _TestService_serviceDesc = grpc.ServiceDesc{ var _TestService_serviceDesc = grpc.ServiceDesc{
ServiceName: "cosmos_sdk.codec.v1.TestService", ServiceName: "testdata.TestService",
HandlerType: (*TestServiceServer)(nil), HandlerType: (*TestServiceServer)(nil),
Methods: []grpc.MethodDesc{ Methods: []grpc.MethodDesc{
{ {
@ -606,7 +605,7 @@ var _TestService_serviceDesc = grpc.ServiceDesc{
}, },
}, },
Streams: []grpc.StreamDesc{}, Streams: []grpc.StreamDesc{},
Metadata: "codec/testdata/proto.proto", Metadata: "proto.proto",
} }
func (m *Dog) Marshal() (dAtA []byte, err error) { func (m *Dog) Marshal() (dAtA []byte, err error) {

2
codec/testdata/proto.proto vendored
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
package cosmos_sdk.codec.v1; package testdata;
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";

4
codec/types/types_test.go
View File

@ -124,7 +124,7 @@ func TestAny_ProtoJSON(t *testing.T) {
jm := &jsonpb.Marshaler{} jm := &jsonpb.Marshaler{}
json, err := jm.MarshalToString(any) json, err := jm.MarshalToString(any)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "{\"@type\":\"/cosmos_sdk.codec.v1.Dog\",\"name\":\"Spot\"}", json) require.Equal(t, "{\"@type\":\"/testdata.Dog\",\"name\":\"Spot\"}", json)
registry := testdata.NewTestInterfaceRegistry() registry := testdata.NewTestInterfaceRegistry()
jum := &jsonpb.Unmarshaler{} jum := &jsonpb.Unmarshaler{}
@ -143,7 +143,7 @@ func TestAny_ProtoJSON(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
json, err = jm.MarshalToString(ha) json, err = jm.MarshalToString(ha)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "{\"animal\":{\"@type\":\"/cosmos_sdk.codec.v1.Dog\",\"name\":\"Spot\"}}", json) require.Equal(t, "{\"animal\":{\"@type\":\"/testdata.Dog\",\"name\":\"Spot\"}}", json)
require.NoError(t, err) require.NoError(t, err)
var ha2 testdata.HasAnimal var ha2 testdata.HasAnimal

7
scripts/protocgen.sh
View File

@ -12,5 +12,12 @@ Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
$(find "${dir}" -maxdepth 1 -name '*.proto') $(find "${dir}" -maxdepth 1 -name '*.proto')
done done
# generate codec/testdata proto code
protoc -I "proto" -I "third_party/proto" -I "codec/testdata" --gocosmos_out=plugins=interfacetype+grpc,\
Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. ./codec/testdata/proto.proto
# move proto files to the right places
cp -r github.com/cosmos/cosmos-sdk/* ./ cp -r github.com/cosmos/cosmos-sdk/* ./
rm -rf github.com rm -rf github.com