diff --git a/example/dummy/dummy.go b/example/dummy/dummy.go index 7592a7d4b..c8fb0f376 100644 --- a/example/dummy/dummy.go +++ b/example/dummy/dummy.go @@ -40,8 +40,8 @@ func (app *DummyApplication) DeliverTx(tx []byte) types.ResponseDeliverTx { app.state.Set(key, value) tags := []types.KVPair{ - {Key: "app.creator", ValueType: types.KVPair_STRING, ValueString: "jae"}, - {Key: "app.key", ValueType: types.KVPair_STRING, ValueString: string(key)}, + {[]byte("app.creator"), []byte("jae")}, + {[]byte("app.key"), key}, } return types.ResponseDeliverTx{Code: code.CodeTypeOK, Tags: tags} } diff --git a/types/messages_test.go b/types/messages_test.go index 15e84b624..f077449c2 100644 --- a/types/messages_test.go +++ b/types/messages_test.go @@ -19,7 +19,7 @@ func TestMarshalJSON(t *testing.T) { Code: 1, Data: []byte("hello"), Gas: 43, - Fee: 12, + Fee: KI64Pair{[]byte("pho"), 12}, } b, err = json.Marshal(&r1) assert.Nil(t, err) diff --git a/types/types.pb.go b/types/types.pb.go index 06553825b..b11463feb 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -43,6 +43,7 @@ It has these top-level messages: Validator Evidence KVPair + KI64Pair */ //nolint: gas package types @@ -68,27 +69,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package -type KVPair_Type int32 - -const ( - KVPair_STRING KVPair_Type = 0 - KVPair_INT KVPair_Type = 1 -) - -var KVPair_Type_name = map[int32]string{ - 0: "STRING", - 1: "INT", -} -var KVPair_Type_value = map[string]int32{ - "STRING": 0, - "INT": 1, -} - -func (x KVPair_Type) String() string { - return proto.EnumName(KVPair_Type_name, int32(x)) -} -func (KVPair_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptorTypes, []int{34, 0} } - type Request struct { // Types that are valid to be assigned to Value: // *Request_Echo @@ -1304,7 +1284,7 @@ type ResponseCheckTx struct { Data github_com_tendermint_go_wire_data.Bytes `protobuf:"bytes,2,opt,name=data,proto3,customtype=github.com/tendermint/go-wire/data.Bytes" json:"data"` Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` Gas int64 `protobuf:"varint,4,opt,name=gas,proto3" json:"gas,omitempty"` - Fee int64 `protobuf:"varint,5,opt,name=fee,proto3" json:"fee,omitempty"` + Fee KI64Pair `protobuf:"bytes,5,opt,name=fee" json:"fee"` } func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } @@ -1333,11 +1313,11 @@ func (m *ResponseCheckTx) GetGas() int64 { return 0 } -func (m *ResponseCheckTx) GetFee() int64 { +func (m *ResponseCheckTx) GetFee() KI64Pair { if m != nil { return m.Fee } - return 0 + return KI64Pair{} } type ResponseDeliverTx struct { @@ -1710,10 +1690,8 @@ func (m *Evidence) GetHeight() int64 { } type KVPair struct { - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - ValueType KVPair_Type `protobuf:"varint,2,opt,name=value_type,json=valueType,proto3,enum=types.KVPair_Type" json:"value_type,omitempty"` - ValueString string `protobuf:"bytes,3,opt,name=value_string,json=valueString,proto3" json:"value_string,omitempty"` - ValueInt int64 `protobuf:"varint,4,opt,name=value_int,json=valueInt,proto3" json:"value_int,omitempty"` + Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` } func (m *KVPair) Reset() { *m = KVPair{} } @@ -1721,30 +1699,40 @@ func (m *KVPair) String() string { return proto.CompactTextString(m) func (*KVPair) ProtoMessage() {} func (*KVPair) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{34} } -func (m *KVPair) GetKey() string { +func (m *KVPair) GetKey() []byte { if m != nil { return m.Key } - return "" + return nil } -func (m *KVPair) GetValueType() KVPair_Type { +func (m *KVPair) GetValue() []byte { if m != nil { - return m.ValueType + return m.Value } - return KVPair_STRING + return nil } -func (m *KVPair) GetValueString() string { +type KI64Pair struct { + Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Value int64 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"` +} + +func (m *KI64Pair) Reset() { *m = KI64Pair{} } +func (m *KI64Pair) String() string { return proto.CompactTextString(m) } +func (*KI64Pair) ProtoMessage() {} +func (*KI64Pair) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{35} } + +func (m *KI64Pair) GetKey() []byte { if m != nil { - return m.ValueString + return m.Key } - return "" + return nil } -func (m *KVPair) GetValueInt() int64 { +func (m *KI64Pair) GetValue() int64 { if m != nil { - return m.ValueInt + return m.Value } return 0 } @@ -1785,7 +1773,7 @@ func init() { proto.RegisterType((*Validator)(nil), "types.Validator") proto.RegisterType((*Evidence)(nil), "types.Evidence") proto.RegisterType((*KVPair)(nil), "types.KVPair") - proto.RegisterEnum("types.KVPair_Type", KVPair_Type_name, KVPair_Type_value) + proto.RegisterType((*KI64Pair)(nil), "types.KI64Pair") } // Reference imports to suppress errors if they are not otherwise used. @@ -2193,117 +2181,113 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("types/types.proto", fileDescriptorTypes) } var fileDescriptorTypes = []byte{ - // 1778 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x72, 0x1b, 0xc7, - 0x11, 0x26, 0xfe, 0xb1, 0x0d, 0xfe, 0x0e, 0x29, 0x09, 0x86, 0x0e, 0x62, 0xf6, 0x60, 0x41, 0x91, - 0x45, 0xda, 0x74, 0xc9, 0x25, 0xda, 0x29, 0x57, 0x04, 0x52, 0x16, 0x10, 0xa7, 0x64, 0x65, 0xc5, - 0xf8, 0x90, 0x0b, 0x6a, 0x80, 0x1d, 0x02, 0x5b, 0x02, 0x76, 0xd7, 0xbb, 0x03, 0x1a, 0x54, 0xe5, - 0x11, 0x7c, 0xcf, 0x39, 0xa7, 0xa4, 0xf2, 0x02, 0x79, 0x83, 0x54, 0x52, 0x79, 0x83, 0x1c, 0x78, - 0xf0, 0x93, 0xa4, 0xba, 0x67, 0xf6, 0x97, 0xbb, 0x89, 0x4b, 0x07, 0x5f, 0x80, 0x99, 0xe9, 0x9f, - 0xed, 0xee, 0xe9, 0xf9, 0xba, 0x67, 0x60, 0x4f, 0x5e, 0xfb, 0x22, 0x3c, 0xa6, 0xdf, 0x23, 0x3f, - 0xf0, 0xa4, 0xc7, 0x1a, 0x34, 0xe9, 0x3d, 0x99, 0x39, 0x72, 0xbe, 0x9a, 0x1c, 0x4d, 0xbd, 0xe5, - 0xf1, 0xcc, 0x9b, 0x79, 0xc7, 0x44, 0x9d, 0xac, 0x2e, 0x69, 0x46, 0x13, 0x1a, 0x29, 0x29, 0xf3, - 0x1f, 0x75, 0x68, 0x59, 0xe2, 0xbb, 0x95, 0x08, 0x25, 0xeb, 0x43, 0x5d, 0x4c, 0xe7, 0x5e, 0xb7, - 0x7a, 0x58, 0xe9, 0x77, 0x4e, 0xd8, 0x91, 0xd2, 0xae, 0xa9, 0x2f, 0xa6, 0x73, 0x6f, 0xb8, 0x61, - 0x11, 0x07, 0x7b, 0x0c, 0x8d, 0xcb, 0xc5, 0x2a, 0x9c, 0x77, 0x6b, 0xc4, 0xba, 0x9f, 0x65, 0xfd, - 0x0a, 0x49, 0xc3, 0x0d, 0x4b, 0xf1, 0xa0, 0x5a, 0xc7, 0xbd, 0xf4, 0xba, 0xf5, 0x22, 0xb5, 0x23, - 0xf7, 0x92, 0xd4, 0x22, 0x07, 0x7b, 0x06, 0x10, 0x0a, 0x39, 0xf6, 0x7c, 0xe9, 0x78, 0x6e, 0xb7, - 0x41, 0xfc, 0xf7, 0xb2, 0xfc, 0x6f, 0x84, 0xfc, 0x86, 0xc8, 0xc3, 0x0d, 0xcb, 0x08, 0xa3, 0x09, - 0x4a, 0x3a, 0xae, 0x23, 0xc7, 0xd3, 0x39, 0x77, 0xdc, 0x6e, 0xb3, 0x48, 0x72, 0xe4, 0x3a, 0xf2, - 0x0c, 0xc9, 0x28, 0xe9, 0x44, 0x13, 0x74, 0xe5, 0xbb, 0x95, 0x08, 0xae, 0xbb, 0xad, 0x22, 0x57, - 0x7e, 0x87, 0x24, 0x74, 0x85, 0x78, 0xd8, 0x17, 0xd0, 0x99, 0x88, 0x99, 0xe3, 0x8e, 0x27, 0x0b, - 0x6f, 0xfa, 0xb6, 0xdb, 0x26, 0x91, 0x6e, 0x56, 0x64, 0x80, 0x0c, 0x03, 0xa4, 0x0f, 0x37, 0x2c, - 0x98, 0xc4, 0x33, 0x76, 0x02, 0xed, 0xe9, 0x5c, 0x4c, 0xdf, 0x8e, 0xe5, 0xba, 0x6b, 0x90, 0xe4, - 0x9d, 0xac, 0xe4, 0x19, 0x52, 0x2f, 0xd6, 0xc3, 0x0d, 0xab, 0x35, 0x55, 0x43, 0xf4, 0xcb, 0x16, - 0x0b, 0xe7, 0x4a, 0x04, 0x28, 0xb5, 0x5f, 0xe4, 0xd7, 0xb9, 0xa2, 0x93, 0x9c, 0x61, 0x47, 0x13, - 0xf6, 0x14, 0x0c, 0xe1, 0xda, 0xda, 0xd0, 0x0e, 0x09, 0xde, 0xcd, 0xed, 0xa8, 0x6b, 0x47, 0x66, - 0xb6, 0x85, 0x1e, 0xb3, 0x23, 0x68, 0x4e, 0xbd, 0xe5, 0xd2, 0x91, 0xdd, 0x4d, 0x92, 0x39, 0xc8, - 0x99, 0x48, 0xb4, 0xe1, 0x86, 0xa5, 0xb9, 0x06, 0x2d, 0x68, 0x5c, 0xf1, 0xc5, 0x4a, 0x98, 0x0f, - 0xa1, 0x93, 0xca, 0x14, 0xd6, 0x85, 0xd6, 0x52, 0x84, 0x21, 0x9f, 0x89, 0x6e, 0xe5, 0xb0, 0xd2, - 0x37, 0xac, 0x68, 0x6a, 0x6e, 0xc3, 0x66, 0x3a, 0x4f, 0x52, 0x82, 0x98, 0x0b, 0x28, 0x78, 0x25, - 0x82, 0x10, 0x13, 0x40, 0x0b, 0xea, 0xa9, 0xf9, 0x39, 0xec, 0xe6, 0x93, 0x80, 0xed, 0x42, 0xed, - 0xad, 0xb8, 0xd6, 0x9c, 0x38, 0x64, 0x07, 0xda, 0x20, 0xca, 0x62, 0xc3, 0xd2, 0xd6, 0xfd, 0x26, - 0x96, 0x8d, 0xd3, 0x80, 0x7d, 0x06, 0x70, 0xc5, 0x17, 0x8e, 0xcd, 0xa5, 0x17, 0x84, 0xdd, 0xca, - 0x61, 0xad, 0xdf, 0x39, 0xd9, 0xd5, 0xee, 0x7e, 0x1b, 0x11, 0x06, 0xf5, 0x7f, 0xde, 0x3c, 0xd8, - 0xb0, 0x52, 0x9c, 0xa6, 0x1d, 0x3b, 0x40, 0xd9, 0xc1, 0x18, 0xd4, 0x6d, 0x2e, 0x39, 0x19, 0xb1, - 0x69, 0xd1, 0x18, 0xd7, 0x7c, 0x2e, 0xe7, 0xda, 0x08, 0x1a, 0xb3, 0xbb, 0xd0, 0x9c, 0x0b, 0x67, - 0x36, 0x97, 0x74, 0x6a, 0x6a, 0x96, 0x9e, 0xa1, 0xc5, 0x7e, 0xe0, 0x5d, 0x09, 0x3a, 0x20, 0x6d, - 0x4b, 0x4d, 0xcc, 0x7f, 0x57, 0x60, 0xef, 0x56, 0x46, 0xa1, 0xde, 0x39, 0x0f, 0xe7, 0xd1, 0xb7, - 0x70, 0xcc, 0x1e, 0xa3, 0x5e, 0x6e, 0x8b, 0x40, 0x1f, 0xdc, 0x2d, 0xed, 0xc3, 0x90, 0x16, 0xb5, - 0x03, 0x9a, 0x85, 0x3d, 0x86, 0x3d, 0x3e, 0x09, 0x85, 0x2b, 0xc7, 0x29, 0xdf, 0x6b, 0x87, 0xb5, - 0x7e, 0xc3, 0xda, 0x55, 0x84, 0xd8, 0xf5, 0x90, 0x0d, 0xe1, 0x60, 0x72, 0xfd, 0x8e, 0xbb, 0xd2, - 0x71, 0x45, 0x9a, 0xbf, 0x4e, 0xb1, 0xda, 0xd1, 0xdf, 0x79, 0x71, 0xe5, 0xd8, 0xc2, 0x9d, 0x0a, - 0xfd, 0xa5, 0xfd, 0x58, 0x24, 0xd1, 0x64, 0x1e, 0xc2, 0x76, 0x36, 0xc9, 0xd9, 0x36, 0x54, 0xe5, - 0x5a, 0xfb, 0x51, 0x95, 0x6b, 0xd3, 0x8c, 0x77, 0x28, 0x4e, 0xe8, 0x5b, 0x3c, 0x8f, 0x60, 0x27, - 0x97, 0xbb, 0xa9, 0xa0, 0x56, 0xd2, 0x41, 0x35, 0x77, 0x60, 0x2b, 0x93, 0xb2, 0xe6, 0x0f, 0x0d, - 0x68, 0x5b, 0x22, 0xf4, 0x3d, 0x37, 0x14, 0xec, 0x19, 0x18, 0x62, 0x3d, 0x15, 0x0a, 0x67, 0x2a, - 0xb9, 0x53, 0xac, 0x78, 0x5e, 0x44, 0x74, 0x3c, 0x56, 0x31, 0x33, 0x7b, 0x94, 0xc1, 0xc8, 0xfd, - 0xbc, 0x50, 0x1a, 0x24, 0x3f, 0xca, 0x82, 0xe4, 0x41, 0x8e, 0x37, 0x87, 0x92, 0x8f, 0x32, 0x28, - 0x99, 0x57, 0x9c, 0x81, 0xc9, 0xd3, 0x02, 0x98, 0xcc, 0x9b, 0x5f, 0x82, 0x93, 0xa7, 0x05, 0x38, - 0xd9, 0xbd, 0xf5, 0xad, 0x42, 0xa0, 0xfc, 0x28, 0x0b, 0x94, 0x79, 0x77, 0x72, 0x48, 0xf9, 0xab, - 0x22, 0xa4, 0xfc, 0x20, 0x27, 0x53, 0x0a, 0x95, 0x9f, 0xde, 0x82, 0xca, 0xbb, 0x39, 0xd1, 0x02, - 0xac, 0x3c, 0xcd, 0x60, 0x25, 0x14, 0xfa, 0x56, 0x02, 0x96, 0x9f, 0xdd, 0x06, 0xcb, 0x7b, 0xf9, - 0xad, 0x2d, 0x42, 0xcb, 0xe3, 0x1c, 0x5a, 0xde, 0xc9, 0x5b, 0x59, 0x0a, 0x97, 0x8f, 0xf0, 0x74, - 0xe7, 0x32, 0x0d, 0x91, 0x40, 0x04, 0x81, 0x17, 0x68, 0x3c, 0x53, 0x13, 0xb3, 0x8f, 0x78, 0x93, - 0xe4, 0xd7, 0xff, 0x80, 0x56, 0x4a, 0xfa, 0x54, 0x76, 0x99, 0x7f, 0xaa, 0x24, 0xb2, 0x84, 0xae, - 0x69, 0xac, 0x32, 0x34, 0x56, 0xa5, 0x10, 0xb7, 0x9a, 0x41, 0x5c, 0xf6, 0x4b, 0xd8, 0x5b, 0xf0, - 0x50, 0xaa, 0xb8, 0x8c, 0x33, 0xe0, 0xb5, 0x83, 0x04, 0x15, 0x10, 0x85, 0x62, 0x4f, 0x60, 0x3f, - 0xc5, 0xcb, 0x7d, 0x7f, 0x4c, 0x40, 0x55, 0xa7, 0xc3, 0xbb, 0x1b, 0x73, 0x3f, 0xf7, 0xfd, 0x21, - 0x0f, 0xe7, 0xe6, 0x69, 0xe2, 0x7f, 0x82, 0xe6, 0x0c, 0xea, 0x53, 0xcf, 0x56, 0x6e, 0x6d, 0x59, - 0x34, 0x46, 0x84, 0x5f, 0x78, 0x33, 0x6d, 0x19, 0x0e, 0xcd, 0xfd, 0x44, 0x34, 0x4e, 0x55, 0xf3, - 0xef, 0xd5, 0xc4, 0xf7, 0x18, 0x96, 0x6f, 0x29, 0x3b, 0x80, 0x86, 0xe3, 0xda, 0x62, 0x4d, 0xea, - 0x6a, 0x96, 0x9a, 0xb0, 0x81, 0x2a, 0x22, 0xe8, 0xd8, 0xe6, 0xe0, 0x63, 0x04, 0xb1, 0xff, 0xdc, - 0x3c, 0xe8, 0xa7, 0xfa, 0x28, 0x29, 0x5c, 0x5b, 0x04, 0x4b, 0xc7, 0x95, 0xc7, 0x33, 0xef, 0xc9, - 0xf7, 0x4e, 0x20, 0x8e, 0x31, 0x72, 0x47, 0x83, 0x6b, 0x29, 0x42, 0x55, 0x76, 0xbe, 0x8a, 0xca, - 0x4e, 0xfd, 0x3d, 0xb5, 0x28, 0x71, 0xd4, 0xe3, 0x07, 0x9e, 0x77, 0x49, 0xc7, 0xfa, 0xbd, 0xf4, - 0x90, 0x78, 0x0a, 0x17, 0x9b, 0x99, 0x62, 0xa3, 0xc3, 0xd9, 0x4a, 0xc2, 0x79, 0x00, 0xec, 0xf6, - 0x79, 0x34, 0xff, 0x5c, 0x41, 0xac, 0xcd, 0x9c, 0xb5, 0xc2, 0x88, 0x9e, 0xeb, 0x84, 0xaa, 0xbe, - 0xa7, 0xb9, 0x2a, 0x05, 0xb5, 0x55, 0xb5, 0xd8, 0x2a, 0x5c, 0x99, 0xf1, 0x90, 0xa2, 0x59, 0xb3, - 0x70, 0x88, 0x2b, 0x97, 0x42, 0x50, 0x5c, 0x6a, 0x16, 0x0e, 0xcd, 0xbf, 0x56, 0x92, 0x4c, 0x48, - 0x8a, 0xc6, 0xcf, 0x69, 0xe5, 0x43, 0xa8, 0x4b, 0x3e, 0x8b, 0x0a, 0x62, 0x54, 0x78, 0xbf, 0xfe, - 0xf6, 0x35, 0x77, 0xa2, 0xc2, 0x4b, 0x0c, 0xe6, 0x5f, 0x2a, 0x58, 0xde, 0xb2, 0x48, 0xc2, 0xce, - 0x60, 0x2f, 0x2e, 0xaa, 0xe3, 0x95, 0x6f, 0x73, 0x29, 0xfe, 0x5f, 0x1f, 0xb2, 0x1b, 0x0b, 0xfc, - 0x5e, 0xf1, 0xb3, 0x57, 0x70, 0x6f, 0x8a, 0x5a, 0xdd, 0x70, 0x15, 0x8e, 0x7d, 0x1e, 0xf0, 0x65, - 0xac, 0xaa, 0x9a, 0x41, 0xce, 0xb3, 0x88, 0xeb, 0x35, 0x32, 0x85, 0xd6, 0x9d, 0x69, 0x66, 0x41, - 0xeb, 0x33, 0xff, 0x88, 0x95, 0x3a, 0x8d, 0x5e, 0x3f, 0x67, 0x40, 0x29, 0xed, 0x72, 0x86, 0xb2, - 0x63, 0x00, 0x05, 0x2a, 0xa1, 0xf3, 0x4e, 0xe8, 0x6a, 0x1d, 0xc5, 0x87, 0x02, 0xf9, 0xc6, 0x79, - 0x27, 0x2c, 0x63, 0x12, 0x0d, 0xd9, 0x87, 0xd0, 0x92, 0x6b, 0xc5, 0x9d, 0xed, 0x88, 0x2e, 0xd6, - 0xc4, 0xda, 0x94, 0xf4, 0xcf, 0x9e, 0xc2, 0xa6, 0x52, 0x3c, 0xf3, 0xc2, 0xd0, 0xf1, 0x75, 0x9d, - 0x66, 0x69, 0xd5, 0x2f, 0x89, 0x62, 0x75, 0x26, 0xc9, 0xc4, 0xfc, 0x03, 0x18, 0xf1, 0x67, 0xd9, - 0x7d, 0x30, 0x96, 0x7c, 0x3d, 0x9e, 0x5c, 0xab, 0xbd, 0xab, 0xf4, 0x1b, 0x56, 0x7b, 0xc9, 0xd7, - 0xe4, 0x25, 0xbb, 0x07, 0x2d, 0x24, 0xca, 0xb5, 0xda, 0x8b, 0x86, 0xd5, 0x5c, 0xf2, 0xf5, 0xc5, - 0x3a, 0x26, 0x60, 0x86, 0xeb, 0x5e, 0x70, 0xc9, 0xd7, 0x2f, 0x79, 0x68, 0x7e, 0x09, 0x4d, 0x65, - 0xe4, 0x4f, 0x52, 0x8c, 0xf2, 0xd5, 0x8c, 0xfc, 0xaf, 0xa1, 0x93, 0xb2, 0x9b, 0x7d, 0x02, 0x77, - 0x94, 0x87, 0x3e, 0x0f, 0x24, 0x45, 0x24, 0xa3, 0x90, 0x11, 0xf1, 0x35, 0x0f, 0x24, 0x7e, 0x92, - 0x54, 0x9b, 0xff, 0xaa, 0x42, 0x53, 0x75, 0x8e, 0xec, 0x43, 0xac, 0xc2, 0xdc, 0x71, 0xc7, 0x8e, - 0xad, 0x0a, 0xc6, 0xa0, 0xf3, 0xe3, 0xcd, 0x83, 0x16, 0x01, 0xee, 0xe8, 0x1c, 0x0b, 0x2f, 0x0e, - 0xec, 0x14, 0xd6, 0x54, 0x33, 0x58, 0xc3, 0xa0, 0x2e, 0x9d, 0xa5, 0xd0, 0x2e, 0xd2, 0x18, 0x2d, - 0x77, 0x57, 0x4b, 0x0a, 0x49, 0x5d, 0x85, 0xc4, 0x5d, 0x2d, 0x31, 0x24, 0x2f, 0x61, 0x2b, 0x55, - 0x3f, 0x1c, 0x5b, 0xf7, 0x35, 0xdb, 0xe9, 0xdd, 0x18, 0x9d, 0x0f, 0xf6, 0x31, 0xd5, 0x7e, 0xbc, - 0x79, 0xd0, 0xf9, 0x6d, 0x54, 0x51, 0x46, 0xe7, 0x56, 0x27, 0x2e, 0x2f, 0x23, 0x9b, 0xf5, 0x81, - 0xaa, 0xcd, 0x58, 0x55, 0x5c, 0x55, 0x85, 0x9a, 0x54, 0x85, 0xb6, 0x71, 0x5d, 0x97, 0x64, 0x6c, - 0x9c, 0xef, 0x83, 0x81, 0x69, 0xa8, 0x58, 0x5a, 0xc4, 0xd2, 0xc6, 0x05, 0x22, 0x3e, 0x84, 0x9d, - 0xa4, 0xe3, 0x55, 0x2c, 0x6d, 0xa5, 0x25, 0x59, 0x26, 0xc6, 0x0f, 0xa0, 0x1d, 0x57, 0x3b, 0x83, - 0x38, 0x5a, 0x5c, 0x17, 0xb9, 0x6f, 0xa0, 0xa5, 0x4d, 0x2c, 0x6c, 0xdc, 0x3f, 0x86, 0x06, 0xee, - 0x4b, 0x74, 0x50, 0xa3, 0x8e, 0x8a, 0xf6, 0x43, 0xc8, 0x4c, 0xfb, 0xae, 0x18, 0xcd, 0x53, 0xd8, - 0xca, 0x50, 0xb1, 0xa0, 0x49, 0x4f, 0xf2, 0x85, 0xde, 0x50, 0x35, 0x89, 0x3f, 0x56, 0x4d, 0x3e, - 0x66, 0x7e, 0x0e, 0x46, 0x0c, 0x26, 0xb8, 0x0b, 0xfe, 0x6a, 0x32, 0x8e, 0xae, 0x4e, 0x9b, 0x56, - 0xd3, 0x5f, 0x4d, 0xbe, 0x56, 0xb7, 0x27, 0xdf, 0xfb, 0x5e, 0x5f, 0x25, 0x6a, 0x96, 0x9a, 0x98, - 0x5f, 0x40, 0x3b, 0x6a, 0xf2, 0xcb, 0x45, 0x4b, 0xb2, 0xc0, 0xfc, 0x5b, 0x05, 0x9a, 0x0a, 0x11, - 0x0b, 0x6e, 0x6b, 0x9f, 0xd0, 0x1d, 0x6c, 0x25, 0xc6, 0xe8, 0x3a, 0x09, 0x6e, 0xc7, 0x07, 0x50, - 0x09, 0x1d, 0x5d, 0x5c, 0xfb, 0xc2, 0x32, 0x88, 0x0b, 0x87, 0xec, 0x17, 0xb0, 0xa9, 0x44, 0x42, - 0x19, 0x38, 0x6e, 0x84, 0x1e, 0x1d, 0x5a, 0x7b, 0x43, 0x4b, 0xb8, 0xb1, 0x8a, 0xc5, 0x71, 0xa5, - 0x2e, 0x21, 0x6d, 0x5a, 0x18, 0xb9, 0xd2, 0xbc, 0x0f, 0x75, 0xd2, 0x03, 0xd0, 0x7c, 0x73, 0x61, - 0x8d, 0x5e, 0xbd, 0xdc, 0xdd, 0x60, 0x2d, 0xa8, 0x8d, 0x5e, 0x5d, 0xec, 0x56, 0x4e, 0x7e, 0x68, - 0xc0, 0xce, 0xf3, 0xc1, 0xd9, 0xe8, 0xb9, 0xef, 0x2f, 0x9c, 0x29, 0xa7, 0xae, 0xe4, 0x18, 0xea, - 0xd4, 0x77, 0x15, 0x3c, 0x88, 0xf4, 0x8a, 0x2e, 0x00, 0xec, 0x04, 0x1a, 0xd4, 0x7e, 0xb1, 0xa2, - 0x77, 0x91, 0x5e, 0xe1, 0x3d, 0x00, 0x3f, 0xa2, 0x1a, 0xb4, 0xdb, 0xcf, 0x23, 0xbd, 0xa2, 0xcb, - 0x00, 0xfb, 0x12, 0x8c, 0xa4, 0x71, 0x2a, 0x7b, 0x24, 0xe9, 0x95, 0x5e, 0x0b, 0x50, 0x3e, 0xa9, - 0x99, 0x65, 0x4f, 0x0a, 0xbd, 0xd2, 0xfe, 0x99, 0x3d, 0x83, 0x56, 0xd4, 0x17, 0x14, 0x3f, 0x63, - 0xf4, 0x4a, 0x5a, 0x76, 0x0c, 0x8f, 0xea, 0xd0, 0x8a, 0xde, 0x5a, 0x7a, 0x85, 0xf7, 0x0a, 0xf6, - 0x14, 0x9a, 0xba, 0x1a, 0x15, 0x3e, 0x48, 0xf4, 0x8a, 0x1b, 0x6f, 0x74, 0x32, 0xb9, 0xef, 0x97, - 0xbd, 0x07, 0xf5, 0x4a, 0x2f, 0x40, 0xec, 0x39, 0x40, 0xea, 0xf2, 0x5d, 0xfa, 0xd0, 0xd3, 0x2b, - 0xbf, 0xd8, 0x30, 0x3c, 0x3b, 0xf1, 0x65, 0xb5, 0xf8, 0x01, 0xa6, 0x57, 0x76, 0xd7, 0x98, 0x34, - 0xe9, 0x91, 0xee, 0xd3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x2c, 0x50, 0x08, 0xef, 0x13, - 0x00, 0x00, + // 1726 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x72, 0x13, 0xcf, + 0x11, 0xb7, 0xbe, 0xa5, 0x96, 0xfc, 0x35, 0xb6, 0xb1, 0x10, 0x07, 0xbb, 0xf6, 0x80, 0xe5, 0x00, + 0x16, 0x31, 0x81, 0xc2, 0x90, 0xa2, 0x62, 0xd9, 0x80, 0x14, 0x52, 0x81, 0x2c, 0x84, 0x43, 0x2e, + 0xaa, 0x91, 0x76, 0x2c, 0x6d, 0x21, 0xed, 0x2e, 0xbb, 0x23, 0x23, 0x53, 0x79, 0x04, 0xee, 0x39, + 0xe7, 0x94, 0xbc, 0x41, 0xf2, 0x04, 0xa9, 0xa4, 0xf2, 0x06, 0x39, 0xf8, 0xc0, 0x93, 0xa4, 0x7a, + 0x66, 0xf6, 0x53, 0xbb, 0x7f, 0xfe, 0xc5, 0x81, 0x8b, 0x34, 0xb3, 0xfd, 0x31, 0xdd, 0x3d, 0x3d, + 0xbf, 0xee, 0x19, 0xd8, 0xe4, 0x57, 0x0e, 0xf3, 0x3a, 0xe2, 0xf7, 0xc8, 0x71, 0x6d, 0x6e, 0x93, + 0x92, 0x98, 0xb4, 0xee, 0x8d, 0x4d, 0x3e, 0x99, 0x0f, 0x8f, 0x46, 0xf6, 0xac, 0x33, 0xb6, 0xc7, + 0x76, 0x47, 0x50, 0x87, 0xf3, 0x0b, 0x31, 0x13, 0x13, 0x31, 0x92, 0x52, 0xda, 0xbf, 0x8a, 0x50, + 0xd1, 0xd9, 0xc7, 0x39, 0xf3, 0x38, 0x69, 0x43, 0x91, 0x8d, 0x26, 0x76, 0x33, 0xbf, 0x9f, 0x6b, + 0xd7, 0x8f, 0xc9, 0x91, 0xd4, 0xae, 0xa8, 0xcf, 0x47, 0x13, 0xbb, 0xb7, 0xa2, 0x0b, 0x0e, 0x72, + 0x07, 0x4a, 0x17, 0xd3, 0xb9, 0x37, 0x69, 0x16, 0x04, 0xeb, 0x56, 0x9c, 0xf5, 0x05, 0x92, 0x7a, + 0x2b, 0xba, 0xe4, 0x41, 0xb5, 0xa6, 0x75, 0x61, 0x37, 0x8b, 0x69, 0x6a, 0xfb, 0xd6, 0x85, 0x50, + 0x8b, 0x1c, 0xe4, 0x31, 0x80, 0xc7, 0xf8, 0xc0, 0x76, 0xb8, 0x69, 0x5b, 0xcd, 0x92, 0xe0, 0xdf, + 0x8d, 0xf3, 0xbf, 0x65, 0xfc, 0xb5, 0x20, 0xf7, 0x56, 0xf4, 0x9a, 0xe7, 0x4f, 0x50, 0xd2, 0xb4, + 0x4c, 0x3e, 0x18, 0x4d, 0xa8, 0x69, 0x35, 0xcb, 0x69, 0x92, 0x7d, 0xcb, 0xe4, 0x67, 0x48, 0x46, + 0x49, 0xd3, 0x9f, 0xa0, 0x2b, 0x1f, 0xe7, 0xcc, 0xbd, 0x6a, 0x56, 0xd2, 0x5c, 0xf9, 0x03, 0x92, + 0xd0, 0x15, 0xc1, 0x43, 0x9e, 0x42, 0x7d, 0xc8, 0xc6, 0xa6, 0x35, 0x18, 0x4e, 0xed, 0xd1, 0x87, + 0x66, 0x55, 0x88, 0x34, 0xe3, 0x22, 0x5d, 0x64, 0xe8, 0x22, 0xbd, 0xb7, 0xa2, 0xc3, 0x30, 0x98, + 0x91, 0x63, 0xa8, 0x8e, 0x26, 0x6c, 0xf4, 0x61, 0xc0, 0x17, 0xcd, 0x9a, 0x90, 0xdc, 0x89, 0x4b, + 0x9e, 0x21, 0xf5, 0xdd, 0xa2, 0xb7, 0xa2, 0x57, 0x46, 0x72, 0x88, 0x7e, 0x19, 0x6c, 0x6a, 0x5e, + 0x32, 0x17, 0xa5, 0xb6, 0xd2, 0xfc, 0x3a, 0x97, 0x74, 0x21, 0x57, 0x33, 0xfc, 0x09, 0x79, 0x08, + 0x35, 0x66, 0x19, 0xca, 0xd0, 0xba, 0x10, 0xbc, 0x91, 0xd8, 0x51, 0xcb, 0xf0, 0xcd, 0xac, 0x32, + 0x35, 0x26, 0x47, 0x50, 0x1e, 0xd9, 0xb3, 0x99, 0xc9, 0x9b, 0x0d, 0x21, 0xb3, 0x9d, 0x30, 0x51, + 0xd0, 0x7a, 0x2b, 0xba, 0xe2, 0xea, 0x56, 0xa0, 0x74, 0x49, 0xa7, 0x73, 0xa6, 0x1d, 0x40, 0x3d, + 0x92, 0x29, 0xa4, 0x09, 0x95, 0x19, 0xf3, 0x3c, 0x3a, 0x66, 0xcd, 0xdc, 0x7e, 0xae, 0x5d, 0xd3, + 0xfd, 0xa9, 0xb6, 0x06, 0x8d, 0x68, 0x9e, 0x44, 0x04, 0x31, 0x17, 0x50, 0xf0, 0x92, 0xb9, 0x1e, + 0x26, 0x80, 0x12, 0x54, 0x53, 0xed, 0x09, 0x6c, 0x24, 0x93, 0x80, 0x6c, 0x40, 0xe1, 0x03, 0xbb, + 0x52, 0x9c, 0x38, 0x24, 0xdb, 0xca, 0x20, 0x91, 0xc5, 0x35, 0x5d, 0x59, 0xf7, 0xdb, 0x40, 0x36, + 0x48, 0x03, 0xf2, 0x08, 0xe0, 0x92, 0x4e, 0x4d, 0x83, 0x72, 0xdb, 0xf5, 0x9a, 0xb9, 0xfd, 0x42, + 0xbb, 0x7e, 0xbc, 0xa1, 0xdc, 0x7d, 0xef, 0x13, 0xba, 0xc5, 0x7f, 0x5f, 0xef, 0xad, 0xe8, 0x11, + 0x4e, 0xcd, 0x08, 0x1c, 0x10, 0xd9, 0x41, 0x08, 0x14, 0x0d, 0xca, 0xa9, 0x30, 0xa2, 0xa1, 0x8b, + 0x31, 0x7e, 0x73, 0x28, 0x9f, 0x28, 0x23, 0xc4, 0x98, 0xdc, 0x80, 0xf2, 0x84, 0x99, 0xe3, 0x09, + 0x17, 0xa7, 0xa6, 0xa0, 0xab, 0x19, 0x5a, 0xec, 0xb8, 0xf6, 0x25, 0x13, 0x07, 0xa4, 0xaa, 0xcb, + 0x89, 0xf6, 0xdf, 0x1c, 0x6c, 0x2e, 0x65, 0x14, 0xea, 0x9d, 0x50, 0x6f, 0xe2, 0xaf, 0x85, 0x63, + 0x72, 0x07, 0xf5, 0x52, 0x83, 0xb9, 0xea, 0xe0, 0xae, 0x2a, 0x1f, 0x7a, 0xe2, 0xa3, 0x72, 0x40, + 0xb1, 0x90, 0x3b, 0xb0, 0x49, 0x87, 0x1e, 0xb3, 0xf8, 0x20, 0xe2, 0x7b, 0x61, 0xbf, 0xd0, 0x2e, + 0xe9, 0x1b, 0x92, 0x10, 0xb8, 0xee, 0x91, 0x1e, 0x6c, 0x0f, 0xaf, 0x3e, 0x53, 0x8b, 0x9b, 0x16, + 0x8b, 0xf2, 0x17, 0x45, 0xac, 0xd6, 0xd5, 0x3a, 0xcf, 0x2f, 0x4d, 0x83, 0x59, 0x23, 0xa6, 0x56, + 0xda, 0x0a, 0x44, 0x42, 0x4d, 0xda, 0x3e, 0xac, 0xc5, 0x93, 0x9c, 0xac, 0x41, 0x9e, 0x2f, 0x94, + 0x1f, 0x79, 0xbe, 0xd0, 0xb4, 0x60, 0x87, 0x82, 0x84, 0x5e, 0xe2, 0x39, 0x84, 0xf5, 0x44, 0xee, + 0x46, 0x82, 0x9a, 0x8b, 0x06, 0x55, 0x5b, 0x87, 0xd5, 0x58, 0xca, 0x6a, 0x5f, 0x4a, 0x50, 0xd5, + 0x99, 0xe7, 0xd8, 0x96, 0xc7, 0xc8, 0x63, 0xa8, 0xb1, 0xc5, 0x88, 0x49, 0x9c, 0xc9, 0x25, 0x4e, + 0xb1, 0xe4, 0x79, 0xee, 0xd3, 0xf1, 0x58, 0x05, 0xcc, 0xe4, 0x30, 0x86, 0x91, 0x5b, 0x49, 0xa1, + 0x28, 0x48, 0xde, 0x8d, 0x83, 0xe4, 0x76, 0x82, 0x37, 0x81, 0x92, 0x87, 0x31, 0x94, 0x4c, 0x2a, + 0x8e, 0xc1, 0xe4, 0x49, 0x0a, 0x4c, 0x26, 0xcd, 0xcf, 0xc0, 0xc9, 0x93, 0x14, 0x9c, 0x6c, 0x2e, + 0xad, 0x95, 0x0a, 0x94, 0x77, 0xe3, 0x40, 0x99, 0x74, 0x27, 0x81, 0x94, 0xbf, 0x4e, 0x43, 0xca, + 0x9b, 0x09, 0x99, 0x4c, 0xa8, 0x7c, 0xb0, 0x04, 0x95, 0x37, 0x12, 0xa2, 0x29, 0x58, 0x79, 0x12, + 0xc3, 0x4a, 0x48, 0xf5, 0x2d, 0x03, 0x2c, 0x1f, 0x2d, 0x83, 0xe5, 0x6e, 0x72, 0x6b, 0xd3, 0xd0, + 0xb2, 0x93, 0x40, 0xcb, 0x9d, 0xa4, 0x95, 0x99, 0x70, 0x79, 0x88, 0xa7, 0x3b, 0x91, 0x69, 0x88, + 0x04, 0xcc, 0x75, 0x6d, 0x57, 0xe1, 0x99, 0x9c, 0x68, 0x6d, 0xc4, 0x9b, 0x30, 0xbf, 0x7e, 0x02, + 0x5a, 0x45, 0xd2, 0x47, 0xb2, 0x4b, 0xfb, 0x4b, 0x2e, 0x94, 0x15, 0xe8, 0x1a, 0xc5, 0xaa, 0x9a, + 0xc2, 0xaa, 0x08, 0xe2, 0xe6, 0x63, 0x88, 0x4b, 0x7e, 0x01, 0x9b, 0x53, 0xea, 0x71, 0x19, 0x97, + 0x41, 0x0c, 0xbc, 0xd6, 0x91, 0x20, 0x03, 0x22, 0x51, 0xec, 0x1e, 0x6c, 0x45, 0x78, 0xa9, 0xe3, + 0x0c, 0x04, 0x50, 0x15, 0xc5, 0xe1, 0xdd, 0x08, 0xb8, 0x4f, 0x1d, 0xa7, 0x47, 0xbd, 0x89, 0x76, + 0x12, 0xfa, 0x1f, 0xa2, 0x39, 0x81, 0xe2, 0xc8, 0x36, 0xa4, 0x5b, 0xab, 0xba, 0x18, 0x23, 0xc2, + 0x4f, 0xed, 0xb1, 0xb2, 0x0c, 0x87, 0xda, 0x56, 0x28, 0x1a, 0xa4, 0xaa, 0xf6, 0x8f, 0x7c, 0xe8, + 0x7b, 0x00, 0xcb, 0x4b, 0xca, 0xb6, 0xa1, 0x64, 0x5a, 0x06, 0x5b, 0x08, 0x75, 0x05, 0x5d, 0x4e, + 0x48, 0x57, 0x16, 0x11, 0x74, 0xac, 0xd1, 0xbd, 0x8f, 0x20, 0xf6, 0xbf, 0xeb, 0xbd, 0x76, 0xa4, + 0x8f, 0xe2, 0xcc, 0x32, 0x98, 0x3b, 0x33, 0x2d, 0xde, 0x19, 0xdb, 0xf7, 0x3e, 0x99, 0x2e, 0xeb, + 0x60, 0xe4, 0x8e, 0xba, 0x57, 0x9c, 0x79, 0xb2, 0xec, 0xbc, 0xf0, 0xcb, 0x4e, 0xf1, 0x3b, 0xb5, + 0x48, 0x71, 0xd4, 0xe3, 0xb8, 0xb6, 0x7d, 0x21, 0x8e, 0xf5, 0x77, 0xe9, 0x11, 0xe2, 0x11, 0x5c, + 0x2c, 0xc7, 0x8a, 0x8d, 0x0a, 0x67, 0x25, 0x0c, 0xe7, 0x36, 0x90, 0xe5, 0xf3, 0xa8, 0xfd, 0x33, + 0x87, 0x58, 0x1b, 0x3b, 0x6b, 0xa9, 0x11, 0x3d, 0x57, 0x09, 0x95, 0xff, 0x4e, 0x73, 0x65, 0x0a, + 0x2a, 0xab, 0x0a, 0x81, 0x55, 0xf8, 0x65, 0x4c, 0x3d, 0x11, 0xcd, 0x82, 0x8e, 0x43, 0x72, 0x00, + 0x85, 0x0b, 0xc6, 0x14, 0xdc, 0xf9, 0xb5, 0xe7, 0x55, 0xff, 0xd1, 0xaf, 0xde, 0x50, 0xd3, 0xaf, + 0x72, 0xc8, 0xa1, 0xfd, 0x3d, 0x17, 0x26, 0x48, 0x58, 0x4b, 0x7e, 0xa4, 0xf1, 0x07, 0x50, 0xe4, + 0x74, 0xec, 0xd7, 0x49, 0xbf, 0x1e, 0xbf, 0x7a, 0x1f, 0xb1, 0x54, 0x30, 0x68, 0x7f, 0xcb, 0x61, + 0xd5, 0x8b, 0x03, 0x0c, 0x39, 0x83, 0xcd, 0xa0, 0xd6, 0x0e, 0xe6, 0x8e, 0x41, 0x39, 0xfb, 0x56, + 0x7b, 0xb2, 0x11, 0x08, 0xfc, 0x51, 0xf2, 0x93, 0xdf, 0xc3, 0xee, 0x08, 0xb5, 0x5a, 0xde, 0xdc, + 0x1b, 0x38, 0xd4, 0xa5, 0xb3, 0x40, 0x55, 0x3e, 0x06, 0xa8, 0x67, 0x3e, 0xd7, 0x1b, 0x64, 0xf2, + 0xf4, 0x9d, 0x51, 0xec, 0x83, 0xd2, 0xa7, 0xfd, 0x19, 0x0b, 0x78, 0x14, 0xd4, 0x7e, 0x64, 0x40, + 0xb5, 0xbf, 0xe6, 0x60, 0x3d, 0x61, 0x28, 0xe9, 0x00, 0x48, 0xac, 0xf1, 0xcc, 0xcf, 0x4c, 0x15, + 0x71, 0x3f, 0x3e, 0x22, 0x90, 0x6f, 0xcd, 0xcf, 0x4c, 0xaf, 0x0d, 0xfd, 0x21, 0xb9, 0x0d, 0x15, + 0xbe, 0x90, 0xdc, 0xf1, 0x46, 0xe9, 0xdd, 0x42, 0xb0, 0x96, 0xb9, 0xf8, 0x27, 0x0f, 0xa1, 0x21, + 0x15, 0x8f, 0x6d, 0xcf, 0x33, 0x1d, 0x55, 0xbe, 0x49, 0x54, 0xf5, 0x4b, 0x41, 0xd1, 0xeb, 0xc3, + 0x70, 0xa2, 0xfd, 0x09, 0x6a, 0xc1, 0xb2, 0xe4, 0x16, 0xd4, 0x66, 0x74, 0x31, 0x18, 0x5e, 0xc9, + 0xbd, 0xcb, 0xb5, 0x4b, 0x7a, 0x75, 0x46, 0x17, 0xc2, 0x4b, 0xb2, 0x0b, 0x15, 0x24, 0xf2, 0x85, + 0xdc, 0x8b, 0x92, 0x5e, 0x9e, 0xd1, 0xc5, 0xbb, 0x45, 0x40, 0xc0, 0xc4, 0x57, 0x2d, 0xe2, 0x8c, + 0x2e, 0x5e, 0x52, 0x4f, 0x7b, 0x06, 0x65, 0x69, 0xe4, 0xcf, 0x52, 0x8c, 0xf2, 0xf9, 0x98, 0xfc, + 0x6f, 0xa0, 0x1e, 0xb1, 0x9b, 0xfc, 0x12, 0x76, 0xa4, 0x87, 0x0e, 0x75, 0xb9, 0x88, 0x48, 0x4c, + 0x21, 0x11, 0xc4, 0x37, 0xd4, 0xe5, 0xb8, 0xa4, 0x50, 0xad, 0xfd, 0x27, 0x0f, 0x65, 0xd9, 0x50, + 0x92, 0xdb, 0x58, 0x9c, 0xa9, 0x69, 0x0d, 0x4c, 0x43, 0xd6, 0x91, 0x6e, 0xfd, 0xeb, 0xf5, 0x5e, + 0x45, 0xe0, 0x70, 0xff, 0x1c, 0xeb, 0x31, 0x0e, 0x8c, 0x08, 0x04, 0xe5, 0x63, 0x10, 0x44, 0xa0, + 0xc8, 0xcd, 0x19, 0x53, 0x2e, 0x8a, 0x31, 0x5a, 0x6e, 0xcd, 0x67, 0x22, 0x24, 0x45, 0x19, 0x12, + 0x6b, 0x3e, 0xc3, 0x90, 0xbc, 0x84, 0xd5, 0x48, 0x59, 0x31, 0x0d, 0x75, 0xfe, 0xd7, 0xa2, 0xbb, + 0xd1, 0x3f, 0xef, 0x6e, 0x61, 0xaa, 0x7d, 0xbd, 0xde, 0xab, 0xff, 0xce, 0x2f, 0x34, 0xfd, 0x73, + 0xbd, 0x1e, 0x54, 0x9d, 0xbe, 0x41, 0xda, 0x20, 0x8a, 0xd0, 0x40, 0x16, 0x62, 0x59, 0x9c, 0xca, + 0xa2, 0x38, 0xad, 0xe1, 0x77, 0x55, 0xa9, 0xb1, 0x9f, 0xbe, 0x05, 0x35, 0x4c, 0x43, 0xc9, 0x52, + 0x11, 0x2c, 0x55, 0xfc, 0x20, 0x88, 0x07, 0xb0, 0x1e, 0x36, 0xc2, 0x92, 0xa5, 0x2a, 0xb5, 0x84, + 0x9f, 0x05, 0xe3, 0x4d, 0xa8, 0x06, 0x45, 0xb0, 0x26, 0x38, 0x2a, 0x54, 0xd5, 0xbe, 0xd7, 0x50, + 0x51, 0x26, 0xa6, 0xf6, 0xf3, 0xf7, 0xa1, 0x84, 0xfb, 0xe2, 0x1f, 0x54, 0xbf, 0xd1, 0x12, 0xfb, + 0xc1, 0x78, 0xac, 0xab, 0x97, 0x8c, 0xda, 0x09, 0xac, 0xc6, 0xa8, 0x58, 0xe7, 0xb8, 0xcd, 0xe9, + 0x54, 0x6d, 0xa8, 0x9c, 0x04, 0x8b, 0xe5, 0xc3, 0xc5, 0xb4, 0x27, 0x50, 0x0b, 0xc0, 0x04, 0x77, + 0xc1, 0x99, 0x0f, 0x07, 0xfe, 0x8d, 0xaa, 0xa1, 0x97, 0x9d, 0xf9, 0xf0, 0x95, 0xbc, 0x54, 0x39, + 0xf6, 0x27, 0x75, 0xc3, 0x28, 0xe8, 0x72, 0xa2, 0x3d, 0x85, 0xaa, 0xdf, 0xfb, 0x67, 0x8b, 0x66, + 0x64, 0x81, 0x76, 0x1f, 0xca, 0x12, 0x10, 0xa3, 0x77, 0xb8, 0x46, 0xca, 0x1d, 0xae, 0xe1, 0xdf, + 0xe1, 0x8e, 0xa1, 0xea, 0xc3, 0xfd, 0xb7, 0x64, 0x0a, 0x4a, 0xe6, 0xf8, 0x4b, 0x09, 0xd6, 0x4f, + 0xbb, 0x67, 0xfd, 0x53, 0xc7, 0x99, 0x9a, 0x23, 0x2a, 0xba, 0x8c, 0x0e, 0x14, 0x45, 0x1f, 0x95, + 0xf2, 0xc0, 0xd1, 0x4a, 0x6b, 0xe8, 0xc9, 0x31, 0x94, 0x44, 0x3b, 0x45, 0xd2, 0xde, 0x39, 0x5a, + 0xa9, 0x7d, 0x3d, 0x2e, 0x22, 0x1b, 0xae, 0xe5, 0xe7, 0x8e, 0x56, 0x5a, 0x73, 0x4f, 0x9e, 0x41, + 0x2d, 0x6c, 0x84, 0xb2, 0x1e, 0x3d, 0x5a, 0x99, 0x6d, 0x3e, 0xca, 0x87, 0xc5, 0x2e, 0xeb, 0x89, + 0xa0, 0x95, 0xd9, 0x0f, 0x93, 0xc7, 0x50, 0xf1, 0xeb, 0x7c, 0xfa, 0xb3, 0x44, 0x2b, 0xa3, 0x05, + 0xc7, 0xf0, 0xc8, 0x8e, 0x2b, 0xed, 0xed, 0xa4, 0x95, 0x7a, 0x4f, 0x20, 0x0f, 0xa1, 0xac, 0xca, + 0x48, 0xea, 0x03, 0x43, 0x2b, 0xbd, 0x91, 0x46, 0x27, 0xc3, 0xfb, 0x7b, 0xd6, 0xfb, 0x4e, 0x2b, + 0xf3, 0x42, 0x43, 0x4e, 0x01, 0x22, 0x97, 0xe9, 0xcc, 0x87, 0x9b, 0x56, 0xf6, 0x45, 0x85, 0x60, + 0xd2, 0x07, 0x97, 0xcf, 0xf4, 0x07, 0x95, 0x56, 0xd6, 0xdd, 0x61, 0x58, 0x16, 0x8f, 0x6e, 0x0f, + 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x54, 0x68, 0xd8, 0x0b, 0xbf, 0x13, 0x00, 0x00, } diff --git a/types/types.proto b/types/types.proto index f968b9489..95575e4e5 100644 --- a/types/types.proto +++ b/types/types.proto @@ -139,7 +139,7 @@ message ResponseCheckTx { bytes data = 2 [(gogoproto.customtype) = "github.com/tendermint/go-wire/data.Bytes", (gogoproto.nullable) = false]; string log = 3; int64 gas = 4; - int64 fee = 5; + KI64Pair fee = 5 [(gogoproto.nullable) = false]; } message ResponseDeliverTx { @@ -230,14 +230,13 @@ message Evidence { // Abstract types message KVPair { - string key = 1; - enum Type { - STRING = 0; - INT = 1; - } - Type value_type = 2; - string value_string = 3; - int64 value_int = 4; + bytes key = 1; + bytes value = 2; +} + +message KI64Pair { + bytes key = 1; + int64 value = 2; } //---------------------------------------- diff --git a/types/util.go b/types/util.go index 57c997d07..b8db686a6 100644 --- a/types/util.go +++ b/types/util.go @@ -44,23 +44,3 @@ type validatorPretty struct { PubKey data.Bytes `json:"pub_key"` Power int64 `json:"power"` } - -//------------------------------------------------------------------------------ - -// KVPairInt is a helper method to build KV pair with an integer value. -func KVPairInt(key string, val int64) *KVPair { - return &KVPair{ - Key: key, - ValueInt: val, - ValueType: KVPair_INT, - } -} - -// KVPairString is a helper method to build KV pair with a string value. -func KVPairString(key, val string) *KVPair { - return &KVPair{ - Key: key, - ValueString: val, - ValueType: KVPair_STRING, - } -} diff --git a/types/util_test.go b/types/util_test.go deleted file mode 100644 index d006d56b3..000000000 --- a/types/util_test.go +++ /dev/null @@ -1,15 +0,0 @@ -package types - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestKVPairInt(t *testing.T) { - assert.Equal(t, KVPairInt("a", 1), &KVPair{Key: "a", ValueType: KVPair_INT, ValueInt: 1}) -} - -func TestKVPairString(t *testing.T) { - assert.Equal(t, KVPairString("a", "b"), &KVPair{Key: "a", ValueType: KVPair_STRING, ValueString: "b"}) -}