diff --git a/codec/unknownproto/unknown_fields.go b/codec/unknownproto/unknown_fields.go index 2a7d09607..4faaca0b8 100644 --- a/codec/unknownproto/unknown_fields.go +++ b/codec/unknownproto/unknown_fields.go @@ -206,6 +206,20 @@ var checks = [...]map[descriptor.FieldDescriptorProto_Type]bool{ descriptor.FieldDescriptorProto_TYPE_STRING: true, descriptor.FieldDescriptorProto_TYPE_BYTES: true, descriptor.FieldDescriptorProto_TYPE_MESSAGE: true, + // The following types can be packed repeated. + // ref: "Only repeated fields of primitive numeric types (types which use the varint, 32-bit, or 64-bit wire types) can be declared "packed"." + // ref: https://developers.google.com/protocol-buffers/docs/encoding#packed + descriptor.FieldDescriptorProto_TYPE_INT32: true, + descriptor.FieldDescriptorProto_TYPE_INT64: true, + descriptor.FieldDescriptorProto_TYPE_UINT32: true, + descriptor.FieldDescriptorProto_TYPE_UINT64: true, + descriptor.FieldDescriptorProto_TYPE_SINT32: true, + descriptor.FieldDescriptorProto_TYPE_SINT64: true, + descriptor.FieldDescriptorProto_TYPE_BOOL: true, + descriptor.FieldDescriptorProto_TYPE_ENUM: true, + descriptor.FieldDescriptorProto_TYPE_FIXED64: true, + descriptor.FieldDescriptorProto_TYPE_SFIXED64: true, + descriptor.FieldDescriptorProto_TYPE_DOUBLE: true, }, // "3 Start group: groups (deprecated)" diff --git a/codec/unknownproto/unknown_fields_test.go b/codec/unknownproto/unknown_fields_test.go index 1969a0ba2..c5372eb9b 100644 --- a/codec/unknownproto/unknown_fields_test.go +++ b/codec/unknownproto/unknown_fields_test.go @@ -446,9 +446,9 @@ func TestRejectUnknownFieldsNested(t *testing.T) { recv: new(testdata.TestVersion1), wantErr: &errMismatchedWireType{ Type: "*testdata.TestVersion3", - TagNum: 1, - GotWireType: 2, - WantWireType: 0, + TagNum: 8, + GotWireType: 7, + WantWireType: 2, }, }, { @@ -463,13 +463,8 @@ func TestRejectUnknownFieldsNested(t *testing.T) { }, }, }, - recv: new(testdata.TestVersion4LoneNesting), - wantErr: &errMismatchedWireType{ - Type: "*testdata.TestVersion4LoneNesting_Inner1_InnerInner", - TagNum: 1, - GotWireType: 2, - WantWireType: 0, - }, + recv: new(testdata.TestVersion4LoneNesting), + wantErr: nil, }, { name: "From nested proto message, message index 1", @@ -483,13 +478,8 @@ func TestRejectUnknownFieldsNested(t *testing.T) { }, }, }, - recv: new(testdata.TestVersion4LoneNesting), - wantErr: &errMismatchedWireType{ - Type: "*testdata.TestVersion4LoneNesting_Inner2_InnerInner", - TagNum: 2, - GotWireType: 2, - WantWireType: 0, - }, + recv: new(testdata.TestVersion4LoneNesting), + wantErr: nil, }, } @@ -684,9 +674,9 @@ func TestMismatchedTypes_Nested(t *testing.T) { recv: new(testdata.TestVersion1), wantErr: &errMismatchedWireType{ Type: "*testdata.TestVersion3", - TagNum: 1, - GotWireType: 2, - WantWireType: 0, + TagNum: 8, + GotWireType: 7, + WantWireType: 2, }, }, { @@ -701,13 +691,8 @@ func TestMismatchedTypes_Nested(t *testing.T) { }, }, }, - recv: new(testdata.TestVersion4LoneNesting), - wantErr: &errMismatchedWireType{ - Type: "*testdata.TestVersion4LoneNesting_Inner1_InnerInner", - TagNum: 1, - GotWireType: 2, - WantWireType: 0, - }, + recv: new(testdata.TestVersion4LoneNesting), + wantErr: nil, }, { name: "From nested proto message, message index 1", @@ -721,13 +706,8 @@ func TestMismatchedTypes_Nested(t *testing.T) { }, }, }, - recv: new(testdata.TestVersion4LoneNesting), - wantErr: &errMismatchedWireType{ - Type: "*testdata.TestVersion4LoneNesting_Inner2_InnerInner", - TagNum: 2, - GotWireType: 2, - WantWireType: 0, - }, + recv: new(testdata.TestVersion4LoneNesting), + wantErr: nil, }, } @@ -746,6 +726,19 @@ func TestMismatchedTypes_Nested(t *testing.T) { } } +// Issue https://github.com/cosmos/cosmos-sdk/issues/7222, we need to ensure that repeated +// uint64 are recognized as packed. +func TestPackedEncoding(t *testing.T) { + data := testdata.TestRepeatedUints{Nums: []uint64{12, 13}} + + marshalled, err := data.Marshal() + require.NoError(t, err) + + unmarshalled := &testdata.TestRepeatedUints{} + _, err = RejectUnknownFields(marshalled, unmarshalled, false) + require.NoError(t, err) +} + func mustMarshal(msg proto.Message) []byte { blob, err := proto.Marshal(msg) if err != nil { diff --git a/testutil/testdata/proto.pb.go b/testutil/testdata/proto.pb.go index 30b94037d..d24ec3b6c 100644 --- a/testutil/testdata/proto.pb.go +++ b/testutil/testdata/proto.pb.go @@ -3338,6 +3338,50 @@ func (m *TestUpdatedAuthInfo) GetNewField_1024() []byte { return nil } +type TestRepeatedUints struct { + Nums []uint64 `protobuf:"varint,1,rep,packed,name=nums,proto3" json:"nums,omitempty"` +} + +func (m *TestRepeatedUints) Reset() { *m = TestRepeatedUints{} } +func (m *TestRepeatedUints) String() string { return proto.CompactTextString(m) } +func (*TestRepeatedUints) ProtoMessage() {} +func (*TestRepeatedUints) Descriptor() ([]byte, []int) { + return fileDescriptor_2fcc84b9998d60d8, []int{36} +} +func (m *TestRepeatedUints) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TestRepeatedUints) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TestRepeatedUints.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TestRepeatedUints) XXX_Merge(src proto.Message) { + xxx_messageInfo_TestRepeatedUints.Merge(m, src) +} +func (m *TestRepeatedUints) XXX_Size() int { + return m.Size() +} +func (m *TestRepeatedUints) XXX_DiscardUnknown() { + xxx_messageInfo_TestRepeatedUints.DiscardUnknown(m) +} + +var xxx_messageInfo_TestRepeatedUints proto.InternalMessageInfo + +func (m *TestRepeatedUints) GetNums() []uint64 { + if m != nil { + return m.Nums + } + return nil +} + func init() { proto.RegisterEnum("testdata.Customer2_City", Customer2_City_name, Customer2_City_value) proto.RegisterType((*Dog)(nil), "testdata.Dog") @@ -3385,136 +3429,139 @@ func init() { proto.RegisterType((*TestUpdatedTxRaw)(nil), "testdata.TestUpdatedTxRaw") proto.RegisterType((*TestUpdatedTxBody)(nil), "testdata.TestUpdatedTxBody") proto.RegisterType((*TestUpdatedAuthInfo)(nil), "testdata.TestUpdatedAuthInfo") + proto.RegisterType((*TestRepeatedUints)(nil), "testdata.TestRepeatedUints") } func init() { proto.RegisterFile("proto.proto", fileDescriptor_2fcc84b9998d60d8) } var fileDescriptor_2fcc84b9998d60d8 = []byte{ - // 1983 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcf, 0x6f, 0x1b, 0xb9, - 0xf5, 0xf7, 0x68, 0x24, 0x5b, 0x7a, 0x56, 0x64, 0x85, 0x9b, 0xef, 0x7e, 0x27, 0xca, 0xc6, 0xf1, - 0x0e, 0xb2, 0x89, 0xba, 0xd8, 0x48, 0xd1, 0x48, 0x01, 0x8a, 0x1c, 0x8a, 0x48, 0x8e, 0xbd, 0x0e, - 0x9a, 0x38, 0xc5, 0x24, 0x4d, 0x8b, 0x5c, 0x84, 0xd1, 0x0c, 0x25, 0x0d, 0x22, 0x91, 0xee, 0x90, - 0x4a, 0xac, 0x9e, 0x8a, 0xf6, 0xd0, 0xeb, 0x5e, 0x8a, 0x02, 0xbd, 0xf5, 0xd8, 0x53, 0xb1, 0xff, - 0x41, 0x6f, 0xcd, 0xa5, 0x40, 0x2e, 0x05, 0x0a, 0x14, 0x08, 0x8a, 0xe4, 0xda, 0xbf, 0xa0, 0x45, - 0xb1, 0x05, 0x39, 0x9c, 0x1f, 0xb2, 0x25, 0xaf, 0xe2, 0x6d, 0x37, 0x30, 0xd0, 0x8b, 0x44, 0xbe, - 0xf9, 0xf0, 0xc3, 0xc7, 0xf7, 0x6b, 0x86, 0x24, 0xac, 0x1f, 0x04, 0x94, 0xd3, 0x9a, 0xfc, 0x45, - 0x79, 0x8e, 0x19, 0xf7, 0x1c, 0xee, 0x54, 0x2e, 0x0c, 0xe8, 0x80, 0x4a, 0x61, 0x5d, 0xb4, 0xc2, - 0xe7, 0x95, 0x8b, 0x03, 0x4a, 0x07, 0x23, 0x5c, 0x97, 0xbd, 0xde, 0xa4, 0x5f, 0x77, 0xc8, 0x54, - 0x3d, 0xaa, 0xb8, 0x94, 0x8d, 0x29, 0xab, 0xf3, 0xc3, 0xfa, 0xf3, 0x46, 0x0f, 0x73, 0xa7, 0x51, - 0xe7, 0x87, 0xe1, 0x33, 0xf3, 0x06, 0xe8, 0x77, 0xe9, 0x00, 0x21, 0xc8, 0x32, 0xff, 0xa7, 0xd8, - 0xd0, 0xb6, 0xb4, 0x6a, 0xc1, 0x96, 0x6d, 0x21, 0x23, 0xce, 0x18, 0x1b, 0x99, 0x50, 0x26, 0xda, - 0xe6, 0x2d, 0xd0, 0xb7, 0x1d, 0x8e, 0x0c, 0x58, 0x1b, 0x53, 0xe2, 0x3f, 0xc3, 0x81, 0x1a, 0x11, - 0x75, 0xd1, 0x05, 0xc8, 0x8d, 0xfc, 0xe7, 0x98, 0xc9, 0x51, 0x39, 0x3b, 0xec, 0x98, 0x9f, 0x43, - 0x61, 0xcf, 0x61, 0x6d, 0xe2, 0x8f, 0x9d, 0x11, 0xfa, 0x0c, 0x56, 0x1d, 0xd9, 0x92, 0x63, 0xd7, - 0xad, 0x0b, 0xb5, 0x50, 0xf5, 0x5a, 0xa4, 0x7a, 0xad, 0x4d, 0xa6, 0xb6, 0xc2, 0xa0, 0x22, 0x68, - 0x87, 0x92, 0x4c, 0xb7, 0xb5, 0x43, 0x73, 0x1b, 0x8a, 0x7b, 0x0e, 0x4b, 0xb8, 0x9a, 0x00, 0x43, - 0x87, 0x75, 0x97, 0xe0, 0x2b, 0x0c, 0xa3, 0x41, 0xe6, 0x03, 0xd8, 0x08, 0x49, 0x12, 0x9e, 0xdb, - 0x50, 0x12, 0x3c, 0x4b, 0x72, 0x15, 0x87, 0xa9, 0xb1, 0xe6, 0x75, 0x58, 0xdf, 0x71, 0x87, 0xd4, - 0xc6, 0x3f, 0x99, 0x60, 0x16, 0xda, 0x06, 0x33, 0xe6, 0x0c, 0x70, 0x6c, 0x9b, 0xb0, 0x6b, 0x56, - 0xa1, 0x18, 0x02, 0xd9, 0x01, 0x25, 0x0c, 0x9f, 0x80, 0xfc, 0x04, 0x36, 0x1e, 0x39, 0xd3, 0x3d, - 0x3c, 0x1a, 0xc5, 0xb4, 0x91, 0x37, 0xb4, 0x94, 0x37, 0x6a, 0x50, 0x4e, 0x60, 0x8a, 0xb4, 0x02, - 0xf9, 0x41, 0x80, 0x31, 0xf7, 0xc9, 0x40, 0x61, 0xe3, 0xbe, 0xb9, 0x03, 0xa5, 0xc7, 0x98, 0x71, - 0xb1, 0x04, 0xc5, 0xda, 0x04, 0x70, 0xc8, 0x74, 0x29, 0xfb, 0x39, 0x64, 0xaa, 0x16, 0xbc, 0x03, - 0x1b, 0x31, 0x8d, 0x9a, 0xd5, 0x9a, 0xe3, 0x87, 0x0f, 0x6a, 0x51, 0xc8, 0xd6, 0x62, 0x63, 0xa5, - 0xdd, 0xf0, 0x04, 0xd6, 0x04, 0xcd, 0x03, 0x36, 0x40, 0xdf, 0x87, 0x35, 0xe6, 0x0f, 0x08, 0x0e, - 0x98, 0xa1, 0x6d, 0xe9, 0xd5, 0x62, 0xa7, 0xf1, 0x8f, 0xd7, 0x57, 0x6e, 0x0c, 0x7c, 0x3e, 0x9c, - 0xf4, 0x6a, 0x2e, 0x1d, 0xd7, 0x55, 0x04, 0x87, 0x7f, 0x37, 0x98, 0xf7, 0xac, 0xce, 0xa7, 0x07, - 0x98, 0xd5, 0xda, 0xae, 0xdb, 0xf6, 0xbc, 0x00, 0x33, 0x66, 0x47, 0x0c, 0x66, 0x0f, 0xce, 0x77, - 0x1c, 0xef, 0xc1, 0x64, 0xc4, 0xfd, 0x47, 0xfe, 0x80, 0x38, 0x7c, 0x12, 0x60, 0xb4, 0x09, 0xc0, - 0xa2, 0x8e, 0x9a, 0xc4, 0x4e, 0x49, 0xd0, 0x75, 0xd8, 0x18, 0x3b, 0x23, 0xdf, 0xf5, 0xe9, 0x84, - 0x75, 0xfb, 0x3e, 0x1e, 0x79, 0x46, 0x6e, 0x4b, 0xab, 0x16, 0xed, 0x52, 0x2c, 0xde, 0x15, 0xd2, - 0xdb, 0xd9, 0x57, 0xbf, 0xbd, 0xa2, 0x99, 0x1c, 0x0a, 0xdb, 0x13, 0xc6, 0xe9, 0x18, 0x07, 0x0d, - 0x54, 0x82, 0x8c, 0xef, 0xc9, 0x45, 0xe7, 0xec, 0x8c, 0xef, 0xcd, 0x4b, 0x1c, 0xf4, 0x1d, 0x28, - 0xb3, 0x49, 0x8f, 0xb9, 0x81, 0x7f, 0xc0, 0x7d, 0x4a, 0xba, 0x7d, 0x8c, 0x0d, 0x7d, 0x4b, 0xab, - 0x66, 0xec, 0x8d, 0xb4, 0x7c, 0x17, 0xcb, 0xb0, 0x38, 0x70, 0xa6, 0x63, 0x4c, 0xb8, 0xb1, 0x16, - 0x86, 0x85, 0xea, 0x9a, 0x5f, 0x66, 0x92, 0x69, 0xad, 0x63, 0xd3, 0x56, 0x20, 0xef, 0x13, 0x6f, - 0xc2, 0x78, 0x30, 0x55, 0xd9, 0x17, 0xf7, 0x63, 0x95, 0xf4, 0x94, 0x4a, 0x17, 0x20, 0xd7, 0xc7, - 0x2f, 0x70, 0x60, 0x64, 0xa5, 0x1e, 0x61, 0x07, 0x5d, 0x82, 0x7c, 0x80, 0x19, 0x0e, 0x9e, 0x63, - 0xcf, 0xf8, 0x75, 0x5e, 0xe6, 0x5d, 0x2c, 0x40, 0x9f, 0x41, 0xd6, 0xf5, 0xf9, 0xd4, 0x58, 0xdd, - 0xd2, 0xaa, 0x25, 0xcb, 0x48, 0x1c, 0x1c, 0x6b, 0x55, 0xdb, 0xf6, 0xf9, 0xd4, 0x96, 0x28, 0x74, - 0x1b, 0xce, 0x8d, 0x7d, 0xe6, 0xe2, 0xd1, 0xc8, 0x21, 0x98, 0x4e, 0x98, 0x01, 0x27, 0xc4, 0xd7, - 0x2c, 0xd4, 0xfc, 0x1c, 0xb2, 0x82, 0x09, 0xe5, 0x21, 0x7b, 0xdf, 0xa1, 0xac, 0xbc, 0x82, 0x4a, - 0x00, 0xf7, 0x29, 0x6b, 0x93, 0x01, 0x1e, 0x61, 0x56, 0xd6, 0x50, 0x11, 0xf2, 0x3f, 0x70, 0x46, - 0xb4, 0x3d, 0xe2, 0xb4, 0x9c, 0x41, 0x00, 0xab, 0x0f, 0x28, 0x73, 0xe9, 0x8b, 0xb2, 0x8e, 0xd6, - 0x61, 0x6d, 0xdf, 0xf1, 0x03, 0xda, 0xf3, 0xcb, 0x59, 0xb3, 0x06, 0xf9, 0x7d, 0xcc, 0x38, 0xf6, - 0x5a, 0xed, 0x65, 0x1c, 0x65, 0xfe, 0x59, 0x8b, 0x06, 0x34, 0x97, 0x1a, 0x80, 0x4c, 0xc8, 0x38, - 0x2d, 0x23, 0xbb, 0xa5, 0x57, 0xd7, 0x2d, 0x94, 0x58, 0x24, 0x9a, 0xd4, 0xce, 0x38, 0x2d, 0xd4, - 0x84, 0x9c, 0x4f, 0x3c, 0x7c, 0x68, 0xe4, 0x24, 0xec, 0xf2, 0x51, 0x58, 0xb3, 0x5d, 0xbb, 0x27, - 0x9e, 0xef, 0x10, 0x1e, 0x4c, 0xed, 0x10, 0x5b, 0xb9, 0x0f, 0x90, 0x08, 0x51, 0x19, 0xf4, 0x67, - 0x78, 0x2a, 0x75, 0xd1, 0x6d, 0xd1, 0x44, 0x55, 0xc8, 0x3d, 0x77, 0x46, 0x93, 0x50, 0x9b, 0xf9, - 0x73, 0x87, 0x80, 0xdb, 0x99, 0xef, 0x6a, 0xe6, 0xd3, 0x68, 0x59, 0xd6, 0x72, 0xcb, 0xfa, 0x14, - 0x56, 0x89, 0xc4, 0xcb, 0x98, 0x99, 0x43, 0xdf, 0x6c, 0xdb, 0x0a, 0x61, 0xee, 0x46, 0xdc, 0x8d, - 0xe3, 0xdc, 0x09, 0xcf, 0x02, 0x35, 0xad, 0x84, 0xe7, 0x4e, 0xec, 0xab, 0xce, 0x31, 0x9e, 0x32, - 0xe8, 0xa2, 0x50, 0x86, 0x81, 0x2d, 0x9a, 0xf3, 0x62, 0xda, 0xf4, 0x62, 0xe7, 0x9d, 0x92, 0x41, - 0xb8, 0xb3, 0xb7, 0xd8, 0x9d, 0x1d, 0x3b, 0xd3, 0x6b, 0x99, 0x24, 0xb6, 0xe5, 0xdc, 0x59, 0x44, - 0x6e, 0x8b, 0x59, 0x34, 0x5b, 0x34, 0x97, 0xb0, 0x64, 0x27, 0xb2, 0x80, 0xc8, 0xc9, 0x80, 0x4e, - 0x38, 0x96, 0x39, 0x59, 0xb0, 0xc3, 0x8e, 0xf9, 0xe3, 0xd8, 0xbe, 0x9d, 0x53, 0xd8, 0x37, 0x61, - 0x57, 0x16, 0xd0, 0x63, 0x0b, 0x98, 0x3f, 0x4f, 0x55, 0x94, 0xe6, 0x52, 0x71, 0x51, 0x82, 0x0c, - 0xeb, 0xab, 0xd2, 0x95, 0x61, 0x7d, 0xf4, 0x11, 0x14, 0xd8, 0x24, 0x70, 0x87, 0x4e, 0x30, 0xc0, - 0xaa, 0x92, 0x24, 0x02, 0xb4, 0x05, 0xeb, 0x1e, 0x66, 0xdc, 0x27, 0x8e, 0xa8, 0x6e, 0xb2, 0xa4, - 0x16, 0xec, 0xb4, 0x08, 0x5d, 0x83, 0x92, 0x1b, 0x60, 0xcf, 0xe7, 0x5d, 0xd7, 0x09, 0xbc, 0x2e, - 0xa1, 0x61, 0xd1, 0xdb, 0x5b, 0xb1, 0x8b, 0xa1, 0x7c, 0xdb, 0x09, 0xbc, 0x7d, 0x8a, 0x2e, 0x43, - 0xc1, 0x1d, 0x8a, 0xb7, 0x96, 0x80, 0xe4, 0x15, 0x24, 0x1f, 0x8a, 0xf6, 0x29, 0xaa, 0x43, 0x9e, - 0x06, 0xfe, 0xc0, 0x27, 0xce, 0xc8, 0x28, 0x1c, 0x7d, 0xfd, 0xc4, 0xa5, 0xda, 0x8e, 0x41, 0x9d, - 0x42, 0x5c, 0x65, 0xcd, 0xbf, 0x67, 0xa0, 0x28, 0xde, 0x44, 0x4f, 0x70, 0xc0, 0x7c, 0x4a, 0x1a, - 0xe1, 0x37, 0x87, 0xa6, 0xbe, 0x39, 0xd0, 0x55, 0xd0, 0x1c, 0x65, 0xdc, 0x0f, 0x13, 0xce, 0xf4, - 0x00, 0x5b, 0x73, 0x04, 0xaa, 0xa7, 0x1c, 0xbc, 0x10, 0xd5, 0x13, 0x28, 0x57, 0x05, 0xd7, 0x42, - 0x94, 0x8b, 0x3e, 0x05, 0xcd, 0x53, 0xa5, 0x62, 0x01, 0xaa, 0x93, 0x7d, 0xf9, 0xfa, 0xca, 0x8a, - 0xad, 0x79, 0xa8, 0x04, 0x1a, 0x96, 0xf5, 0x38, 0xb7, 0xb7, 0x62, 0x6b, 0x18, 0x5d, 0x03, 0xad, - 0x2f, 0x4d, 0xb8, 0x70, 0xac, 0xc0, 0xf5, 0x91, 0x09, 0xda, 0x40, 0xda, 0x71, 0x51, 0x41, 0xd6, - 0x06, 0x42, 0xdb, 0xa1, 0x51, 0x38, 0x59, 0xdb, 0x21, 0xba, 0x0e, 0xda, 0x33, 0xa3, 0xb8, 0xd0, - 0xe6, 0x9d, 0xec, 0xab, 0xd7, 0x57, 0x34, 0x5b, 0x7b, 0xd6, 0xc9, 0x81, 0xce, 0x26, 0x63, 0xf3, - 0x17, 0xfa, 0x8c, 0xb9, 0xad, 0x77, 0x35, 0xb7, 0xb5, 0x94, 0xb9, 0xad, 0xa5, 0xcc, 0x6d, 0x09, - 0x73, 0x5f, 0xfd, 0x3a, 0x73, 0x5b, 0xa7, 0x32, 0xb4, 0xf5, 0xbe, 0x0c, 0x8d, 0x2e, 0x41, 0x81, - 0xe0, 0x17, 0xea, 0x33, 0xe6, 0xe2, 0x96, 0x56, 0xcd, 0xda, 0x79, 0x82, 0x5f, 0xc8, 0x0f, 0x98, - 0xc8, 0x0b, 0xbf, 0x9a, 0xf5, 0x42, 0xf3, 0x5d, 0xbd, 0xd0, 0x5c, 0xca, 0x0b, 0xcd, 0xa5, 0xbc, - 0xd0, 0x5c, 0xca, 0x0b, 0xcd, 0x53, 0x79, 0xa1, 0xf9, 0xde, 0xbc, 0x70, 0x03, 0x10, 0xa1, 0xa4, - 0xeb, 0x06, 0x3e, 0xf7, 0x5d, 0x67, 0xa4, 0xdc, 0xf1, 0x4b, 0x59, 0xbb, 0xec, 0x32, 0xa1, 0x64, - 0x5b, 0x3d, 0x99, 0xf1, 0xcb, 0x3f, 0x33, 0x50, 0x49, 0xab, 0x7f, 0x9f, 0x12, 0xfc, 0x90, 0xe0, - 0x87, 0xfd, 0x27, 0xe2, 0x55, 0x7e, 0x46, 0xbd, 0x74, 0x66, 0xac, 0xff, 0xaf, 0x55, 0xf8, 0xff, - 0xa3, 0xd6, 0xdf, 0x97, 0x6f, 0xab, 0xc1, 0x19, 0x31, 0x7d, 0x23, 0x49, 0x88, 0x8f, 0xe7, 0xa3, - 0x52, 0x6b, 0x3a, 0x23, 0xb9, 0x81, 0xee, 0xc0, 0xaa, 0x4f, 0x08, 0x0e, 0x1a, 0x46, 0x49, 0x92, - 0x57, 0xbf, 0x76, 0x65, 0xb5, 0x7b, 0x12, 0x6f, 0xab, 0x71, 0x31, 0x83, 0x65, 0x6c, 0xbc, 0x13, - 0x83, 0xa5, 0x18, 0xac, 0xca, 0xef, 0x34, 0x58, 0x0d, 0x49, 0x53, 0xdf, 0x49, 0xfa, 0xc2, 0xef, - 0xa4, 0x7b, 0xe2, 0x93, 0x9f, 0xe0, 0x40, 0x79, 0xbf, 0xb9, 0xac, 0xc6, 0xe1, 0x9f, 0xfc, 0xb1, - 0x43, 0x86, 0xca, 0x4d, 0xb1, 0x11, 0x88, 0x84, 0xa9, 0xc9, 0x0b, 0xd1, 0xe4, 0x72, 0x4f, 0xa6, - 0x26, 0x17, 0xed, 0xca, 0xef, 0x23, 0x5d, 0xad, 0x63, 0x70, 0x03, 0xd6, 0x5c, 0x3a, 0x21, 0xd1, - 0x26, 0xb1, 0x60, 0x47, 0xdd, 0xd3, 0x6a, 0x6c, 0xfd, 0x27, 0x34, 0x8e, 0xf2, 0xef, 0xab, 0xd9, - 0xfc, 0x6b, 0xfd, 0x2f, 0xff, 0xce, 0x50, 0xfe, 0xb5, 0xbe, 0x71, 0xfe, 0xb5, 0xbe, 0xe5, 0xfc, - 0x6b, 0x7d, 0xa3, 0xfc, 0xd3, 0x17, 0xe6, 0xdf, 0x97, 0xff, 0xb5, 0xfc, 0x6b, 0x2d, 0x95, 0x7f, - 0xd6, 0x89, 0xf9, 0x77, 0x21, 0x7d, 0x70, 0xa0, 0xab, 0x43, 0x82, 0x28, 0x03, 0xff, 0xa4, 0x85, - 0x87, 0x84, 0x6a, 0xbe, 0xdd, 0xbb, 0xa7, 0xdb, 0x0e, 0xbd, 0xf7, 0x6d, 0x49, 0xb4, 0x9e, 0xbf, - 0x6a, 0x33, 0xdf, 0x53, 0xbb, 0x77, 0x1b, 0x3f, 0xf2, 0xf9, 0x70, 0xe7, 0x90, 0x07, 0x4e, 0x9b, - 0x4c, 0xbf, 0xd5, 0xb5, 0x5d, 0x4d, 0xd6, 0x96, 0xc2, 0xb5, 0xc9, 0x34, 0xd6, 0xe8, 0x9d, 0x57, - 0xf7, 0x18, 0x8a, 0xe9, 0xf1, 0xa8, 0x2a, 0x16, 0x70, 0xc2, 0x31, 0x6e, 0x54, 0x01, 0x1c, 0xb1, - 0xf0, 0xb0, 0x32, 0xea, 0xa2, 0x02, 0x16, 0xc3, 0x0a, 0x28, 0x7b, 0xae, 0xf9, 0x07, 0x0d, 0xca, - 0x62, 0xc2, 0x1f, 0x1e, 0x78, 0x0e, 0xc7, 0xde, 0xe3, 0x43, 0xdb, 0x79, 0x81, 0x2e, 0x03, 0xf4, - 0xa8, 0x37, 0xed, 0xf6, 0xa6, 0x5c, 0x9e, 0xa0, 0x6a, 0xd5, 0xa2, 0x5d, 0x10, 0x92, 0x8e, 0x10, - 0xa0, 0x6b, 0xb0, 0xe1, 0x4c, 0xf8, 0xb0, 0xeb, 0x93, 0x3e, 0x55, 0x98, 0x8c, 0xc4, 0x9c, 0x13, - 0xe2, 0x7b, 0xa4, 0x4f, 0x43, 0xdc, 0xec, 0x41, 0xac, 0x7e, 0xec, 0x20, 0x76, 0x13, 0xd6, 0xe3, - 0xbd, 0x4b, 0xf7, 0x96, 0x3a, 0x84, 0x2d, 0x44, 0xbb, 0x97, 0x5b, 0xe8, 0x13, 0x28, 0x25, 0xcf, - 0x1b, 0x37, 0xad, 0x96, 0xf1, 0xb3, 0xbc, 0xc4, 0x14, 0x23, 0x8c, 0x10, 0x9a, 0x5f, 0xe8, 0x70, - 0x7e, 0x66, 0x09, 0x1d, 0xea, 0x4d, 0xd1, 0x4d, 0xc8, 0xab, 0x23, 0xf6, 0xf0, 0x0c, 0x78, 0x51, - 0x90, 0xc5, 0x28, 0x91, 0xdd, 0x63, 0x3c, 0xa6, 0x51, 0x76, 0x8b, 0xb6, 0x50, 0x81, 0xfb, 0x63, - 0x4c, 0x27, 0xbc, 0x3b, 0xc4, 0xfe, 0x60, 0xc8, 0x95, 0x1d, 0xcf, 0x29, 0xe9, 0x9e, 0x14, 0xa2, - 0xab, 0x50, 0x62, 0x74, 0x8c, 0xbb, 0xc9, 0x56, 0x2c, 0x2b, 0xb7, 0x62, 0x45, 0x21, 0xdd, 0x57, - 0xca, 0xa2, 0x3d, 0xf8, 0x78, 0x16, 0xd5, 0x9d, 0x53, 0x98, 0x7f, 0x13, 0x16, 0xe6, 0x8f, 0xd2, - 0x23, 0xf7, 0x8f, 0x16, 0xe9, 0x0e, 0x9c, 0xc7, 0x87, 0x1c, 0x13, 0x11, 0x23, 0x5d, 0x2a, 0x8f, - 0x93, 0x99, 0xf1, 0xd5, 0xda, 0x09, 0xcb, 0x2c, 0xc7, 0xf8, 0x87, 0x21, 0x1c, 0x3d, 0x85, 0xcd, - 0x99, 0xe9, 0xe7, 0x10, 0x6e, 0x9c, 0x40, 0x78, 0x29, 0xf5, 0xe6, 0xd8, 0x39, 0xc2, 0x6d, 0xbe, - 0xd4, 0xe0, 0x83, 0x94, 0x4b, 0xda, 0x2a, 0x2c, 0xd0, 0x1d, 0x28, 0x86, 0x47, 0xf7, 0x32, 0x76, - 0x22, 0xc7, 0x5c, 0xae, 0x85, 0x87, 0xfd, 0x35, 0x7e, 0x58, 0x53, 0xb7, 0x56, 0xb5, 0x47, 0x12, - 0x26, 0x06, 0xd9, 0xeb, 0x2c, 0x6e, 0x33, 0x54, 0x4d, 0xce, 0xdc, 0x44, 0xd2, 0x1c, 0x1f, 0xb8, - 0x8b, 0x71, 0x78, 0x16, 0x37, 0x13, 0x5d, 0x4d, 0xe9, 0xb7, 0x54, 0x74, 0x35, 0x97, 0x8c, 0x2e, - 0xeb, 0x8f, 0x1a, 0xac, 0x8b, 0xa5, 0x3c, 0xc2, 0xc1, 0x73, 0xdf, 0xc5, 0xe8, 0x16, 0x64, 0x77, - 0xdc, 0x21, 0x45, 0xff, 0x97, 0x24, 0x6c, 0xea, 0x4a, 0xa8, 0xf2, 0xe1, 0x51, 0xb1, 0xba, 0x35, - 0x69, 0x43, 0x3e, 0xba, 0xbf, 0x41, 0x17, 0x13, 0xcc, 0x91, 0xab, 0x9f, 0x4a, 0x65, 0xde, 0x23, - 0x45, 0xf1, 0xbd, 0xf0, 0x12, 0x45, 0x94, 0x32, 0x63, 0xb6, 0x5a, 0x24, 0xb7, 0x3c, 0x95, 0x8b, - 0x73, 0x9e, 0x84, 0xe3, 0x3b, 0x7b, 0x2f, 0xdf, 0x6c, 0x6a, 0xaf, 0xde, 0x6c, 0x6a, 0x7f, 0x7b, - 0xb3, 0xa9, 0x7d, 0xf1, 0x76, 0x73, 0xe5, 0xd5, 0xdb, 0xcd, 0x95, 0xbf, 0xbc, 0xdd, 0x5c, 0x79, - 0x5a, 0x3b, 0xf9, 0xfa, 0x05, 0x33, 0x3e, 0xe1, 0xfe, 0xa8, 0x1e, 0x31, 0xf7, 0x56, 0x65, 0x24, - 0x34, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x5f, 0xed, 0x9c, 0xb6, 0x1c, 0x00, 0x00, + // 2003 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x4f, 0x8f, 0x1b, 0x49, + 0x15, 0x9f, 0x76, 0xdb, 0x33, 0xf6, 0x1b, 0xaf, 0xc7, 0xa9, 0x0d, 0x4b, 0xc7, 0xd9, 0x4c, 0x66, + 0x5b, 0xd9, 0xc4, 0xac, 0x36, 0x76, 0xdc, 0x76, 0x24, 0x94, 0x03, 0x8a, 0x3d, 0x99, 0xd9, 0x89, + 0x48, 0x26, 0xa8, 0x93, 0x0d, 0x28, 0x17, 0xab, 0xdd, 0x5d, 0xb6, 0x5b, 0xb1, 0xab, 0x86, 0xae, + 0x72, 0x32, 0xe6, 0x84, 0xe0, 0xc0, 0x75, 0x2f, 0x08, 0x89, 0x1b, 0x47, 0x4e, 0x68, 0xbf, 0x01, + 0x37, 0x72, 0x41, 0xca, 0x05, 0x09, 0x09, 0x29, 0x42, 0xc9, 0x95, 0x4f, 0x00, 0x42, 0x8b, 0xaa, + 0xba, 0xfa, 0x8f, 0x67, 0xec, 0x59, 0x67, 0x16, 0x36, 0x1a, 0x89, 0x8b, 0x5d, 0xf5, 0xfa, 0x57, + 0xbf, 0x7a, 0xf5, 0xfe, 0x75, 0x57, 0x15, 0xac, 0x1f, 0x04, 0x94, 0xd3, 0x9a, 0xfc, 0x45, 0x79, + 0x8e, 0x19, 0xf7, 0x1c, 0xee, 0x54, 0xce, 0x0f, 0xe8, 0x80, 0x4a, 0x61, 0x5d, 0xb4, 0xc2, 0xe7, + 0x95, 0x0b, 0x03, 0x4a, 0x07, 0x23, 0x5c, 0x97, 0xbd, 0xde, 0xa4, 0x5f, 0x77, 0xc8, 0x54, 0x3d, + 0xaa, 0xb8, 0x94, 0x8d, 0x29, 0xab, 0xf3, 0xc3, 0xfa, 0xb3, 0x46, 0x0f, 0x73, 0xa7, 0x51, 0xe7, + 0x87, 0xe1, 0x33, 0xf3, 0x3a, 0xe8, 0x77, 0xe8, 0x00, 0x21, 0xc8, 0x32, 0xff, 0x67, 0xd8, 0xd0, + 0xb6, 0xb4, 0x6a, 0xc1, 0x96, 0x6d, 0x21, 0x23, 0xce, 0x18, 0x1b, 0x99, 0x50, 0x26, 0xda, 0xe6, + 0x4d, 0xd0, 0xb7, 0x1d, 0x8e, 0x0c, 0x58, 0x1b, 0x53, 0xe2, 0x3f, 0xc5, 0x81, 0x1a, 0x11, 0x75, + 0xd1, 0x79, 0xc8, 0x8d, 0xfc, 0x67, 0x98, 0xc9, 0x51, 0x39, 0x3b, 0xec, 0x98, 0x9f, 0x41, 0x61, + 0xcf, 0x61, 0x6d, 0xe2, 0x8f, 0x9d, 0x11, 0xfa, 0x14, 0x56, 0x1d, 0xd9, 0x92, 0x63, 0xd7, 0xad, + 0xf3, 0xb5, 0x50, 0xf5, 0x5a, 0xa4, 0x7a, 0xad, 0x4d, 0xa6, 0xb6, 0xc2, 0xa0, 0x22, 0x68, 0x87, + 0x92, 0x4c, 0xb7, 0xb5, 0x43, 0x73, 0x1b, 0x8a, 0x7b, 0x0e, 0x4b, 0xb8, 0x9a, 0x00, 0x43, 0x87, + 0x75, 0x97, 0xe0, 0x2b, 0x0c, 0xa3, 0x41, 0xe6, 0x7d, 0xd8, 0x08, 0x49, 0x12, 0x9e, 0x5b, 0x50, + 0x12, 0x3c, 0x4b, 0x72, 0x15, 0x87, 0xa9, 0xb1, 0xe6, 0x35, 0x58, 0xdf, 0x71, 0x87, 0xd4, 0xc6, + 0x3f, 0x9d, 0x60, 0x16, 0xda, 0x06, 0x33, 0xe6, 0x0c, 0x70, 0x6c, 0x9b, 0xb0, 0x6b, 0x56, 0xa1, + 0x18, 0x02, 0xd9, 0x01, 0x25, 0x0c, 0x9f, 0x80, 0xfc, 0x18, 0x36, 0x1e, 0x3a, 0xd3, 0x3d, 0x3c, + 0x1a, 0xc5, 0xb4, 0x91, 0x37, 0xb4, 0x94, 0x37, 0x6a, 0x50, 0x4e, 0x60, 0x8a, 0xb4, 0x02, 0xf9, + 0x41, 0x80, 0x31, 0xf7, 0xc9, 0x40, 0x61, 0xe3, 0xbe, 0xb9, 0x03, 0xa5, 0x47, 0x98, 0x71, 0xb1, + 0x04, 0xc5, 0xda, 0x04, 0x70, 0xc8, 0x74, 0x29, 0xfb, 0x39, 0x64, 0xaa, 0x16, 0xbc, 0x03, 0x1b, + 0x31, 0x8d, 0x9a, 0xd5, 0x9a, 0xe3, 0x87, 0xf7, 0x6b, 0x51, 0xc8, 0xd6, 0x62, 0x63, 0xa5, 0xdd, + 0xf0, 0x18, 0xd6, 0x04, 0xcd, 0x7d, 0x36, 0x40, 0x3f, 0x84, 0x35, 0xe6, 0x0f, 0x08, 0x0e, 0x98, + 0xa1, 0x6d, 0xe9, 0xd5, 0x62, 0xa7, 0xf1, 0xcf, 0x57, 0x97, 0xaf, 0x0f, 0x7c, 0x3e, 0x9c, 0xf4, + 0x6a, 0x2e, 0x1d, 0xd7, 0x55, 0x04, 0x87, 0x7f, 0xd7, 0x99, 0xf7, 0xb4, 0xce, 0xa7, 0x07, 0x98, + 0xd5, 0xda, 0xae, 0xdb, 0xf6, 0xbc, 0x00, 0x33, 0x66, 0x47, 0x0c, 0x66, 0x0f, 0xce, 0x75, 0x1c, + 0xef, 0xfe, 0x64, 0xc4, 0xfd, 0x87, 0xfe, 0x80, 0x38, 0x7c, 0x12, 0x60, 0xb4, 0x09, 0xc0, 0xa2, + 0x8e, 0x9a, 0xc4, 0x4e, 0x49, 0xd0, 0x35, 0xd8, 0x18, 0x3b, 0x23, 0xdf, 0xf5, 0xe9, 0x84, 0x75, + 0xfb, 0x3e, 0x1e, 0x79, 0x46, 0x6e, 0x4b, 0xab, 0x16, 0xed, 0x52, 0x2c, 0xde, 0x15, 0xd2, 0x5b, + 0xd9, 0x97, 0xbf, 0xbb, 0xac, 0x99, 0x1c, 0x0a, 0xdb, 0x13, 0xc6, 0xe9, 0x18, 0x07, 0x0d, 0x54, + 0x82, 0x8c, 0xef, 0xc9, 0x45, 0xe7, 0xec, 0x8c, 0xef, 0xcd, 0x4b, 0x1c, 0xf4, 0x3d, 0x28, 0xb3, + 0x49, 0x8f, 0xb9, 0x81, 0x7f, 0xc0, 0x7d, 0x4a, 0xba, 0x7d, 0x8c, 0x0d, 0x7d, 0x4b, 0xab, 0x66, + 0xec, 0x8d, 0xb4, 0x7c, 0x17, 0xcb, 0xb0, 0x38, 0x70, 0xa6, 0x63, 0x4c, 0xb8, 0xb1, 0x16, 0x86, + 0x85, 0xea, 0x9a, 0x5f, 0x66, 0x92, 0x69, 0xad, 0x63, 0xd3, 0x56, 0x20, 0xef, 0x13, 0x6f, 0xc2, + 0x78, 0x30, 0x55, 0xd9, 0x17, 0xf7, 0x63, 0x95, 0xf4, 0x94, 0x4a, 0xe7, 0x21, 0xd7, 0xc7, 0xcf, + 0x71, 0x60, 0x64, 0xa5, 0x1e, 0x61, 0x07, 0x5d, 0x84, 0x7c, 0x80, 0x19, 0x0e, 0x9e, 0x61, 0xcf, + 0xf8, 0x4d, 0x5e, 0xe6, 0x5d, 0x2c, 0x40, 0x9f, 0x42, 0xd6, 0xf5, 0xf9, 0xd4, 0x58, 0xdd, 0xd2, + 0xaa, 0x25, 0xcb, 0x48, 0x1c, 0x1c, 0x6b, 0x55, 0xdb, 0xf6, 0xf9, 0xd4, 0x96, 0x28, 0x74, 0x0b, + 0xde, 0x1b, 0xfb, 0xcc, 0xc5, 0xa3, 0x91, 0x43, 0x30, 0x9d, 0x30, 0x03, 0x4e, 0x88, 0xaf, 0x59, + 0xa8, 0xf9, 0x19, 0x64, 0x05, 0x13, 0xca, 0x43, 0xf6, 0x9e, 0x43, 0x59, 0x79, 0x05, 0x95, 0x00, + 0xee, 0x51, 0xd6, 0x26, 0x03, 0x3c, 0xc2, 0xac, 0xac, 0xa1, 0x22, 0xe4, 0x7f, 0xe4, 0x8c, 0x68, + 0x7b, 0xc4, 0x69, 0x39, 0x83, 0x00, 0x56, 0xef, 0x53, 0xe6, 0xd2, 0xe7, 0x65, 0x1d, 0xad, 0xc3, + 0xda, 0xbe, 0xe3, 0x07, 0xb4, 0xe7, 0x97, 0xb3, 0x66, 0x0d, 0xf2, 0xfb, 0x98, 0x71, 0xec, 0xb5, + 0xda, 0xcb, 0x38, 0xca, 0xfc, 0x8b, 0x16, 0x0d, 0x68, 0x2e, 0x35, 0x00, 0x99, 0x90, 0x71, 0x5a, + 0x46, 0x76, 0x4b, 0xaf, 0xae, 0x5b, 0x28, 0xb1, 0x48, 0x34, 0xa9, 0x9d, 0x71, 0x5a, 0xa8, 0x09, + 0x39, 0x9f, 0x78, 0xf8, 0xd0, 0xc8, 0x49, 0xd8, 0xa5, 0xa3, 0xb0, 0x66, 0xbb, 0x76, 0x57, 0x3c, + 0xdf, 0x21, 0x3c, 0x98, 0xda, 0x21, 0xb6, 0x72, 0x0f, 0x20, 0x11, 0xa2, 0x32, 0xe8, 0x4f, 0xf1, + 0x54, 0xea, 0xa2, 0xdb, 0xa2, 0x89, 0xaa, 0x90, 0x7b, 0xe6, 0x8c, 0x26, 0xa1, 0x36, 0xf3, 0xe7, + 0x0e, 0x01, 0xb7, 0x32, 0xdf, 0xd7, 0xcc, 0x27, 0xd1, 0xb2, 0xac, 0xe5, 0x96, 0xf5, 0x09, 0xac, + 0x12, 0x89, 0x97, 0x31, 0x33, 0x87, 0xbe, 0xd9, 0xb6, 0x15, 0xc2, 0xdc, 0x8d, 0xb8, 0x1b, 0xc7, + 0xb9, 0x13, 0x9e, 0x05, 0x6a, 0x5a, 0x09, 0xcf, 0xed, 0xd8, 0x57, 0x9d, 0x63, 0x3c, 0x65, 0xd0, + 0x45, 0xa1, 0x0c, 0x03, 0x5b, 0x34, 0xe7, 0xc5, 0xb4, 0xe9, 0xc5, 0xce, 0x3b, 0x25, 0x83, 0x70, + 0x67, 0x6f, 0xb1, 0x3b, 0x3b, 0x76, 0xa6, 0xd7, 0x32, 0x49, 0x6c, 0xcb, 0xb9, 0xb3, 0x88, 0xdc, + 0x16, 0xb3, 0x68, 0xb6, 0x68, 0x2e, 0x61, 0xc9, 0x4e, 0x64, 0x01, 0x91, 0x93, 0x01, 0x9d, 0x70, + 0x2c, 0x73, 0xb2, 0x60, 0x87, 0x1d, 0xf3, 0x27, 0xb1, 0x7d, 0x3b, 0xa7, 0xb0, 0x6f, 0xc2, 0xae, + 0x2c, 0xa0, 0xc7, 0x16, 0x30, 0x7f, 0x91, 0xaa, 0x28, 0xcd, 0xa5, 0xe2, 0xa2, 0x04, 0x19, 0xd6, + 0x57, 0xa5, 0x2b, 0xc3, 0xfa, 0xe8, 0x43, 0x28, 0xb0, 0x49, 0xe0, 0x0e, 0x9d, 0x60, 0x80, 0x55, + 0x25, 0x49, 0x04, 0x68, 0x0b, 0xd6, 0x3d, 0xcc, 0xb8, 0x4f, 0x1c, 0x51, 0xdd, 0x64, 0x49, 0x2d, + 0xd8, 0x69, 0x11, 0xba, 0x0a, 0x25, 0x37, 0xc0, 0x9e, 0xcf, 0xbb, 0xae, 0x13, 0x78, 0x5d, 0x42, + 0xc3, 0xa2, 0xb7, 0xb7, 0x62, 0x17, 0x43, 0xf9, 0xb6, 0x13, 0x78, 0xfb, 0x14, 0x5d, 0x82, 0x82, + 0x3b, 0x14, 0x6f, 0x2d, 0x01, 0xc9, 0x2b, 0x48, 0x3e, 0x14, 0xed, 0x53, 0x54, 0x87, 0x3c, 0x0d, + 0xfc, 0x81, 0x4f, 0x9c, 0x91, 0x51, 0x38, 0xfa, 0xfa, 0x89, 0x4b, 0xb5, 0x1d, 0x83, 0x3a, 0x85, + 0xb8, 0xca, 0x9a, 0xff, 0xc8, 0x40, 0x51, 0xbc, 0x89, 0x1e, 0xe3, 0x80, 0xf9, 0x94, 0x34, 0xc2, + 0x6f, 0x0e, 0x4d, 0x7d, 0x73, 0xa0, 0x2b, 0xa0, 0x39, 0xca, 0xb8, 0x1f, 0x24, 0x9c, 0xe9, 0x01, + 0xb6, 0xe6, 0x08, 0x54, 0x4f, 0x39, 0x78, 0x21, 0xaa, 0x27, 0x50, 0xae, 0x0a, 0xae, 0x85, 0x28, + 0x17, 0x7d, 0x02, 0x9a, 0xa7, 0x4a, 0xc5, 0x02, 0x54, 0x27, 0xfb, 0xe2, 0xd5, 0xe5, 0x15, 0x5b, + 0xf3, 0x50, 0x09, 0x34, 0x2c, 0xeb, 0x71, 0x6e, 0x6f, 0xc5, 0xd6, 0x30, 0xba, 0x0a, 0x5a, 0x5f, + 0x9a, 0x70, 0xe1, 0x58, 0x81, 0xeb, 0x23, 0x13, 0xb4, 0x81, 0xb4, 0xe3, 0xa2, 0x82, 0xac, 0x0d, + 0x84, 0xb6, 0x43, 0xa3, 0x70, 0xb2, 0xb6, 0x43, 0x74, 0x0d, 0xb4, 0xa7, 0x46, 0x71, 0xa1, 0xcd, + 0x3b, 0xd9, 0x97, 0xaf, 0x2e, 0x6b, 0xb6, 0xf6, 0xb4, 0x93, 0x03, 0x9d, 0x4d, 0xc6, 0xe6, 0x2f, + 0xf5, 0x19, 0x73, 0x5b, 0x6f, 0x6b, 0x6e, 0x6b, 0x29, 0x73, 0x5b, 0x4b, 0x99, 0xdb, 0x12, 0xe6, + 0xbe, 0xf2, 0x75, 0xe6, 0xb6, 0x4e, 0x65, 0x68, 0xeb, 0x5d, 0x19, 0x1a, 0x5d, 0x84, 0x02, 0xc1, + 0xcf, 0xd5, 0x67, 0xcc, 0x85, 0x2d, 0xad, 0x9a, 0xb5, 0xf3, 0x04, 0x3f, 0x97, 0x1f, 0x30, 0x91, + 0x17, 0x7e, 0x3d, 0xeb, 0x85, 0xe6, 0xdb, 0x7a, 0xa1, 0xb9, 0x94, 0x17, 0x9a, 0x4b, 0x79, 0xa1, + 0xb9, 0x94, 0x17, 0x9a, 0xa7, 0xf2, 0x42, 0xf3, 0x9d, 0x79, 0xe1, 0x3a, 0x20, 0x42, 0x49, 0xd7, + 0x0d, 0x7c, 0xee, 0xbb, 0xce, 0x48, 0xb9, 0xe3, 0x57, 0xb2, 0x76, 0xd9, 0x65, 0x42, 0xc9, 0xb6, + 0x7a, 0x32, 0xe3, 0x97, 0x7f, 0x65, 0xa0, 0x92, 0x56, 0xff, 0x1e, 0x25, 0xf8, 0x01, 0xc1, 0x0f, + 0xfa, 0x8f, 0xc5, 0xab, 0xfc, 0x8c, 0x7a, 0xe9, 0xcc, 0x58, 0xff, 0xdf, 0xab, 0xf0, 0xdd, 0xa3, + 0xd6, 0xdf, 0x97, 0x6f, 0xab, 0xc1, 0x19, 0x31, 0x7d, 0x23, 0x49, 0x88, 0x8f, 0xe6, 0xa3, 0x52, + 0x6b, 0x3a, 0x23, 0xb9, 0x81, 0x6e, 0xc3, 0xaa, 0x4f, 0x08, 0x0e, 0x1a, 0x46, 0x49, 0x92, 0x57, + 0xbf, 0x76, 0x65, 0xb5, 0xbb, 0x12, 0x6f, 0xab, 0x71, 0x31, 0x83, 0x65, 0x6c, 0xbc, 0x15, 0x83, + 0xa5, 0x18, 0xac, 0xca, 0xef, 0x35, 0x58, 0x0d, 0x49, 0x53, 0xdf, 0x49, 0xfa, 0xc2, 0xef, 0xa4, + 0xbb, 0xe2, 0x93, 0x9f, 0xe0, 0x40, 0x79, 0xbf, 0xb9, 0xac, 0xc6, 0xe1, 0x9f, 0xfc, 0xb1, 0x43, + 0x86, 0xca, 0x0d, 0xb1, 0x11, 0x88, 0x84, 0xa9, 0xc9, 0x0b, 0xd1, 0xe4, 0x72, 0x4f, 0xa6, 0x26, + 0x17, 0xed, 0xca, 0x1f, 0x22, 0x5d, 0xad, 0x63, 0x70, 0x03, 0xd6, 0x5c, 0x3a, 0x21, 0xd1, 0x26, + 0xb1, 0x60, 0x47, 0xdd, 0xd3, 0x6a, 0x6c, 0xfd, 0x37, 0x34, 0x8e, 0xf2, 0xef, 0xab, 0xd9, 0xfc, + 0x6b, 0xfd, 0x3f, 0xff, 0xce, 0x50, 0xfe, 0xb5, 0xbe, 0x71, 0xfe, 0xb5, 0xbe, 0xe5, 0xfc, 0x6b, + 0x7d, 0xa3, 0xfc, 0xd3, 0x17, 0xe6, 0xdf, 0x97, 0xff, 0xb3, 0xfc, 0x6b, 0x2d, 0x95, 0x7f, 0xd6, + 0x89, 0xf9, 0x77, 0x3e, 0x7d, 0x70, 0xa0, 0xab, 0x43, 0x82, 0x28, 0x03, 0xff, 0xac, 0x85, 0x87, + 0x84, 0x6a, 0xbe, 0xdd, 0x3b, 0xa7, 0xdb, 0x0e, 0xbd, 0xf3, 0x6d, 0x49, 0xb4, 0x9e, 0xbf, 0x69, + 0x33, 0xdf, 0x53, 0xbb, 0x77, 0x1a, 0x3f, 0xf6, 0xf9, 0x70, 0xe7, 0x90, 0x07, 0x4e, 0x9b, 0x4c, + 0xbf, 0xd5, 0xb5, 0x5d, 0x49, 0xd6, 0x96, 0xc2, 0xb5, 0xc9, 0x34, 0xd6, 0xe8, 0xad, 0x57, 0xf7, + 0x08, 0x8a, 0xe9, 0xf1, 0xa8, 0x2a, 0x16, 0x70, 0xc2, 0x31, 0x6e, 0x54, 0x01, 0x1c, 0xb1, 0xf0, + 0xb0, 0x32, 0xea, 0xa2, 0x02, 0x16, 0xc3, 0x0a, 0x28, 0x7b, 0xae, 0xf9, 0x47, 0x0d, 0xca, 0x62, + 0xc2, 0xcf, 0x0f, 0x3c, 0x87, 0x63, 0xef, 0xd1, 0xa1, 0xed, 0x3c, 0x47, 0x97, 0x00, 0x7a, 0xd4, + 0x9b, 0x76, 0x7b, 0x53, 0x2e, 0x4f, 0x50, 0xb5, 0x6a, 0xd1, 0x2e, 0x08, 0x49, 0x47, 0x08, 0xd0, + 0x55, 0xd8, 0x70, 0x26, 0x7c, 0xd8, 0xf5, 0x49, 0x9f, 0x2a, 0x4c, 0x46, 0x62, 0xde, 0x13, 0xe2, + 0xbb, 0xa4, 0x4f, 0x43, 0xdc, 0xec, 0x41, 0xac, 0x7e, 0xec, 0x20, 0x76, 0x13, 0xd6, 0xe3, 0xbd, + 0x4b, 0xf7, 0xa6, 0x3a, 0x84, 0x2d, 0x44, 0xbb, 0x97, 0x9b, 0xe8, 0x63, 0x28, 0x25, 0xcf, 0x1b, + 0x37, 0xac, 0x96, 0xf1, 0xf3, 0xbc, 0xc4, 0x14, 0x23, 0x8c, 0x10, 0x9a, 0x5f, 0xe8, 0x70, 0x6e, + 0x66, 0x09, 0x1d, 0xea, 0x4d, 0xd1, 0x0d, 0xc8, 0xab, 0x23, 0xf6, 0xf0, 0x0c, 0x78, 0x51, 0x90, + 0xc5, 0x28, 0x91, 0xdd, 0x63, 0x3c, 0xa6, 0x51, 0x76, 0x8b, 0xb6, 0x50, 0x81, 0xfb, 0x63, 0x4c, + 0x27, 0xbc, 0x3b, 0xc4, 0xfe, 0x60, 0xc8, 0x95, 0x1d, 0xdf, 0x53, 0xd2, 0x3d, 0x29, 0x44, 0x57, + 0xa0, 0xc4, 0xe8, 0x18, 0x77, 0x93, 0xad, 0x58, 0x56, 0x6e, 0xc5, 0x8a, 0x42, 0xba, 0xaf, 0x94, + 0x45, 0x7b, 0xf0, 0xd1, 0x2c, 0xaa, 0x3b, 0xa7, 0x30, 0xff, 0x36, 0x2c, 0xcc, 0x1f, 0xa6, 0x47, + 0xee, 0x1f, 0x2d, 0xd2, 0x1d, 0x38, 0x87, 0x0f, 0x39, 0x26, 0x22, 0x46, 0xba, 0x54, 0x1e, 0x27, + 0x33, 0xe3, 0xab, 0xb5, 0x13, 0x96, 0x59, 0x8e, 0xf1, 0x0f, 0x42, 0x38, 0x7a, 0x02, 0x9b, 0x33, + 0xd3, 0xcf, 0x21, 0xdc, 0x38, 0x81, 0xf0, 0x62, 0xea, 0xcd, 0xb1, 0x73, 0x84, 0xdb, 0x7c, 0xa1, + 0xc1, 0xfb, 0x29, 0x97, 0xb4, 0x55, 0x58, 0xa0, 0xdb, 0x50, 0x0c, 0x8f, 0xee, 0x65, 0xec, 0x44, + 0x8e, 0xb9, 0x54, 0x0b, 0x0f, 0xfb, 0x6b, 0xfc, 0xb0, 0xa6, 0x6e, 0xad, 0x6a, 0x0f, 0x25, 0x4c, + 0x0c, 0xb2, 0xd7, 0x59, 0xdc, 0x66, 0xa8, 0x9a, 0x9c, 0xb9, 0x89, 0xa4, 0x39, 0x3e, 0x70, 0x17, + 0xe3, 0xf0, 0x2c, 0x6e, 0x26, 0xba, 0x9a, 0xd2, 0x6f, 0xa9, 0xe8, 0x6a, 0x2e, 0x1b, 0x5d, 0xd7, + 0xc2, 0xe0, 0xb2, 0xf1, 0x01, 0x16, 0x4b, 0xf9, 0xdc, 0x27, 0x5c, 0x86, 0x0a, 0x99, 0x8c, 0x43, + 0xfd, 0xb3, 0xb6, 0x6c, 0x5b, 0x7f, 0xd2, 0x60, 0x5d, 0x20, 0x1f, 0xe2, 0xe0, 0x99, 0xef, 0x62, + 0x74, 0x13, 0xb2, 0x3b, 0xee, 0x90, 0xa2, 0xef, 0x24, 0x99, 0x9d, 0xba, 0x3b, 0xaa, 0x7c, 0x70, + 0x54, 0xac, 0xae, 0x57, 0xda, 0x90, 0x8f, 0x2e, 0x7a, 0xd0, 0x85, 0x04, 0x73, 0xe4, 0x8e, 0xa8, + 0x52, 0x99, 0xf7, 0x48, 0x51, 0xfc, 0x20, 0xbc, 0x6d, 0x11, 0x35, 0xcf, 0x98, 0x2d, 0x2b, 0xc9, + 0x75, 0x50, 0xe5, 0xc2, 0x9c, 0x27, 0xe1, 0xf8, 0xce, 0xde, 0x8b, 0xd7, 0x9b, 0xda, 0xcb, 0xd7, + 0x9b, 0xda, 0xdf, 0x5f, 0x6f, 0x6a, 0x5f, 0xbc, 0xd9, 0x5c, 0x79, 0xf9, 0x66, 0x73, 0xe5, 0xaf, + 0x6f, 0x36, 0x57, 0x9e, 0xd4, 0x4e, 0xbe, 0xa7, 0xc1, 0x8c, 0x4f, 0xb8, 0x3f, 0xaa, 0x47, 0xcc, + 0xbd, 0x55, 0x19, 0x32, 0xcd, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x37, 0x15, 0xe8, 0xdf, + 0x1c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -6549,6 +6596,47 @@ func (m *TestUpdatedAuthInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *TestRepeatedUints) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *TestRepeatedUints) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TestRepeatedUints) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Nums) > 0 { + dAtA59 := make([]byte, len(m.Nums)*10) + var j58 int + for _, num := range m.Nums { + for num >= 1<<7 { + dAtA59[j58] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j58++ + } + dAtA59[j58] = uint8(num) + j58++ + } + i -= j58 + copy(dAtA[i:], dAtA59[:j58]) + i = encodeVarintProto(dAtA, i, uint64(j58)) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintProto(dAtA []byte, offset int, v uint64) int { offset -= sovProto(v) base := offset @@ -7822,6 +7910,22 @@ func (m *TestUpdatedAuthInfo) Size() (n int) { return n } +func (m *TestRepeatedUints) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Nums) > 0 { + l = 0 + for _, e := range m.Nums { + l += sovProto(uint64(e)) + } + n += 1 + sovProto(uint64(l)) + l + } + return n +} + func sovProto(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -15578,6 +15682,135 @@ func (m *TestUpdatedAuthInfo) Unmarshal(dAtA []byte) error { } return nil } +func (m *TestRepeatedUints) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: TestRepeatedUints: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TestRepeatedUints: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Nums = append(m.Nums, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthProto + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthProto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.Nums) == 0 { + m.Nums = make([]uint64, 0, elementCount) + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Nums = append(m.Nums, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field Nums", wireType) + } + default: + iNdEx = preIndex + skippy, err := skipProto(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthProto + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthProto + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipProto(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/testutil/testdata/proto.proto b/testutil/testdata/proto.proto index e265ca3ca..de1e9e5df 100644 --- a/testutil/testdata/proto.proto +++ b/testutil/testdata/proto.proto @@ -367,3 +367,7 @@ message TestUpdatedAuthInfo { bytes new_field_3 = 3; bytes new_field_1024 = 1024; } + +message TestRepeatedUints { + repeated uint64 nums = 1; +}