From ea888db12f9e7bd6cf0855affe973954685a746e Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 6 Nov 2019 21:40:03 +0100 Subject: [PATCH 1/2] Proto fix: rpc > create (targetId, position) --- docs/proto.md | 28 ++- pb/commands.pb.go | 251 +++++++++++-------- pb/models.pb.go | 512 ++++++++++++++++++++++++++++----------- pb/protos/commands.proto | 3 +- pb/protos/models.proto | 10 + 5 files changed, 556 insertions(+), 248 deletions(-) diff --git a/docs/proto.md b/docs/proto.md index bbe4bcd36..716460d55 100644 --- a/docs/proto.md +++ b/docs/proto.md @@ -146,6 +146,7 @@ - [Model.Account.Avatar](#anytype.Model.Account.Avatar) - [Model.Block](#anytype.Model.Block) - [Model.Block.Content](#anytype.Model.Block.Content) + - [Model.Block.Content.Bookmark](#anytype.Model.Block.Content.Bookmark) - [Model.Block.Content.Dashboard](#anytype.Model.Block.Content.Dashboard) - [Model.Block.Content.Dataview](#anytype.Model.Block.Content.Dataview) - [Model.Block.Content.Div](#anytype.Model.Block.Content.Div) @@ -178,6 +179,7 @@ - [Model.Block.Content.Text.MarkerType](#anytype.Model.Block.Content.Text.MarkerType) - [Model.Block.Content.Text.Style](#anytype.Model.Block.Content.Text.Style) - [Model.Block.Content.Video.State](#anytype.Model.Block.Content.Video.State) + - [Model.Block.Position](#anytype.Model.Block.Position) - [Model.Image.Size](#anytype.Model.Image.Size) - [Model.Struct.NullValue](#anytype.Model.Struct.NullValue) - [Model.Video.Size](#anytype.Model.Video.Size) @@ -706,7 +708,8 @@ Middleware-to-front-end response for an account select request, that can contain | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | block | [Model.Block](#anytype.Model.Block) | | | -| contextBlockId | [string](#string) | | | +| targetId | [string](#string) | | | +| position | [Model.Block.Position](#anytype.Model.Block.Position) | | | @@ -1932,6 +1935,7 @@ Avatar of a user's account. It could be an image or color | file | [Model.Block.Content.File](#anytype.Model.Block.Content.File) | | | | layout | [Model.Block.Content.Layout](#anytype.Model.Block.Content.Layout) | | | | div | [Model.Block.Content.Div](#anytype.Model.Block.Content.Div) | | | +| bookmark | [Model.Block.Content.Bookmark](#anytype.Model.Block.Content.Bookmark) | | | @@ -1948,6 +1952,16 @@ Avatar of a user's account. It could be an image or color + + +### Model.Block.Content.Bookmark +Model.Link.Preview preview = 1; + + + + + + ### Model.Block.Content.Dashboard @@ -2432,6 +2446,18 @@ variants, absence of any variant indicates an error. + + +### Model.Block.Position + + +| Name | Number | Description | +| ---- | ------ | ----------- | +| BEFORE | 0 | | +| AFTER | 1 | | + + + ### Model.Image.Size diff --git a/pb/commands.pb.go b/pb/commands.pb.go index c6a8b9255..109b563e9 100644 --- a/pb/commands.pb.go +++ b/pb/commands.pb.go @@ -1048,8 +1048,9 @@ func (m *RpcBlockCreate) XXX_DiscardUnknown() { var xxx_messageInfo_RpcBlockCreate proto.InternalMessageInfo type RpcBlockCreateRequest struct { - Block *ModelBlock `protobuf:"bytes,1,opt,name=block,proto3" json:"block,omitempty"` - ContextBlockId string `protobuf:"bytes,2,opt,name=contextBlockId,proto3" json:"contextBlockId,omitempty"` + Block *ModelBlock `protobuf:"bytes,1,opt,name=block,proto3" json:"block,omitempty"` + TargetId string `protobuf:"bytes,2,opt,name=targetId,proto3" json:"targetId,omitempty"` + Position ModelBlockPosition `protobuf:"varint,3,opt,name=position,proto3,enum=anytype.ModelBlockPosition" json:"position,omitempty"` } func (m *RpcBlockCreateRequest) Reset() { *m = RpcBlockCreateRequest{} } @@ -1092,13 +1093,20 @@ func (m *RpcBlockCreateRequest) GetBlock() *ModelBlock { return nil } -func (m *RpcBlockCreateRequest) GetContextBlockId() string { +func (m *RpcBlockCreateRequest) GetTargetId() string { if m != nil { - return m.ContextBlockId + return m.TargetId } return "" } +func (m *RpcBlockCreateRequest) GetPosition() ModelBlockPosition { + if m != nil { + return m.Position + } + return ModelBlock_BEFORE +} + type RpcBlockCreateResponse struct { Error *RpcBlockCreateResponseError `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` } @@ -3674,102 +3682,104 @@ func init() { func init() { proto.RegisterFile("commands.proto", fileDescriptor_0dff099eb2e3dfdb) } var fileDescriptor_0dff099eb2e3dfdb = []byte{ - // 1511 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0x4d, 0x8c, 0xdb, 0xd4, - 0x16, 0xc7, 0x27, 0x8e, 0x33, 0x99, 0x39, 0x33, 0x9d, 0xe7, 0x5a, 0x7d, 0xd5, 0xf4, 0xbe, 0x6a, - 0x5a, 0x4d, 0xdf, 0xeb, 0x9b, 0x4e, 0x5b, 0x53, 0x4d, 0xc5, 0x02, 0x44, 0x69, 0x9d, 0xc4, 0x99, - 0x1a, 0x12, 0x3b, 0xba, 0x71, 0x66, 0x00, 0x09, 0x59, 0x9e, 0xe4, 0x4e, 0xc6, 0xe0, 0xc4, 0xc1, - 0x71, 0xa7, 0xb4, 0x3b, 0x16, 0x88, 0x05, 0x42, 0x42, 0x48, 0xac, 0x90, 0x10, 0x6c, 0x69, 0x91, - 0xd8, 0x15, 0x21, 0x51, 0xa4, 0xc2, 0x02, 0x90, 0x90, 0x0a, 0x48, 0x80, 0x90, 0x40, 0xb4, 0x5d, - 0x21, 0xd4, 0x1d, 0x2c, 0x58, 0x80, 0xd0, 0xb5, 0x9d, 0xc4, 0x1e, 0x4d, 0x52, 0x7b, 0xd4, 0xaa, - 0xdd, 0xf9, 0xde, 0xdc, 0x7b, 0xce, 0xb9, 0xbf, 0xff, 0x39, 0xf7, 0x23, 0x30, 0x53, 0xb7, 0x5b, - 0x2d, 0xa3, 0xdd, 0xe8, 0x0a, 0x1d, 0xc7, 0x76, 0x6d, 0x3e, 0x6b, 0xb4, 0x2f, 0xb8, 0x17, 0x3a, - 0x04, 0x4d, 0xb7, 0xec, 0x06, 0xb1, 0x82, 0x6e, 0xb4, 0xab, 0xbe, 0x61, 0xb4, 0x9b, 0x24, 0x68, - 0xce, 0xff, 0x78, 0x14, 0xd2, 0xb8, 0x53, 0x47, 0x57, 0x01, 0x32, 0x39, 0xcb, 0xae, 0x3f, 0x8f, - 0x5e, 0x4e, 0x43, 0xf6, 0xac, 0xd9, 0x75, 0x6d, 0xe7, 0x02, 0xfa, 0x93, 0x01, 0xb6, 0x6c, 0x6f, - 0x12, 0x54, 0x87, 0x2c, 0x26, 0x2f, 0x9c, 0x23, 0x5d, 0x97, 0x9f, 0x01, 0xc6, 0x6c, 0xcc, 0xa6, - 0x0e, 0xa6, 0x16, 0x26, 0x31, 0x63, 0x36, 0xf8, 0xc3, 0xd4, 0x73, 0xdb, 0x25, 0x2f, 0xba, 0xde, - 0x7c, 0xb9, 0x31, 0xcb, 0x78, 0xbf, 0x6d, 0xe9, 0xe5, 0x0f, 0xc2, 0x54, 0xcb, 0xde, 0x24, 0x45, - 0xdb, 0x39, 0x6f, 0x38, 0x8d, 0xd9, 0xf4, 0xc1, 0xd4, 0xc2, 0x04, 0x0e, 0x77, 0xa1, 0x57, 0x19, - 0x98, 0xc0, 0xa4, 0xdb, 0xb1, 0xdb, 0x5d, 0xc2, 0x17, 0x20, 0x43, 0x1c, 0xc7, 0x76, 0x3c, 0x4f, - 0x53, 0x4b, 0x82, 0x10, 0x2c, 0x47, 0xc0, 0x9d, 0xba, 0xe0, 0xd9, 0x14, 0x82, 0x28, 0x05, 0x1a, - 0xa1, 0xd0, 0x9b, 0x28, 0x48, 0x74, 0x16, 0xf6, 0x27, 0xa3, 0x0f, 0x53, 0x90, 0xf1, 0x3a, 0xf8, - 0x65, 0x60, 0xeb, 0x76, 0x83, 0x78, 0xe6, 0x66, 0x96, 0x4e, 0x26, 0x33, 0x27, 0xe4, 0xed, 0x06, - 0xc1, 0x9e, 0x01, 0xba, 0x8e, 0x06, 0xe9, 0xd6, 0x1d, 0xb3, 0xe3, 0x9a, 0x76, 0x3b, 0x58, 0x6c, - 0xb8, 0x6b, 0xbe, 0x00, 0x2c, 0x1d, 0xcf, 0x4f, 0x00, 0xab, 0xd4, 0x4a, 0x25, 0x6e, 0x8c, 0xdf, - 0x0d, 0xbb, 0x6a, 0xca, 0x93, 0x8a, 0xba, 0xaa, 0xe8, 0x12, 0xc6, 0x2a, 0xe6, 0x52, 0xfc, 0x2e, - 0x98, 0xcc, 0x89, 0x05, 0x5d, 0x56, 0x2a, 0x35, 0x8d, 0x63, 0x78, 0x0e, 0xa6, 0xf3, 0xa2, 0xa2, - 0x2b, 0xaa, 0xa6, 0x97, 0xd5, 0x15, 0x89, 0x4b, 0xa3, 0xd7, 0x18, 0x60, 0xd5, 0x0e, 0x69, 0xa3, - 0x7d, 0x43, 0xd9, 0xa3, 0x5f, 0x53, 0x21, 0x62, 0x8f, 0x45, 0x89, 0x1d, 0xde, 0x66, 0x89, 0xd4, - 0xde, 0x10, 0x52, 0x6f, 0xf7, 0x49, 0x9d, 0x8e, 0x90, 0x3a, 0x1a, 0xcf, 0x4c, 0x32, 0x42, 0x4b, - 0xc9, 0x09, 0xa1, 0xef, 0x19, 0x18, 0xcf, 0x3b, 0xc4, 0x70, 0x09, 0x7a, 0x76, 0x40, 0x64, 0x11, - 0x32, 0x6b, 0x34, 0xa6, 0x60, 0xd1, 0x7b, 0xfa, 0xd1, 0x96, 0x69, 0xd2, 0xfb, 0xf1, 0x62, 0x7f, - 0x48, 0xdc, 0x4c, 0x45, 0xb7, 0xc3, 0x54, 0x1f, 0x8f, 0x52, 0x5d, 0xd8, 0x06, 0x87, 0x1f, 0xd5, - 0x10, 0xae, 0xef, 0xf4, 0xb9, 0x8a, 0x11, 0xae, 0xc7, 0xe3, 0x1a, 0xba, 0xf7, 0x64, 0xaf, 0x31, - 0x30, 0x5e, 0xeb, 0x34, 0x28, 0xd9, 0xb3, 0x03, 0xb2, 0xa7, 0x20, 0x1b, 0x6c, 0x15, 0xc1, 0xd2, - 0x0f, 0xf5, 0x23, 0xce, 0x7b, 0xfd, 0x42, 0xf9, 0x9c, 0xe5, 0x9a, 0x1d, 0x8b, 0xf8, 0xd1, 0x77, - 0x4b, 0x66, 0xd7, 0xc5, 0xbd, 0x39, 0x89, 0x21, 0xfa, 0x01, 0xdc, 0x05, 0x88, 0xdb, 0x1a, 0xba, - 0xf7, 0x10, 0xbf, 0xca, 0xc0, 0xf8, 0xaa, 0x61, 0x59, 0xc4, 0x45, 0x3f, 0x0f, 0x32, 0xf5, 0x7f, - 0x03, 0x9e, 0x08, 0x26, 0x1c, 0xdb, 0x76, 0x2b, 0x86, 0xbb, 0x11, 0x54, 0x70, 0xbf, 0x8d, 0x2e, - 0x87, 0x77, 0xbe, 0xd3, 0x51, 0x58, 0x47, 0x22, 0x6b, 0xf4, 0x5d, 0x8c, 0x4c, 0x39, 0xea, 0xa9, - 0xd5, 0x26, 0x2d, 0xbb, 0x6d, 0xd6, 0x83, 0xd5, 0xf5, 0xdb, 0xe8, 0x5a, 0x9f, 0x64, 0x2e, 0x42, - 0x52, 0x88, 0xed, 0x25, 0x19, 0xca, 0xea, 0x0e, 0xf6, 0xc2, 0x03, 0xf0, 0x9f, 0xa2, 0x28, 0x97, - 0xa4, 0x82, 0xae, 0xa9, 0x7a, 0x1e, 0x4b, 0xa2, 0x26, 0xe9, 0x25, 0x35, 0x2f, 0x96, 0x74, 0x2c, - 0x55, 0x54, 0x8e, 0xa0, 0x1b, 0x0c, 0xc5, 0x5a, 0xb7, 0x37, 0x89, 0x83, 0xc4, 0x58, 0x84, 0x47, - 0x32, 0x79, 0x23, 0x4c, 0xff, 0x4c, 0x94, 0xfe, 0xe2, 0x76, 0x5c, 0x02, 0xdf, 0x43, 0x92, 0xf5, - 0xd3, 0x3e, 0xe2, 0x7c, 0x04, 0xf1, 0x43, 0xf1, 0x4d, 0x3d, 0x00, 0x8c, 0xdf, 0x9a, 0x86, 0xac, - 0x58, 0xaf, 0xdb, 0xe7, 0xda, 0x2e, 0xfa, 0x80, 0xed, 0x27, 0xf4, 0xf9, 0x01, 0x6e, 0x1e, 0xd8, - 0xb6, 0xd1, 0x22, 0x01, 0x6a, 0xef, 0x9b, 0x5f, 0x84, 0x7f, 0x19, 0x9b, 0x86, 0x6b, 0x38, 0x25, - 0xbb, 0x6e, 0x58, 0x9e, 0x12, 0x5e, 0xc0, 0x67, 0xc7, 0xf0, 0xd6, 0x1f, 0xf8, 0x79, 0x98, 0xf2, - 0xbb, 0xf2, 0xb6, 0x65, 0x3b, 0xde, 0x85, 0x80, 0x8e, 0x0b, 0x77, 0xe6, 0x26, 0x60, 0xdc, 0x6f, - 0xa2, 0xcb, 0xe9, 0xb8, 0x22, 0x05, 0x51, 0x8f, 0xae, 0x91, 0x13, 0x90, 0x35, 0xfc, 0x71, 0x5e, - 0x80, 0x53, 0x4b, 0x7b, 0xb7, 0x9c, 0x1c, 0x81, 0x15, 0xdc, 0x1b, 0x86, 0x2e, 0x31, 0x71, 0x64, - 0x1d, 0xe9, 0x3c, 0x99, 0xac, 0x1f, 0xa5, 0x76, 0xa0, 0xeb, 0x31, 0x58, 0x10, 0xf3, 0x79, 0xb5, - 0xa6, 0x68, 0x81, 0xaa, 0x05, 0x3d, 0x57, 0xd3, 0xf4, 0x81, 0xd6, 0x55, 0x4d, 0xc4, 0x9a, 0xae, - 0xa8, 0x05, 0x89, 0xa3, 0x72, 0x1d, 0xbe, 0xc3, 0x68, 0x49, 0xd3, 0x15, 0xb1, 0x2c, 0x71, 0xeb, - 0x31, 0x2c, 0x4b, 0x9a, 0x2e, 0xae, 0x88, 0x9a, 0x88, 0xb9, 0x26, 0xfa, 0x2c, 0x3d, 0x28, 0xd1, - 0xc9, 0x7e, 0xce, 0xa0, 0xf7, 0xc3, 0x2a, 0x8a, 0x51, 0x15, 0x8f, 0x6e, 0x0b, 0x72, 0x74, 0xad, - 0xfd, 0xd4, 0x17, 0xa5, 0x10, 0x11, 0xe5, 0x44, 0x02, 0x5b, 0xc9, 0x54, 0xf9, 0x6d, 0x27, 0xaa, - 0xfc, 0x1b, 0x76, 0x2b, 0xaa, 0x1e, 0xe0, 0xab, 0xea, 0x45, 0xb5, 0xa6, 0x14, 0x38, 0xea, 0x6d, - 0xbf, 0x22, 0xf9, 0xf0, 0xb0, 0x94, 0x57, 0x57, 0x24, 0xac, 0xaf, 0x8a, 0xa5, 0x92, 0xa4, 0xe9, - 0x45, 0x19, 0x57, 0x35, 0x6e, 0xfd, 0x4e, 0x65, 0xda, 0xe4, 0x0f, 0xc1, 0x81, 0x41, 0x5b, 0x97, - 0x9e, 0x92, 0xab, 0x5a, 0xd5, 0xd3, 0x25, 0xaf, 0x62, 0x5c, 0xab, 0x68, 0x52, 0x81, 0xdb, 0xe0, - 0xf7, 0x02, 0x3f, 0xb0, 0x82, 0x6b, 0x8a, 0x2f, 0xbf, 0x49, 0xfd, 0x07, 0xfe, 0x7a, 0xee, 0xe9, - 0xfd, 0xb3, 0x22, 0xe1, 0xa2, 0x8a, 0xcb, 0x52, 0x81, 0x7b, 0x0e, 0xbd, 0xc9, 0xc2, 0x78, 0x95, - 0x58, 0xa4, 0xee, 0xa2, 0x87, 0x87, 0x3f, 0x01, 0xc2, 0x1b, 0x2f, 0xb3, 0xe5, 0x68, 0xfb, 0x36, - 0x71, 0xdd, 0xfa, 0xfe, 0xee, 0x5a, 0xdd, 0x7e, 0x93, 0xa8, 0x6e, 0xb7, 0x75, 0x9e, 0x2c, 0x43, - 0x6e, 0xa4, 0xee, 0xc1, 0x7e, 0x1c, 0x47, 0xe8, 0xf5, 0x21, 0x42, 0x37, 0xa3, 0xd6, 0x8b, 0xb2, - 0x52, 0xe8, 0xe5, 0xa2, 0x2e, 0x2b, 0x45, 0x95, 0xdb, 0xe0, 0x05, 0x58, 0x0c, 0x59, 0xa7, 0x59, - 0x10, 0x78, 0x10, 0x95, 0x82, 0x5e, 0x56, 0xa4, 0xb2, 0xaa, 0xc8, 0x79, 0xaf, 0xbf, 0x2a, 0x69, - 0x9c, 0x89, 0xbe, 0x63, 0x20, 0xbb, 0x42, 0x9c, 0xae, 0x69, 0xb7, 0xd1, 0x97, 0x0c, 0xa4, 0x97, - 0x89, 0x1b, 0x2e, 0xf3, 0x2b, 0xe1, 0x13, 0xf5, 0x54, 0x54, 0xf4, 0xff, 0x47, 0xb8, 0x07, 0x46, - 0x84, 0x65, 0x32, 0x4c, 0xf1, 0x59, 0xc8, 0x6e, 0xfa, 0x83, 0x02, 0xd8, 0xbd, 0x26, 0xfa, 0xba, - 0x7f, 0xd0, 0x9e, 0x89, 0x28, 0x7b, 0x2c, 0xa6, 0x87, 0x64, 0xb2, 0x36, 0x76, 0xa0, 0xea, 0x1e, - 0xe0, 0x56, 0x24, 0x5c, 0x95, 0x55, 0x45, 0x97, 0xab, 0xba, 0x54, 0xae, 0x68, 0x4f, 0x73, 0x69, - 0x3a, 0x88, 0x92, 0xec, 0xed, 0x02, 0x53, 0x90, 0xd5, 0xe4, 0xb2, 0xa4, 0xd6, 0x34, 0x6e, 0x1d, - 0x7d, 0x92, 0x86, 0x74, 0xc9, 0x6e, 0xa2, 0x2b, 0x69, 0x60, 0xab, 0xa4, 0xdd, 0x40, 0xef, 0xa5, - 0x06, 0x75, 0x37, 0x0b, 0xd9, 0x16, 0xe9, 0x76, 0x8d, 0x66, 0xef, 0xd0, 0xed, 0x35, 0xf9, 0x47, - 0x20, 0x63, 0x91, 0x4d, 0x62, 0x79, 0x81, 0xcf, 0x84, 0xae, 0xea, 0x94, 0x40, 0xc9, 0x6e, 0x0a, - 0xd4, 0x96, 0x10, 0xd8, 0x11, 0x4a, 0x74, 0x28, 0xf6, 0x67, 0xcc, 0x3f, 0x01, 0x19, 0xaf, 0xcd, - 0x4f, 0x42, 0xa6, 0x20, 0xe5, 0x6a, 0xcb, 0xdc, 0x18, 0xfd, 0xec, 0xad, 0x68, 0x12, 0x32, 0x45, - 0x51, 0x13, 0x4b, 0x1c, 0x43, 0x57, 0xee, 0xa5, 0x4b, 0x9a, 0x76, 0x56, 0x44, 0x45, 0xce, 0x73, - 0x2c, 0x8d, 0x7e, 0x55, 0xc4, 0x8a, 0xac, 0x2c, 0x73, 0x19, 0xf4, 0x52, 0x58, 0xf7, 0x47, 0xa3, - 0xba, 0xff, 0x77, 0x58, 0x4c, 0xa3, 0xdf, 0xed, 0xa7, 0x22, 0xd2, 0x1e, 0x89, 0x63, 0x24, 0x99, - 0xae, 0xca, 0x0e, 0x74, 0x1d, 0xa5, 0xe0, 0xdf, 0x0c, 0xb0, 0x72, 0x67, 0xbd, 0x8b, 0xfe, 0x08, - 0xea, 0xe2, 0x36, 0x03, 0x6c, 0xd1, 0xb4, 0xc8, 0xa8, 0x87, 0xfc, 0x17, 0xb1, 0x1f, 0x00, 0xd4, - 0xb4, 0x97, 0xcb, 0xd4, 0xe4, 0x90, 0x92, 0xe1, 0x81, 0x6d, 0x18, 0xae, 0xe1, 0xad, 0x76, 0x1a, - 0x7b, 0xdf, 0xfc, 0x1e, 0xc8, 0xb4, 0x48, 0xc3, 0x34, 0xfc, 0x7b, 0x16, 0xf6, 0x1b, 0xfd, 0x3b, - 0x1c, 0x3b, 0xb8, 0xc3, 0xa1, 0x8f, 0x63, 0x3d, 0x11, 0x46, 0xc5, 0x71, 0x7f, 0x05, 0x78, 0x65, - 0x1c, 0x32, 0x72, 0xcb, 0x68, 0x12, 0xf4, 0x57, 0xc6, 0x57, 0xe0, 0x77, 0x06, 0xd8, 0x9c, 0x65, - 0xaf, 0x85, 0x9f, 0xb7, 0x5b, 0xcf, 0xb0, 0xe3, 0xc0, 0x76, 0xcd, 0x8b, 0x24, 0x28, 0xa0, 0x7d, - 0x5b, 0x4e, 0x15, 0xcf, 0x9e, 0x50, 0x35, 0x2f, 0x12, 0xec, 0x0d, 0x43, 0xef, 0xc6, 0x7e, 0x33, - 0xf8, 0x53, 0x29, 0x29, 0x1a, 0xc2, 0x70, 0xc5, 0xd6, 0x2c, 0x7b, 0xad, 0xa7, 0x18, 0xfd, 0x46, - 0x57, 0x63, 0xbd, 0x23, 0x46, 0x9a, 0xbf, 0xff, 0x95, 0xe0, 0x25, 0xfe, 0xdd, 0xc3, 0x7e, 0x69, - 0x07, 0xd8, 0x47, 0x14, 0xca, 0x7e, 0x98, 0xb4, 0xa2, 0x0f, 0x15, 0x3c, 0xe8, 0x48, 0x2c, 0xc0, - 0x83, 0x56, 0x09, 0xb9, 0xfd, 0x9f, 0xdf, 0x9c, 0x4b, 0x5d, 0xbf, 0x39, 0x97, 0xfa, 0xe5, 0xe6, - 0x5c, 0xea, 0xf5, 0x5b, 0x73, 0x63, 0xd7, 0x6f, 0xcd, 0x8d, 0xfd, 0x70, 0x6b, 0x6e, 0xec, 0x19, - 0xa6, 0xb3, 0xb6, 0x36, 0xee, 0xfd, 0x03, 0x7c, 0xf2, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe8, - 0x3d, 0xdc, 0x1e, 0x39, 0x16, 0x00, 0x00, + // 1542 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4d, 0x8c, 0xdb, 0xd4, + 0x16, 0x9e, 0x38, 0xce, 0x64, 0xe6, 0xcc, 0x74, 0x9e, 0x6b, 0xf5, 0x55, 0xd3, 0xfb, 0xfa, 0xa6, + 0xd5, 0xf4, 0xbd, 0xbe, 0xe9, 0xb4, 0xf5, 0xab, 0xa6, 0x7a, 0x8b, 0x3e, 0x51, 0x5a, 0x27, 0x71, + 0xa6, 0x86, 0xc4, 0x8e, 0x6e, 0x9c, 0x19, 0x60, 0x63, 0x79, 0x92, 0x3b, 0x19, 0x83, 0x13, 0x07, + 0xc7, 0x9d, 0xd2, 0xee, 0x58, 0xa0, 0x4a, 0xfc, 0x48, 0x08, 0x89, 0x15, 0x12, 0x82, 0x2d, 0x2d, + 0x12, 0xbb, 0x22, 0x24, 0x40, 0x2a, 0x2c, 0x00, 0x09, 0xa9, 0x80, 0x84, 0xd8, 0x80, 0x68, 0xbb, + 0x42, 0xa8, 0xac, 0x60, 0xc1, 0x02, 0x84, 0xae, 0xed, 0x38, 0xf6, 0x68, 0x92, 0x3a, 0xa3, 0x56, + 0xed, 0xce, 0xf7, 0xe6, 0xdc, 0xef, 0x9c, 0xf3, 0x7d, 0xe7, 0xdc, 0x9f, 0xc0, 0x4c, 0xdd, 0x6e, + 0xb5, 0x8c, 0x76, 0xa3, 0x2b, 0x74, 0x1c, 0xdb, 0xb5, 0xf9, 0xac, 0xd1, 0xbe, 0xe8, 0x5e, 0xec, + 0x10, 0x34, 0xdd, 0xb2, 0x1b, 0xc4, 0x0a, 0xa6, 0xd1, 0xae, 0xfa, 0x86, 0xd1, 0x6e, 0x92, 0x60, + 0x38, 0xff, 0xe2, 0x31, 0x48, 0xe3, 0x4e, 0x1d, 0xfd, 0x02, 0x90, 0xc9, 0x59, 0x76, 0xfd, 0x19, + 0xf4, 0x42, 0x1a, 0xb2, 0xe7, 0xcc, 0xae, 0x6b, 0x3b, 0x17, 0xd1, 0xef, 0x0c, 0xb0, 0x65, 0x7b, + 0x93, 0xa0, 0x3a, 0x64, 0x31, 0x79, 0xf6, 0x3c, 0xe9, 0xba, 0xfc, 0x0c, 0x30, 0x66, 0x63, 0x36, + 0x75, 0x30, 0xb5, 0x30, 0x89, 0x19, 0xb3, 0xc1, 0x1f, 0xa6, 0x9e, 0xdb, 0x2e, 0x79, 0xce, 0xf5, + 0xd6, 0xcb, 0x8d, 0x59, 0xc6, 0xfb, 0x6d, 0xcb, 0x2c, 0x7f, 0x10, 0xa6, 0x5a, 0xf6, 0x26, 0x29, + 0xda, 0xce, 0x05, 0xc3, 0x69, 0xcc, 0xa6, 0x0f, 0xa6, 0x16, 0x26, 0x70, 0x74, 0x0a, 0xbd, 0xc4, + 0xc0, 0x04, 0x26, 0xdd, 0x8e, 0xdd, 0xee, 0x12, 0xbe, 0x00, 0x19, 0xe2, 0x38, 0xb6, 0xe3, 0x79, + 0x9a, 0x5a, 0x12, 0x84, 0x20, 0x1d, 0x01, 0x77, 0xea, 0x82, 0x87, 0x29, 0x04, 0x51, 0x0a, 0x34, + 0x42, 0xa1, 0xb7, 0x50, 0x90, 0xe8, 0x2a, 0xec, 0x2f, 0x46, 0xef, 0xa7, 0x20, 0xe3, 0x4d, 0xf0, + 0xcb, 0xc0, 0xd6, 0xed, 0x06, 0xf1, 0xe0, 0x66, 0x96, 0x4e, 0x8e, 0x06, 0x27, 0xe4, 0xed, 0x06, + 0xc1, 0x1e, 0x00, 0xcd, 0xa3, 0x41, 0xba, 0x75, 0xc7, 0xec, 0xb8, 0xa6, 0xdd, 0x0e, 0x92, 0x8d, + 0x4e, 0xcd, 0x17, 0x80, 0xa5, 0xf6, 0xfc, 0x04, 0xb0, 0x4a, 0xad, 0x54, 0xe2, 0xc6, 0xf8, 0xdd, + 0xb0, 0xab, 0xa6, 0x3c, 0xae, 0xa8, 0xab, 0x8a, 0x2e, 0x61, 0xac, 0x62, 0x2e, 0xc5, 0xef, 0x82, + 0xc9, 0x9c, 0x58, 0xd0, 0x65, 0xa5, 0x52, 0xd3, 0x38, 0x86, 0xe7, 0x60, 0x3a, 0x2f, 0x2a, 0xba, + 0xa2, 0x6a, 0x7a, 0x59, 0x5d, 0x91, 0xb8, 0x34, 0x7a, 0x85, 0x01, 0x56, 0xed, 0x90, 0x36, 0xda, + 0x37, 0x90, 0x7b, 0xf4, 0x53, 0x2a, 0xc2, 0xd8, 0x23, 0x71, 0xc6, 0x0e, 0x6f, 0x93, 0x22, 0xc5, + 0x1b, 0xc0, 0xd4, 0x9b, 0x21, 0x53, 0x67, 0x62, 0x4c, 0x1d, 0x4d, 0x06, 0x33, 0x1a, 0x43, 0x4b, + 0xa3, 0x33, 0x84, 0x2e, 0xa7, 0x61, 0x3c, 0xef, 0x10, 0xc3, 0x25, 0xe8, 0xe5, 0x54, 0x9f, 0x92, + 0x45, 0xc8, 0xac, 0xd1, 0xa0, 0x82, 0xac, 0xf7, 0x84, 0xe1, 0x96, 0x69, 0xd5, 0xfb, 0x01, 0x63, + 0xdf, 0x84, 0x47, 0x30, 0xe1, 0x1a, 0x4e, 0x93, 0xb8, 0x61, 0x91, 0x86, 0x63, 0xfe, 0x14, 0x4c, + 0x74, 0xec, 0xae, 0xe9, 0x45, 0x9c, 0xf6, 0x32, 0xff, 0xe7, 0x76, 0x50, 0x42, 0x25, 0x30, 0xc2, + 0xa1, 0x39, 0xba, 0x13, 0x55, 0xe1, 0xd1, 0xb8, 0x0a, 0x0b, 0xdb, 0xd0, 0xe7, 0x67, 0x31, 0x40, + 0x87, 0xb7, 0x42, 0x1d, 0xc4, 0x98, 0x0e, 0xc7, 0x93, 0x02, 0xdd, 0x7f, 0x25, 0xae, 0x33, 0x30, + 0x5e, 0xeb, 0x34, 0xa8, 0x12, 0xe7, 0xfa, 0x42, 0x9c, 0x86, 0x6c, 0xb0, 0xb5, 0x04, 0xa9, 0x1f, + 0x0a, 0x23, 0xce, 0x7b, 0xf3, 0x42, 0xf9, 0xbc, 0xe5, 0x9a, 0x1d, 0x8b, 0xf8, 0xd1, 0x77, 0x4b, + 0x66, 0xd7, 0xc5, 0xbd, 0x35, 0x23, 0x93, 0xe8, 0x07, 0x70, 0x0f, 0x48, 0xdc, 0x16, 0xe8, 0xfe, + 0x93, 0xf8, 0x65, 0x06, 0xc6, 0x57, 0x0d, 0xcb, 0x22, 0x2e, 0xfa, 0x81, 0x09, 0x2b, 0xfb, 0xdf, + 0x7d, 0x3e, 0x11, 0x4c, 0x38, 0xb6, 0xed, 0x56, 0x0c, 0x77, 0x23, 0xe8, 0xf8, 0x70, 0x8c, 0xae, + 0x46, 0x77, 0xca, 0x33, 0x71, 0xb2, 0x8e, 0xc4, 0x72, 0xf4, 0x5d, 0x0c, 0x2d, 0x39, 0xea, 0xa9, + 0xd5, 0x26, 0x2d, 0xbb, 0x6d, 0xd6, 0x7b, 0x6d, 0xd1, 0x1b, 0xa3, 0xeb, 0x21, 0x93, 0xb9, 0x18, + 0x93, 0x42, 0x62, 0x2f, 0xa3, 0x51, 0x59, 0xdd, 0xc1, 0xde, 0x79, 0x00, 0xfe, 0x51, 0x14, 0xe5, + 0x92, 0x54, 0xd0, 0x35, 0x55, 0xcf, 0x63, 0x49, 0xd4, 0x24, 0xbd, 0xa4, 0xe6, 0xc5, 0x92, 0x8e, + 0xa5, 0x8a, 0xca, 0x11, 0x74, 0x93, 0xa1, 0xb4, 0xd6, 0xed, 0x4d, 0xe2, 0x20, 0x31, 0x11, 0xc3, + 0x43, 0x39, 0x79, 0x2d, 0xca, 0xfe, 0xd9, 0x38, 0xfb, 0x8b, 0xdb, 0xf1, 0x12, 0xf8, 0x1e, 0x50, + 0xac, 0x9f, 0x84, 0x14, 0xe7, 0x63, 0x14, 0xff, 0x37, 0x39, 0xd4, 0x43, 0xc0, 0xf1, 0x1b, 0xd3, + 0x90, 0x15, 0xeb, 0x75, 0xfb, 0x7c, 0xdb, 0x45, 0xef, 0xb1, 0x61, 0x41, 0x5f, 0xe8, 0xd3, 0xcd, + 0x03, 0xdb, 0x36, 0x5a, 0x24, 0xa0, 0xda, 0xfb, 0xe6, 0x17, 0xe1, 0x6f, 0xc6, 0xa6, 0xe1, 0x1a, + 0x4e, 0xc9, 0xae, 0x1b, 0x96, 0xa7, 0x84, 0x17, 0xf0, 0xb9, 0x31, 0xbc, 0xf5, 0x07, 0x7e, 0x1e, + 0xa6, 0xfc, 0xa9, 0xbc, 0x6d, 0xd9, 0x8e, 0xb7, 0x49, 0x53, 0xbb, 0xe8, 0x64, 0x6e, 0x02, 0xc6, + 0xfd, 0x21, 0xba, 0x9a, 0x4e, 0x2a, 0x52, 0x10, 0xf5, 0xf0, 0x1e, 0x39, 0x01, 0x59, 0xc3, 0xb7, + 0xf3, 0x02, 0x9c, 0x5a, 0xda, 0xbb, 0xe5, 0x74, 0x08, 0x50, 0x70, 0xcf, 0x0c, 0x5d, 0x61, 0x92, + 0xc8, 0x3a, 0xd4, 0xf9, 0x68, 0xb2, 0x7e, 0x90, 0xda, 0x81, 0xae, 0xc7, 0x60, 0x41, 0xcc, 0xe7, + 0xd5, 0x9a, 0xa2, 0x05, 0xaa, 0x16, 0xf4, 0x5c, 0x4d, 0xd3, 0xfb, 0x5a, 0x57, 0x35, 0x11, 0x6b, + 0xba, 0xa2, 0x16, 0x24, 0x8e, 0xca, 0x75, 0xf8, 0x2e, 0xd6, 0x92, 0xa6, 0x2b, 0x62, 0x59, 0xe2, + 0xd6, 0x13, 0x20, 0x4b, 0x9a, 0x2e, 0xae, 0x88, 0x9a, 0x88, 0xb9, 0x26, 0xfa, 0x34, 0xdd, 0x6f, + 0xd1, 0xc9, 0xb0, 0x66, 0xd0, 0xbb, 0x51, 0x15, 0xc5, 0xb8, 0x8a, 0x47, 0xb7, 0x25, 0x72, 0x78, + 0xaf, 0x7d, 0x1f, 0x8a, 0x52, 0x88, 0x89, 0x72, 0x62, 0x04, 0xac, 0xd1, 0x54, 0xf9, 0x79, 0x27, + 0xaa, 0xfc, 0x1d, 0x76, 0x2b, 0xaa, 0x1e, 0xd0, 0x57, 0xd5, 0x8b, 0x6a, 0x4d, 0x29, 0x70, 0xd4, + 0xdb, 0x7e, 0x45, 0xf2, 0xc9, 0xc3, 0x52, 0x5e, 0x5d, 0x91, 0xb0, 0xbe, 0x2a, 0x96, 0x4a, 0x92, + 0xa6, 0x17, 0x65, 0x5c, 0xd5, 0xb8, 0xf5, 0xbb, 0xb5, 0x69, 0x93, 0x3f, 0x04, 0x07, 0xfa, 0x63, + 0x5d, 0x7a, 0x42, 0xae, 0x6a, 0x55, 0x4f, 0x97, 0xbc, 0x8a, 0x71, 0xad, 0xa2, 0x49, 0x05, 0x6e, + 0x83, 0xdf, 0x0b, 0x7c, 0x1f, 0x05, 0xd7, 0x14, 0x5f, 0x7e, 0x93, 0xfa, 0x0f, 0xfc, 0xf5, 0xdc, + 0xd3, 0xfb, 0x6a, 0x45, 0xc2, 0x45, 0x15, 0x97, 0xa5, 0x02, 0xf7, 0x34, 0x7a, 0x9d, 0x85, 0xf1, + 0x2a, 0xb1, 0x48, 0xdd, 0x45, 0xff, 0x1b, 0xfc, 0x64, 0x88, 0x6e, 0xbc, 0xcc, 0x96, 0xa3, 0xed, + 0x9b, 0x91, 0xfb, 0xd6, 0xf7, 0x77, 0xcf, 0xfa, 0xf6, 0xeb, 0x91, 0xfa, 0x76, 0x5b, 0xe7, 0xa3, + 0x55, 0xc8, 0xcd, 0xd4, 0x7d, 0xd8, 0x8f, 0x93, 0x08, 0xbd, 0x3e, 0x40, 0xe8, 0x66, 0x1c, 0xbd, + 0x28, 0x2b, 0x85, 0x5e, 0x2d, 0xea, 0xb2, 0x52, 0x54, 0xb9, 0x0d, 0x5e, 0x80, 0xc5, 0x08, 0x3a, + 0xad, 0x82, 0xc0, 0x83, 0xa8, 0x14, 0xf4, 0xb2, 0x22, 0x95, 0x55, 0x45, 0xce, 0x7b, 0xf3, 0x55, + 0x49, 0xe3, 0x4c, 0xf4, 0x2d, 0x03, 0xd9, 0x15, 0xe2, 0x74, 0xe9, 0x75, 0xf9, 0x0b, 0x06, 0xd2, + 0xcb, 0xc4, 0x8d, 0xb6, 0xf9, 0xb5, 0xe8, 0x89, 0x7a, 0x3a, 0x2e, 0xfa, 0x7f, 0x62, 0xbc, 0x07, + 0x20, 0xc2, 0x32, 0x19, 0xa4, 0xf8, 0x2c, 0x64, 0x37, 0x7d, 0xa3, 0x80, 0xec, 0xde, 0x10, 0x7d, + 0x15, 0x1e, 0xb4, 0x67, 0x63, 0xca, 0x1e, 0x4b, 0xe8, 0x61, 0x34, 0x59, 0x1b, 0x3b, 0x50, 0x75, + 0x0f, 0x70, 0x2b, 0x12, 0xae, 0xca, 0xaa, 0xa2, 0xcb, 0x55, 0x5d, 0x2a, 0x57, 0xb4, 0x27, 0xb9, + 0x34, 0x35, 0xa2, 0x4c, 0xf6, 0x76, 0x81, 0x29, 0xc8, 0x6a, 0x72, 0x59, 0x52, 0x6b, 0x1a, 0xb7, + 0x8e, 0x3e, 0x4e, 0x43, 0xba, 0x64, 0x37, 0xd1, 0xb5, 0x34, 0xb0, 0x55, 0xd2, 0x6e, 0xa0, 0x77, + 0x22, 0x6f, 0xa3, 0x59, 0xc8, 0xb6, 0x48, 0xb7, 0x6b, 0x34, 0x7b, 0x87, 0x6e, 0x6f, 0xc8, 0x9f, + 0x82, 0x8c, 0x45, 0x36, 0x89, 0xe5, 0x05, 0x3e, 0x13, 0xb9, 0xaa, 0x53, 0x06, 0x4a, 0x76, 0x53, + 0xa0, 0x58, 0x42, 0x80, 0x23, 0x94, 0xa8, 0x29, 0xf6, 0x57, 0xcc, 0x3f, 0x06, 0x19, 0x6f, 0xcc, + 0x4f, 0x42, 0xa6, 0x20, 0xe5, 0x6a, 0xcb, 0xdc, 0x18, 0xfd, 0xec, 0x65, 0x34, 0x09, 0x99, 0xa2, + 0xa8, 0x89, 0x25, 0x8e, 0xa1, 0x99, 0x7b, 0xe5, 0x92, 0xa6, 0x93, 0x15, 0x51, 0x91, 0xf3, 0x1c, + 0x4b, 0xa3, 0x5f, 0x15, 0xb1, 0x22, 0x2b, 0xcb, 0x5c, 0x06, 0x3d, 0x1f, 0xd5, 0xfd, 0xff, 0x71, + 0xdd, 0xff, 0x35, 0x28, 0xa6, 0xe1, 0xef, 0xfc, 0xd3, 0x31, 0x69, 0x8f, 0x24, 0x01, 0x19, 0x4d, + 0x57, 0x65, 0x07, 0xba, 0x0e, 0x53, 0xf0, 0x4f, 0x06, 0x58, 0xb9, 0xb3, 0xde, 0x45, 0xbf, 0x05, + 0x7d, 0x71, 0x87, 0x01, 0xb6, 0x68, 0x5a, 0x64, 0xd8, 0xc3, 0xff, 0xf3, 0xc4, 0x0f, 0x00, 0x0a, + 0xed, 0xd5, 0x32, 0x85, 0x1c, 0xd0, 0x32, 0x3c, 0xb0, 0x0d, 0xc3, 0x35, 0xbc, 0x6c, 0xa7, 0xb1, + 0xf7, 0xcd, 0xef, 0x81, 0x4c, 0x8b, 0x34, 0x4c, 0xc3, 0xbf, 0x67, 0x61, 0x7f, 0x10, 0xde, 0xe1, + 0xd8, 0xfe, 0x1d, 0x0e, 0x7d, 0x98, 0xe8, 0x89, 0x30, 0x2c, 0x8e, 0x07, 0x2b, 0xc0, 0xe5, 0x71, + 0xc8, 0xc8, 0x2d, 0xa3, 0x49, 0xd0, 0x1f, 0x19, 0x5f, 0x81, 0x5f, 0x19, 0x60, 0x73, 0x96, 0xbd, + 0x16, 0x7d, 0xde, 0x6e, 0x3d, 0xc3, 0x8e, 0x03, 0xdb, 0x35, 0x2f, 0x91, 0xa0, 0x81, 0xf6, 0x6d, + 0x39, 0x55, 0x3c, 0x3c, 0xa1, 0x6a, 0x5e, 0x22, 0xd8, 0x33, 0x43, 0x6f, 0x27, 0x7e, 0x33, 0xf8, + 0x4b, 0x29, 0x53, 0x34, 0x84, 0xc1, 0x8a, 0xad, 0x59, 0xf6, 0x5a, 0x4f, 0x31, 0xfa, 0x8d, 0x3e, + 0x4a, 0xf4, 0x8e, 0x18, 0x0a, 0xff, 0xe0, 0x3b, 0xc1, 0x2b, 0xfc, 0x7b, 0x47, 0xfb, 0x95, 0x1d, + 0xd0, 0x3e, 0xa4, 0x51, 0xf6, 0xc3, 0xa4, 0x15, 0x7f, 0xa8, 0xe0, 0xfe, 0xc4, 0xc8, 0x02, 0x3c, + 0x6c, 0x9d, 0x90, 0xdb, 0xff, 0xd9, 0xad, 0xb9, 0xd4, 0x8d, 0x5b, 0x73, 0xa9, 0x1f, 0x6f, 0xcd, + 0xa5, 0x5e, 0xbd, 0x3d, 0x37, 0x76, 0xe3, 0xf6, 0xdc, 0xd8, 0x77, 0xb7, 0xe7, 0xc6, 0x9e, 0x62, + 0x3a, 0x6b, 0x6b, 0xe3, 0xde, 0x3f, 0xc6, 0x27, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xab, 0x6f, + 0x3a, 0x45, 0x69, 0x16, 0x00, 0x00, } func (m *Rpc) Marshal() (dAtA []byte, err error) { @@ -4147,10 +4157,15 @@ func (m *RpcBlockCreateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ContextBlockId) > 0 { - i -= len(m.ContextBlockId) - copy(dAtA[i:], m.ContextBlockId) - i = encodeVarintCommands(dAtA, i, uint64(len(m.ContextBlockId))) + if m.Position != 0 { + i = encodeVarintCommands(dAtA, i, uint64(m.Position)) + i-- + dAtA[i] = 0x18 + } + if len(m.TargetId) > 0 { + i -= len(m.TargetId) + copy(dAtA[i:], m.TargetId) + i = encodeVarintCommands(dAtA, i, uint64(len(m.TargetId))) i-- dAtA[i] = 0x12 } @@ -6072,10 +6087,13 @@ func (m *RpcBlockCreateRequest) Size() (n int) { l = m.Block.Size() n += 1 + l + sovCommands(uint64(l)) } - l = len(m.ContextBlockId) + l = len(m.TargetId) if l > 0 { n += 1 + l + sovCommands(uint64(l)) } + if m.Position != 0 { + n += 1 + sovCommands(uint64(m.Position)) + } return n } @@ -7808,7 +7826,7 @@ func (m *RpcBlockCreateRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ContextBlockId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TargetId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7836,8 +7854,27 @@ func (m *RpcBlockCreateRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ContextBlockId = string(dAtA[iNdEx:postIndex]) + m.TargetId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Position", wireType) + } + m.Position = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCommands + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Position |= ModelBlockPosition(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipCommands(dAtA[iNdEx:]) diff --git a/pb/models.pb.go b/pb/models.pb.go index 8e3a784b2..bfcb763d1 100644 --- a/pb/models.pb.go +++ b/pb/models.pb.go @@ -23,6 +23,31 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +type ModelBlockPosition int32 + +const ( + ModelBlock_BEFORE ModelBlockPosition = 0 + ModelBlock_AFTER ModelBlockPosition = 1 +) + +var ModelBlockPosition_name = map[int32]string{ + 0: "BEFORE", + 1: "AFTER", +} + +var ModelBlockPosition_value = map[string]int32{ + "BEFORE": 0, + "AFTER": 1, +} + +func (x ModelBlockPosition) String() string { + return proto.EnumName(ModelBlockPosition_name, int32(x)) +} + +func (ModelBlockPosition) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_0b5431a010549573, []int{0, 0, 0} +} + type ModelBlockContentLayoutStyle int32 const ( @@ -67,7 +92,7 @@ func (x ModelBlockContentDashboardStyle) String() string { } func (ModelBlockContentDashboardStyle) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 2, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 3, 0} } type ModelBlockContentTextStyle int32 @@ -107,7 +132,7 @@ func (x ModelBlockContentTextStyle) String() string { } func (ModelBlockContentTextStyle) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 4, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 5, 0} } type ModelBlockContentTextMarkerType int32 @@ -135,7 +160,7 @@ func (x ModelBlockContentTextMarkerType) String() string { } func (ModelBlockContentTextMarkerType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 4, 1} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 5, 1} } type ModelBlockContentTextMarkType int32 @@ -169,7 +194,7 @@ func (x ModelBlockContentTextMarkType) String() string { } func (ModelBlockContentTextMarkType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 4, 1, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 5, 1, 0} } type ModelBlockContentVideoState int32 @@ -203,7 +228,7 @@ func (x ModelBlockContentVideoState) String() string { } func (ModelBlockContentVideoState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 5, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 6, 0} } type ModelBlockContentImageState int32 @@ -237,7 +262,7 @@ func (x ModelBlockContentImageState) String() string { } func (ModelBlockContentImageState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 6, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 7, 0} } type ModelBlockContentFileState int32 @@ -271,7 +296,7 @@ func (x ModelBlockContentFileState) String() string { } func (ModelBlockContentFileState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 7, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 8, 0} } type ModelBlockContentPageStyle int32 @@ -302,7 +327,7 @@ func (x ModelBlockContentPageStyle) String() string { } func (ModelBlockContentPageStyle) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 8, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 9, 0} } // `NullValue` is a singleton enumeration to represent the null value for the @@ -444,6 +469,7 @@ type ModelBlock struct { // *ModelBlockContentOfFile // *ModelBlockContentOfLayout // *ModelBlockContentOfDiv + // *ModelBlockContentOfBookmark Content isModelBlockContent `protobuf_oneof:"content"` } @@ -513,6 +539,9 @@ type ModelBlockContentOfLayout struct { type ModelBlockContentOfDiv struct { Div *ModelBlockContentDiv `protobuf:"bytes,19,opt,name=div,proto3,oneof" json:"div,omitempty"` } +type ModelBlockContentOfBookmark struct { + Bookmark *ModelBlockContentBookmark `protobuf:"bytes,20,opt,name=bookmark,proto3,oneof" json:"bookmark,omitempty"` +} func (*ModelBlockContentOfDashboard) isModelBlockContent() {} func (*ModelBlockContentOfPage) isModelBlockContent() {} @@ -523,6 +552,7 @@ func (*ModelBlockContentOfImage) isModelBlockContent() {} func (*ModelBlockContentOfFile) isModelBlockContent() {} func (*ModelBlockContentOfLayout) isModelBlockContent() {} func (*ModelBlockContentOfDiv) isModelBlockContent() {} +func (*ModelBlockContentOfBookmark) isModelBlockContent() {} func (m *ModelBlock) GetContent() isModelBlockContent { if m != nil { @@ -622,6 +652,13 @@ func (m *ModelBlock) GetDiv() *ModelBlockContentDiv { return nil } +func (m *ModelBlock) GetBookmark() *ModelBlockContentBookmark { + if x, ok := m.GetContent().(*ModelBlockContentOfBookmark); ok { + return x.Bookmark + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*ModelBlock) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -634,6 +671,7 @@ func (*ModelBlock) XXX_OneofWrappers() []interface{} { (*ModelBlockContentOfFile)(nil), (*ModelBlockContentOfLayout)(nil), (*ModelBlockContentOfDiv)(nil), + (*ModelBlockContentOfBookmark)(nil), } } @@ -829,6 +867,42 @@ func (m *ModelBlockContentDiv) XXX_DiscardUnknown() { var xxx_messageInfo_ModelBlockContentDiv proto.InternalMessageInfo +type ModelBlockContentBookmark struct { +} + +func (m *ModelBlockContentBookmark) Reset() { *m = ModelBlockContentBookmark{} } +func (m *ModelBlockContentBookmark) String() string { return proto.CompactTextString(m) } +func (*ModelBlockContentBookmark) ProtoMessage() {} +func (*ModelBlockContentBookmark) Descriptor() ([]byte, []int) { + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 2} +} +func (m *ModelBlockContentBookmark) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ModelBlockContentBookmark) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ModelBlockContentBookmark.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 *ModelBlockContentBookmark) XXX_Merge(src proto.Message) { + xxx_messageInfo_ModelBlockContentBookmark.Merge(m, src) +} +func (m *ModelBlockContentBookmark) XXX_Size() int { + return m.Size() +} +func (m *ModelBlockContentBookmark) XXX_DiscardUnknown() { + xxx_messageInfo_ModelBlockContentBookmark.DiscardUnknown(m) +} + +var xxx_messageInfo_ModelBlockContentBookmark proto.InternalMessageInfo + type ModelBlockContentDashboard struct { Style ModelBlockContentDashboardStyle `protobuf:"varint,1,opt,name=style,proto3,enum=anytype.ModelBlockContentDashboardStyle" json:"style,omitempty"` } @@ -837,7 +911,7 @@ func (m *ModelBlockContentDashboard) Reset() { *m = ModelBlockContentDas func (m *ModelBlockContentDashboard) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentDashboard) ProtoMessage() {} func (*ModelBlockContentDashboard) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 2} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 3} } func (m *ModelBlockContentDashboard) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -880,7 +954,7 @@ func (m *ModelBlockContentDataview) Reset() { *m = ModelBlockContentData func (m *ModelBlockContentDataview) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentDataview) ProtoMessage() {} func (*ModelBlockContentDataview) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 3} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 4} } func (m *ModelBlockContentDataview) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -923,7 +997,7 @@ func (m *ModelBlockContentText) Reset() { *m = ModelBlockContentText{} } func (m *ModelBlockContentText) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentText) ProtoMessage() {} func (*ModelBlockContentText) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 4} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 5} } func (m *ModelBlockContentText) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1009,7 +1083,7 @@ func (m *ModelBlockContentTextMarks) Reset() { *m = ModelBlockContentTex func (m *ModelBlockContentTextMarks) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentTextMarks) ProtoMessage() {} func (*ModelBlockContentTextMarks) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 4, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 5, 0} } func (m *ModelBlockContentTextMarks) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1055,7 +1129,7 @@ func (m *ModelBlockContentTextMark) Reset() { *m = ModelBlockContentText func (m *ModelBlockContentTextMark) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentTextMark) ProtoMessage() {} func (*ModelBlockContentTextMark) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 4, 1} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 5, 1} } func (m *ModelBlockContentTextMark) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1115,7 +1189,7 @@ func (m *ModelBlockContentVideo) Reset() { *m = ModelBlockContentVideo{} func (m *ModelBlockContentVideo) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentVideo) ProtoMessage() {} func (*ModelBlockContentVideo) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 5} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 6} } func (m *ModelBlockContentVideo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1175,7 +1249,7 @@ func (m *ModelBlockContentVideoPreview) Reset() { *m = ModelBlockContent func (m *ModelBlockContentVideoPreview) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentVideoPreview) ProtoMessage() {} func (*ModelBlockContentVideoPreview) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 5, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 6, 0} } func (m *ModelBlockContentVideoPreview) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1235,7 +1309,7 @@ func (m *ModelBlockContentImage) Reset() { *m = ModelBlockContentImage{} func (m *ModelBlockContentImage) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentImage) ProtoMessage() {} func (*ModelBlockContentImage) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 6} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 7} } func (m *ModelBlockContentImage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1295,7 +1369,7 @@ func (m *ModelBlockContentImagePreview) Reset() { *m = ModelBlockContent func (m *ModelBlockContentImagePreview) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentImagePreview) ProtoMessage() {} func (*ModelBlockContentImagePreview) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 6, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 7, 0} } func (m *ModelBlockContentImagePreview) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1355,7 +1429,7 @@ func (m *ModelBlockContentFile) Reset() { *m = ModelBlockContentFile{} } func (m *ModelBlockContentFile) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentFile) ProtoMessage() {} func (*ModelBlockContentFile) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 7} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 8} } func (m *ModelBlockContentFile) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1414,7 +1488,7 @@ func (m *ModelBlockContentFilePreview) Reset() { *m = ModelBlockContentF func (m *ModelBlockContentFilePreview) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentFilePreview) ProtoMessage() {} func (*ModelBlockContentFilePreview) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 7, 0} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 8, 0} } func (m *ModelBlockContentFilePreview) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1465,7 +1539,7 @@ func (m *ModelBlockContentPage) Reset() { *m = ModelBlockContentPage{} } func (m *ModelBlockContentPage) String() string { return proto.CompactTextString(m) } func (*ModelBlockContentPage) ProtoMessage() {} func (*ModelBlockContentPage) Descriptor() ([]byte, []int) { - return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 8} + return fileDescriptor_0b5431a010549573, []int{0, 0, 1, 9} } func (m *ModelBlockContentPage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2038,6 +2112,7 @@ func (m *ModelVideo) GetSizes() []ModelVideoSize { } func init() { + proto.RegisterEnum("anytype.ModelBlockPosition", ModelBlockPosition_name, ModelBlockPosition_value) proto.RegisterEnum("anytype.ModelBlockContentLayoutStyle", ModelBlockContentLayoutStyle_name, ModelBlockContentLayoutStyle_value) proto.RegisterEnum("anytype.ModelBlockContentDashboardStyle", ModelBlockContentDashboardStyle_name, ModelBlockContentDashboardStyle_value) proto.RegisterEnum("anytype.ModelBlockContentTextStyle", ModelBlockContentTextStyle_name, ModelBlockContentTextStyle_value) @@ -2056,6 +2131,7 @@ func init() { proto.RegisterType((*ModelBlockContent)(nil), "anytype.Model.Block.Content") proto.RegisterType((*ModelBlockContentLayout)(nil), "anytype.Model.Block.Content.Layout") proto.RegisterType((*ModelBlockContentDiv)(nil), "anytype.Model.Block.Content.Div") + proto.RegisterType((*ModelBlockContentBookmark)(nil), "anytype.Model.Block.Content.Bookmark") proto.RegisterType((*ModelBlockContentDashboard)(nil), "anytype.Model.Block.Content.Dashboard") proto.RegisterType((*ModelBlockContentDataview)(nil), "anytype.Model.Block.Content.Dataview") proto.RegisterType((*ModelBlockContentText)(nil), "anytype.Model.Block.Content.Text") @@ -2082,107 +2158,110 @@ func init() { func init() { proto.RegisterFile("models.proto", fileDescriptor_0b5431a010549573) } var fileDescriptor_0b5431a010549573 = []byte{ - // 1590 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcd, 0x73, 0xe3, 0x48, - 0x15, 0x97, 0x64, 0xc9, 0x1f, 0xcf, 0x99, 0x6c, 0x6f, 0xb3, 0x4c, 0x09, 0xed, 0x90, 0xc9, 0x7a, - 0x81, 0xc9, 0x7e, 0x60, 0xf2, 0x05, 0xbb, 0x4c, 0x31, 0xec, 0xda, 0xb1, 0x27, 0x76, 0xc5, 0x5f, - 0xb4, 0x9d, 0x0c, 0xc3, 0x25, 0x25, 0x5b, 0x3d, 0x8e, 0x2a, 0xb2, 0xe4, 0x95, 0x65, 0xef, 0x7a, - 0xfe, 0x0a, 0xfe, 0x03, 0x0e, 0xdc, 0xb9, 0x52, 0xc5, 0x81, 0x13, 0x07, 0x8e, 0x0b, 0x17, 0x38, - 0x52, 0x33, 0x7f, 0x05, 0x37, 0xea, 0x75, 0x4b, 0xb6, 0x93, 0x09, 0x89, 0x29, 0xe0, 0xb0, 0x27, - 0xf5, 0x6b, 0xfd, 0x7e, 0xef, 0xbd, 0xfe, 0xf5, 0xd3, 0xeb, 0x16, 0x6c, 0x8c, 0x02, 0x87, 0x7b, - 0x93, 0xe2, 0x38, 0x0c, 0xa2, 0x80, 0x66, 0x6c, 0x7f, 0x1e, 0xcd, 0xc7, 0xbc, 0xf0, 0xa7, 0x87, - 0x60, 0x34, 0xf1, 0x8d, 0xf5, 0xcf, 0xfb, 0x60, 0x94, 0xbd, 0x60, 0x70, 0x49, 0x37, 0x41, 0x73, - 0x1d, 0x53, 0xdd, 0x56, 0x77, 0x72, 0x4c, 0x73, 0x1d, 0xfa, 0x43, 0x48, 0xbf, 0x70, 0xb9, 0xe7, - 0x4c, 0x4c, 0x6d, 0x5b, 0xdd, 0xc9, 0xef, 0x7f, 0xbb, 0x18, 0xb3, 0x8b, 0x82, 0x59, 0xec, 0x46, - 0xe1, 0x74, 0x10, 0xb1, 0x18, 0x44, 0xcb, 0x90, 0x1f, 0xf3, 0x70, 0xe4, 0x4e, 0x26, 0x6e, 0xe0, - 0x4f, 0xcc, 0x94, 0xe0, 0x6c, 0x5f, 0xe3, 0x88, 0x48, 0xc5, 0xce, 0x12, 0xc7, 0x56, 0x49, 0x74, - 0x1b, 0xf2, 0x83, 0x0b, 0xd7, 0x73, 0x42, 0xee, 0xd7, 0x9d, 0x89, 0xa9, 0x6f, 0xa7, 0x76, 0x72, - 0x6c, 0x75, 0x8a, 0x3e, 0x85, 0x9c, 0x63, 0x4f, 0x2e, 0xfa, 0x81, 0x1d, 0x3a, 0x66, 0x5e, 0xc4, - 0xf8, 0xc1, 0x8d, 0x31, 0x8e, 0x02, 0x3f, 0xe2, 0x7e, 0x54, 0xac, 0x24, 0xe8, 0x9a, 0xc2, 0x96, - 0x54, 0xfa, 0x09, 0xe8, 0x63, 0x7b, 0xc8, 0xcd, 0x0d, 0xe1, 0xe2, 0xbd, 0x5b, 0x5d, 0x74, 0xec, - 0x21, 0xaf, 0x29, 0x4c, 0x10, 0xe8, 0x11, 0x64, 0x1d, 0x3b, 0xb2, 0x67, 0x2e, 0xff, 0xd2, 0xbc, - 0x27, 0xc8, 0xdf, 0xbf, 0x23, 0xbe, 0x04, 0xd7, 0x14, 0xb6, 0x20, 0x62, 0xf4, 0x88, 0x7f, 0x15, - 0x99, 0x9b, 0x6b, 0x44, 0xef, 0xf1, 0xaf, 0x22, 0x8c, 0x8e, 0x04, 0xfa, 0x18, 0x8c, 0x99, 0xeb, - 0xf0, 0xc0, 0x7c, 0x4b, 0x30, 0x0b, 0xb7, 0x32, 0xcf, 0x10, 0x59, 0x53, 0x98, 0xa4, 0x20, 0xd7, - 0x1d, 0xe1, 0x9a, 0xc9, 0x1a, 0xdc, 0xfa, 0x48, 0x2e, 0x5a, 0x52, 0x30, 0xe1, 0x17, 0xae, 0xc7, - 0xcd, 0xb7, 0xd7, 0x48, 0xf8, 0xa9, 0xeb, 0x09, 0xb9, 0x90, 0x40, 0x9f, 0x40, 0xda, 0xb3, 0xe7, - 0xc1, 0x34, 0x32, 0xa9, 0xa0, 0xbe, 0x7f, 0x2b, 0xb5, 0x21, 0xa0, 0x35, 0x85, 0xc5, 0x24, 0x7a, - 0x08, 0x29, 0xc7, 0x9d, 0x99, 0xdf, 0xba, 0xa5, 0x98, 0x16, 0x42, 0xbb, 0xb3, 0x9a, 0xc2, 0x10, - 0x6e, 0xcd, 0x21, 0xbf, 0x52, 0x62, 0x94, 0x82, 0x1e, 0x72, 0x5b, 0x96, 0x76, 0x96, 0x89, 0x31, - 0xce, 0x71, 0xc7, 0x8d, 0x44, 0x69, 0x67, 0x99, 0x18, 0xd3, 0xfb, 0x90, 0x0e, 0xf9, 0x28, 0x98, - 0x71, 0x51, 0xbc, 0x59, 0x16, 0x5b, 0x88, 0x75, 0x42, 0x7b, 0x68, 0xea, 0x12, 0x8b, 0x63, 0xc4, - 0x3a, 0x61, 0x30, 0x6e, 0xfb, 0xa6, 0x21, 0xb1, 0xd2, 0xb2, 0x7e, 0x43, 0x20, 0x13, 0x67, 0x64, - 0x0d, 0x21, 0x2d, 0x17, 0x44, 0x3f, 0x03, 0x63, 0x12, 0xcd, 0x3d, 0x2e, 0x52, 0xd8, 0xdc, 0xff, - 0x60, 0x0d, 0x11, 0x8a, 0x5d, 0x24, 0x30, 0xc9, 0x2b, 0x3c, 0x00, 0x43, 0xd8, 0x34, 0x03, 0x29, - 0xd6, 0x7e, 0x46, 0x14, 0x0a, 0x90, 0x3e, 0x6a, 0x37, 0x4e, 0x9b, 0x2d, 0xa2, 0x5a, 0x06, 0xa4, - 0x2a, 0xee, 0xcc, 0x72, 0x21, 0xb7, 0xa8, 0x76, 0x5a, 0xbe, 0x1a, 0xf2, 0xe3, 0xf5, 0x3e, 0x92, - 0xab, 0x51, 0xcd, 0x24, 0xea, 0x5b, 0x90, 0x6f, 0x96, 0xea, 0xad, 0xf3, 0xee, 0x11, 0xab, 0x56, - 0x5b, 0x44, 0xb1, 0x00, 0xb2, 0x49, 0x61, 0x5b, 0x7f, 0x33, 0x40, 0xc7, 0x22, 0x45, 0x9d, 0x44, - 0x55, 0xcb, 0x16, 0x22, 0x0b, 0xf6, 0x49, 0x92, 0x86, 0x26, 0xd2, 0x78, 0x74, 0x67, 0xa9, 0x5f, - 0xc9, 0x80, 0x56, 0x21, 0x37, 0xb2, 0xc3, 0xcb, 0x49, 0xc3, 0x9d, 0x44, 0x71, 0x4b, 0x59, 0xc3, - 0x45, 0x13, 0x29, 0x6c, 0xc9, 0xa4, 0x5b, 0x00, 0x51, 0x30, 0x1c, 0x7a, 0xdc, 0xee, 0x7b, 0x3c, - 0xde, 0xc7, 0x95, 0x19, 0xda, 0x00, 0x40, 0x30, 0x0f, 0x7b, 0xf3, 0x31, 0x17, 0x3b, 0x7a, 0x97, - 0x62, 0x8b, 0x38, 0x92, 0xc3, 0x56, 0xf8, 0xf4, 0x01, 0xe4, 0x06, 0x17, 0x7c, 0x70, 0x29, 0x82, - 0xa5, 0x45, 0xb0, 0xe5, 0x04, 0x35, 0x21, 0x23, 0x0c, 0xee, 0x98, 0x19, 0xf1, 0x2e, 0x31, 0xad, - 0x2a, 0x18, 0x22, 0x73, 0xfa, 0x33, 0x30, 0x44, 0xee, 0xa6, 0xba, 0x9d, 0xba, 0xb3, 0xc1, 0x2d, - 0x32, 0x61, 0x92, 0x64, 0xfd, 0x55, 0x05, 0x1d, 0x6d, 0xfa, 0x21, 0x18, 0xa1, 0xed, 0x0f, 0x65, - 0x09, 0xe4, 0xf7, 0xdf, 0xb9, 0xe6, 0x86, 0xe1, 0x3b, 0x26, 0x21, 0xf4, 0x33, 0xd0, 0xf1, 0x55, - 0xbc, 0x4d, 0x1f, 0xad, 0x17, 0xb1, 0x28, 0x96, 0x2e, 0x88, 0xf4, 0x1d, 0x30, 0xc6, 0x76, 0x68, - 0x8f, 0xc4, 0x2e, 0xe5, 0x98, 0x34, 0x0a, 0xc7, 0xa0, 0x0b, 0x49, 0xde, 0x86, 0x7b, 0xdd, 0x1e, - 0xab, 0x9f, 0x54, 0x7b, 0x35, 0xd6, 0x3e, 0x3d, 0xae, 0x11, 0x85, 0x6e, 0x40, 0xf6, 0xa4, 0xfa, - 0xbc, 0xdc, 0x2e, 0xb1, 0x0a, 0x51, 0xb1, 0x9c, 0xeb, 0xbd, 0x52, 0xa3, 0x7e, 0x44, 0x34, 0x9a, - 0x05, 0xbd, 0xdc, 0x6e, 0x54, 0x48, 0x0a, 0x47, 0x8d, 0x7a, 0xeb, 0x84, 0xe8, 0x85, 0xa3, 0xa4, - 0x14, 0x0d, 0x50, 0xc7, 0x44, 0xa1, 0x69, 0xd0, 0x2e, 0xf6, 0x88, 0x2a, 0x9e, 0xfb, 0x44, 0x13, - 0xcf, 0x03, 0x92, 0x12, 0xcf, 0x43, 0xa2, 0xd3, 0x1c, 0x18, 0x5f, 0x4c, 0x83, 0x88, 0x13, 0x03, - 0x9d, 0x0c, 0x02, 0x87, 0x93, 0x74, 0xa1, 0x08, 0xb0, 0xdc, 0x32, 0x9c, 0xf7, 0x03, 0x9f, 0xcb, - 0x6f, 0xc9, 0x9f, 0x8e, 0xfa, 0x3c, 0x94, 0x89, 0xf4, 0xa7, 0x9e, 0xc7, 0x23, 0xa2, 0x59, 0x7f, - 0xd1, 0xc0, 0x10, 0x4d, 0x94, 0x7e, 0x0f, 0xee, 0x79, 0xc1, 0xc0, 0xf6, 0xb0, 0xb7, 0x75, 0xec, - 0xe8, 0x22, 0xae, 0xf1, 0xab, 0x93, 0xf4, 0xe7, 0x58, 0xec, 0x76, 0x94, 0xa8, 0xb8, 0x73, 0x77, - 0x77, 0x2e, 0x76, 0x11, 0xcf, 0x24, 0x8d, 0x56, 0x20, 0x33, 0x0e, 0xb9, 0x38, 0x5a, 0x64, 0xad, - 0x7f, 0xb8, 0x86, 0x87, 0x8e, 0x64, 0xb0, 0x84, 0x6a, 0xfd, 0x02, 0x32, 0xf1, 0x1c, 0x56, 0x62, - 0x74, 0x31, 0x1d, 0xf5, 0x7d, 0xdb, 0xf5, 0x44, 0xca, 0x1b, 0x6c, 0x39, 0x81, 0xdf, 0xab, 0x6f, - 0x8f, 0x64, 0xb6, 0x39, 0x26, 0xc6, 0xb8, 0x8d, 0x5f, 0xba, 0x4e, 0x74, 0x21, 0x12, 0x30, 0x98, - 0x34, 0x0a, 0x75, 0x54, 0x1f, 0x33, 0xcc, 0x81, 0x51, 0x6d, 0x76, 0x7a, 0xcf, 0x89, 0x42, 0xef, - 0x41, 0xee, 0xb4, 0xd3, 0x68, 0x97, 0x2a, 0xf5, 0xd6, 0x31, 0x51, 0x69, 0x1e, 0x32, 0x1d, 0x56, - 0x3d, 0xab, 0x57, 0x9f, 0x11, 0x0d, 0xfb, 0x45, 0xa5, 0xfd, 0xac, 0x95, 0xbc, 0x15, 0x1b, 0x59, - 0x69, 0xb7, 0xaa, 0x44, 0x17, 0x9a, 0x8a, 0xc3, 0xe5, 0xff, 0xa1, 0xa9, 0x70, 0xfc, 0x5f, 0x69, - 0x2a, 0x3d, 0x7c, 0xc3, 0x34, 0xfd, 0x9d, 0x06, 0x3a, 0x0a, 0xb6, 0xa6, 0xa4, 0x4f, 0xae, 0x4a, - 0xfa, 0xe8, 0xce, 0xd3, 0xfc, 0xaa, 0xa2, 0x47, 0xd7, 0x15, 0xfd, 0xe0, 0x6e, 0x07, 0x6f, 0x08, - 0xba, 0xb7, 0x14, 0x34, 0x91, 0x4c, 0x5d, 0x91, 0x8c, 0x82, 0xee, 0x0e, 0x02, 0x3f, 0x91, 0x11, - 0xc7, 0xff, 0x4b, 0xc1, 0x5e, 0x82, 0x8e, 0x97, 0xba, 0xe5, 0xe9, 0xa4, 0xae, 0xa1, 0x44, 0x47, - 0xd6, 0xd6, 0xca, 0xf9, 0x78, 0x90, 0x34, 0xa5, 0x95, 0x8c, 0xb2, 0xa0, 0xf7, 0x4a, 0xdd, 0x13, - 0xa2, 0x62, 0x83, 0x2b, 0xb7, 0xdb, 0x27, 0xcd, 0x12, 0x3b, 0x21, 0x1a, 0x1e, 0xdc, 0xdd, 0x6a, - 0x8f, 0xa4, 0xca, 0x39, 0xc8, 0x0c, 0xe2, 0x0b, 0xc2, 0x47, 0x60, 0x88, 0x26, 0x8c, 0xcb, 0x7d, - 0x11, 0x06, 0x23, 0x91, 0x86, 0xc1, 0xc4, 0x18, 0xaf, 0xe3, 0x51, 0x20, 0x04, 0x30, 0x98, 0x16, - 0x05, 0xd6, 0xef, 0x75, 0x48, 0xcb, 0x2b, 0x37, 0xfd, 0xe9, 0xe2, 0x66, 0x2e, 0x0f, 0x88, 0xf7, - 0x6e, 0xbc, 0x99, 0x17, 0x9f, 0x0a, 0x4c, 0xd5, 0x8f, 0xc2, 0x79, 0x72, 0x4b, 0xb7, 0xce, 0x20, - 0xbf, 0x32, 0x4d, 0x09, 0xa4, 0x2e, 0xf9, 0x3c, 0x96, 0x1e, 0x87, 0x74, 0x0f, 0x8c, 0x99, 0xed, - 0x4d, 0x79, 0x7c, 0xe9, 0x7f, 0xf7, 0x66, 0xd7, 0x67, 0x08, 0x61, 0x12, 0xf9, 0x58, 0xfb, 0x54, - 0xb5, 0xfe, 0x80, 0xad, 0x12, 0x2d, 0xfa, 0x39, 0x80, 0x3f, 0xf5, 0xbc, 0x73, 0xe9, 0x45, 0x0a, - 0xfb, 0xf0, 0x66, 0x2f, 0xad, 0xa9, 0xe7, 0x09, 0x12, 0xde, 0xcd, 0xfd, 0xc4, 0xa0, 0xef, 0xc3, - 0x86, 0x6c, 0xc7, 0xe7, 0xcb, 0x4c, 0xd4, 0x9a, 0xc2, 0xf2, 0x72, 0x76, 0x01, 0x9a, 0x44, 0xa1, - 0xeb, 0x0f, 0x63, 0x90, 0x38, 0x76, 0x10, 0x24, 0x67, 0x25, 0xe8, 0x21, 0x40, 0x3f, 0x08, 0x92, - 0x5c, 0xc4, 0xb9, 0x8f, 0xa1, 0x70, 0x4e, 0x02, 0x1e, 0x0b, 0x2f, 0xd3, 0x41, 0x14, 0x43, 0x8c, - 0x5b, 0xfe, 0x74, 0x62, 0xe7, 0xd3, 0x41, 0xb4, 0x58, 0xa8, 0xe7, 0x4e, 0x12, 0x66, 0x5a, 0x30, - 0xff, 0xcd, 0x42, 0xf1, 0x12, 0xb2, 0x58, 0xa8, 0x97, 0x18, 0xe5, 0x34, 0xe8, 0x97, 0xae, 0xef, - 0x58, 0x9f, 0x43, 0x6e, 0x81, 0xa0, 0x07, 0x90, 0x16, 0x1e, 0x93, 0xcd, 0xbd, 0x75, 0x07, 0x62, - 0x68, 0xe1, 0x5d, 0xc8, 0x2d, 0xc4, 0xa4, 0x9b, 0x00, 0xad, 0xd3, 0x46, 0xe3, 0xfc, 0xac, 0xd4, - 0x38, 0xad, 0x12, 0xc5, 0xfa, 0xa3, 0x0a, 0x99, 0xd2, 0x60, 0x10, 0x4c, 0xfd, 0xe8, 0x8d, 0x9f, - 0xbc, 0x9b, 0xfa, 0xd5, 0x8f, 0x21, 0x6d, 0xcf, 0xec, 0xc8, 0x0e, 0xe3, 0xef, 0xfb, 0xbb, 0xd7, - 0x32, 0x88, 0x7d, 0x15, 0x4b, 0x02, 0xc4, 0x62, 0xb0, 0xf5, 0x4b, 0x48, 0xcb, 0x19, 0xfa, 0x71, - 0xf2, 0xa7, 0x71, 0xf3, 0xc5, 0xe3, 0xda, 0xbf, 0xc5, 0x7d, 0x30, 0x06, 0x81, 0x17, 0x84, 0x32, - 0x07, 0x9c, 0x17, 0x66, 0x39, 0x9b, 0xa4, 0x61, 0x7d, 0x91, 0x1c, 0x19, 0xd7, 0xb3, 0xff, 0x11, - 0x18, 0x13, 0xf7, 0x25, 0xc7, 0x3f, 0xd4, 0xd4, 0xce, 0xe6, 0xfe, 0x77, 0x6e, 0x0a, 0x54, 0xec, - 0xba, 0x2f, 0xf1, 0x8b, 0x45, 0x5c, 0xe1, 0x11, 0xe8, 0x68, 0xe2, 0x07, 0xdb, 0x28, 0xb1, 0xe3, - 0x2a, 0x51, 0x70, 0xd8, 0x6d, 0x96, 0x1a, 0x0d, 0xa2, 0xe2, 0xb0, 0x57, 0x3b, 0x6d, 0x96, 0x89, - 0x66, 0xfd, 0x56, 0x4d, 0x8e, 0xfe, 0xff, 0x30, 0x66, 0x7c, 0xac, 0xaf, 0xc4, 0x7c, 0x1e, 0xc7, - 0xcc, 0x43, 0xa6, 0x5b, 0x39, 0x3f, 0xf8, 0xc9, 0x2e, 0xde, 0x5f, 0xa4, 0x71, 0xf8, 0xe9, 0xee, - 0x58, 0xb6, 0xad, 0x5a, 0xe5, 0xfc, 0x93, 0xfd, 0xdd, 0x31, 0xd1, 0xb0, 0x6d, 0xd4, 0x2a, 0xe7, - 0x7b, 0xbb, 0xf8, 0x2a, 0x25, 0x1a, 0x1c, 0x9a, 0x87, 0x87, 0xbb, 0x63, 0xa2, 0x27, 0xe6, 0xfe, - 0x1e, 0x7a, 0x31, 0xca, 0x0f, 0xfe, 0xfc, 0x6a, 0x4b, 0xfd, 0xfa, 0xd5, 0x96, 0xfa, 0x8f, 0x57, - 0x5b, 0xea, 0xaf, 0x5f, 0x6f, 0x29, 0x5f, 0xbf, 0xde, 0x52, 0xfe, 0xfe, 0x7a, 0x4b, 0xf9, 0x95, - 0x36, 0xee, 0xf7, 0xd3, 0xe2, 0xa7, 0xff, 0xe0, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x11, - 0xe7, 0x5c, 0x04, 0x10, 0x00, 0x00, + // 1638 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x73, 0xe3, 0x48, + 0x15, 0x97, 0x64, 0xc9, 0x7f, 0x9e, 0x33, 0xd9, 0xde, 0x66, 0x58, 0x84, 0x76, 0xc8, 0x66, 0xbc, + 0xc0, 0x64, 0xff, 0x60, 0xf2, 0x0f, 0x76, 0x99, 0x62, 0xd8, 0xb5, 0x63, 0x65, 0xec, 0x8a, 0x63, + 0x9b, 0xb6, 0x93, 0x61, 0xb8, 0xa4, 0x64, 0xab, 0x27, 0x51, 0x45, 0x96, 0xbc, 0xb2, 0xec, 0x5d, + 0xcf, 0xa7, 0xe0, 0x3b, 0x70, 0xa4, 0x8a, 0x2b, 0x14, 0x07, 0xce, 0x1c, 0x17, 0x2e, 0x70, 0xa4, + 0x66, 0xce, 0x7c, 0x07, 0xea, 0x75, 0x4b, 0xb6, 0x93, 0x09, 0x89, 0x29, 0xe0, 0xc0, 0xc9, 0xfd, + 0x5a, 0xbf, 0xdf, 0x7b, 0xaf, 0x7f, 0xdd, 0xfd, 0xba, 0xdb, 0xb0, 0x36, 0x0c, 0x5d, 0xee, 0x8f, + 0xcb, 0xa3, 0x28, 0x8c, 0x43, 0x9a, 0x73, 0x82, 0x59, 0x3c, 0x1b, 0xf1, 0xd2, 0xef, 0x37, 0xc1, + 0x38, 0xc6, 0x2f, 0xd6, 0x3f, 0xbe, 0x05, 0x46, 0xd5, 0x0f, 0x07, 0x97, 0x74, 0x1d, 0x34, 0xcf, + 0x35, 0xd5, 0x4d, 0x75, 0xab, 0xc0, 0x34, 0xcf, 0xa5, 0x3f, 0x80, 0xec, 0x0b, 0x8f, 0xfb, 0xee, + 0xd8, 0xd4, 0x36, 0xd5, 0xad, 0xe2, 0xee, 0x37, 0xcb, 0x09, 0xbb, 0x2c, 0x98, 0xe5, 0x6e, 0x1c, + 0x4d, 0x06, 0x31, 0x4b, 0x40, 0xb4, 0x0a, 0xc5, 0x11, 0x8f, 0x86, 0xde, 0x78, 0xec, 0x85, 0xc1, + 0xd8, 0xcc, 0x08, 0xce, 0xe6, 0x35, 0x8e, 0x88, 0x54, 0xee, 0x2c, 0x70, 0x6c, 0x99, 0x44, 0x37, + 0xa1, 0x38, 0xb8, 0xf0, 0x7c, 0x37, 0xe2, 0x41, 0xc3, 0x1d, 0x9b, 0xfa, 0x66, 0x66, 0xab, 0xc0, + 0x96, 0xbb, 0xe8, 0x21, 0x14, 0x5c, 0x67, 0x7c, 0xd1, 0x0f, 0x9d, 0xc8, 0x35, 0x8b, 0x22, 0xc6, + 0xf7, 0x6f, 0x8c, 0x71, 0x10, 0x06, 0x31, 0x0f, 0xe2, 0x72, 0x2d, 0x45, 0xd7, 0x15, 0xb6, 0xa0, + 0xd2, 0x4f, 0x40, 0x1f, 0x39, 0xe7, 0xdc, 0x5c, 0x13, 0x2e, 0x1e, 0xde, 0xea, 0xa2, 0xe3, 0x9c, + 0xf3, 0xba, 0xc2, 0x04, 0x81, 0x1e, 0x40, 0xde, 0x75, 0x62, 0x67, 0xea, 0xf1, 0x2f, 0xcd, 0x7b, + 0x82, 0xfc, 0xbd, 0x3b, 0xe2, 0x4b, 0x70, 0x5d, 0x61, 0x73, 0x22, 0x46, 0x8f, 0xf9, 0x57, 0xb1, + 0xb9, 0xbe, 0x42, 0xf4, 0x1e, 0xff, 0x2a, 0xc6, 0xe8, 0x48, 0xa0, 0x8f, 0xc1, 0x98, 0x7a, 0x2e, + 0x0f, 0xcd, 0xb7, 0x04, 0xb3, 0x74, 0x2b, 0xf3, 0x14, 0x91, 0x75, 0x85, 0x49, 0x0a, 0x72, 0xbd, + 0x21, 0x8e, 0x99, 0xac, 0xc0, 0x6d, 0x0c, 0xe5, 0xa0, 0x25, 0x05, 0x13, 0x7e, 0xe1, 0xf9, 0xdc, + 0x7c, 0x7b, 0x85, 0x84, 0x0f, 0x3d, 0x5f, 0xc8, 0x85, 0x04, 0xfa, 0x04, 0xb2, 0xbe, 0x33, 0x0b, + 0x27, 0xb1, 0x49, 0x05, 0xf5, 0xfd, 0x5b, 0xa9, 0x4d, 0x01, 0xad, 0x2b, 0x2c, 0x21, 0xd1, 0x7d, + 0xc8, 0xb8, 0xde, 0xd4, 0xfc, 0xc6, 0x2d, 0x8b, 0x69, 0x2e, 0xb4, 0x37, 0xad, 0x2b, 0x0c, 0xe1, + 0x38, 0x47, 0xfd, 0x30, 0xbc, 0x1c, 0x3a, 0xd1, 0xa5, 0x79, 0x7f, 0x85, 0x39, 0xaa, 0x26, 0x60, + 0x9c, 0xa3, 0x94, 0x68, 0xcd, 0xa0, 0xb8, 0xb4, 0x4e, 0x29, 0x05, 0x3d, 0xe2, 0x8e, 0xdc, 0x1f, + 0x79, 0x26, 0xda, 0xd8, 0xc7, 0x5d, 0x2f, 0x16, 0xfb, 0x23, 0xcf, 0x44, 0x9b, 0xbe, 0x03, 0xd9, + 0x88, 0x0f, 0xc3, 0x29, 0x17, 0x3b, 0x20, 0xcf, 0x12, 0x0b, 0xb1, 0x6e, 0xe4, 0x9c, 0x9b, 0xba, + 0xc4, 0x62, 0x1b, 0xb1, 0x6e, 0x14, 0x8e, 0xda, 0x81, 0x69, 0x48, 0xac, 0xb4, 0xac, 0xdf, 0x10, + 0xc8, 0x25, 0xb9, 0x59, 0xe7, 0x90, 0x95, 0xaa, 0xd0, 0xcf, 0xc0, 0x18, 0xc7, 0x33, 0x9f, 0x8b, + 0x14, 0xd6, 0x77, 0x3f, 0x58, 0x41, 0xc9, 0x72, 0x17, 0x09, 0x4c, 0xf2, 0x4a, 0x0f, 0xc0, 0x10, + 0x36, 0xcd, 0x41, 0x86, 0xb5, 0x9f, 0x11, 0x85, 0x02, 0x64, 0x0f, 0xda, 0xcd, 0x93, 0xe3, 0x16, + 0x51, 0x2d, 0x03, 0x32, 0x35, 0x6f, 0x6a, 0x01, 0xe4, 0x53, 0x39, 0x2c, 0x0f, 0x0a, 0xf3, 0xed, + 0x43, 0xab, 0x57, 0xc3, 0x7f, 0xbc, 0xda, 0xae, 0xbb, 0x9a, 0x81, 0x99, 0x66, 0xf0, 0x16, 0x14, + 0x8f, 0x2b, 0x8d, 0xd6, 0x59, 0xf7, 0x80, 0xd9, 0x76, 0x8b, 0x28, 0x18, 0x36, 0xdd, 0x29, 0xd6, + 0x5f, 0x0d, 0xd0, 0x71, 0xd5, 0xa3, 0x66, 0x62, 0x9b, 0xc8, 0x9a, 0x24, 0x77, 0xc0, 0x93, 0x34, + 0x0d, 0x4d, 0xa4, 0xf1, 0xe8, 0xce, 0xbd, 0x73, 0x25, 0x03, 0x6a, 0x43, 0x01, 0x87, 0x36, 0x6e, + 0x7a, 0xe3, 0x38, 0xa9, 0x51, 0x2b, 0xb8, 0x38, 0x46, 0x0a, 0x5b, 0x30, 0xe9, 0x06, 0x40, 0x1c, + 0x9e, 0x9f, 0xfb, 0xdc, 0xe9, 0xfb, 0x3c, 0x99, 0xd3, 0xa5, 0x1e, 0xda, 0x04, 0x40, 0x30, 0x8f, + 0x7a, 0xb3, 0x11, 0x17, 0xb3, 0x7b, 0x97, 0x62, 0xf3, 0x38, 0x92, 0xc3, 0x96, 0xf8, 0xf4, 0x01, + 0x14, 0x06, 0x17, 0x7c, 0x70, 0x29, 0x82, 0x65, 0x45, 0xb0, 0x45, 0x07, 0x35, 0x21, 0x27, 0x0c, + 0xee, 0x9a, 0x39, 0xf1, 0x2d, 0x35, 0x2d, 0x1b, 0x0c, 0x91, 0x39, 0xfd, 0x29, 0x18, 0x22, 0x77, + 0x53, 0xdd, 0xcc, 0xdc, 0x59, 0x31, 0xe7, 0x99, 0x30, 0x49, 0xb2, 0xfe, 0xa2, 0x82, 0x8e, 0x36, + 0xfd, 0x10, 0x8c, 0xc8, 0x09, 0xce, 0xe5, 0x12, 0x28, 0xee, 0xde, 0xbf, 0xe6, 0x86, 0xe1, 0x37, + 0x26, 0x21, 0xf4, 0x33, 0xd0, 0xf1, 0x53, 0x32, 0x4d, 0x1f, 0xad, 0x16, 0xb1, 0x2c, 0x86, 0x2e, + 0x88, 0xf4, 0x3e, 0x18, 0x23, 0x27, 0x72, 0x86, 0x62, 0x96, 0x0a, 0x4c, 0x1a, 0xa5, 0xa7, 0xa0, + 0x0b, 0x49, 0xde, 0x86, 0x7b, 0xdd, 0x1e, 0x6b, 0x1c, 0xd9, 0xbd, 0x3a, 0x6b, 0x9f, 0x3c, 0xad, + 0x13, 0x85, 0xae, 0x41, 0xfe, 0xc8, 0x7e, 0x5e, 0x6d, 0x57, 0x58, 0x8d, 0xa8, 0xb8, 0xb4, 0x1b, + 0xbd, 0x4a, 0xb3, 0x71, 0x40, 0x34, 0x9a, 0x07, 0xbd, 0xda, 0x6e, 0xd6, 0x48, 0x06, 0x5b, 0xcd, + 0x46, 0xeb, 0x88, 0xe8, 0xa5, 0x83, 0x74, 0x29, 0x1a, 0xa0, 0x8e, 0x88, 0x42, 0xb3, 0xa0, 0x5d, + 0xec, 0x10, 0x55, 0xfc, 0xee, 0x12, 0x4d, 0xfc, 0xee, 0x91, 0x8c, 0xf8, 0xdd, 0x27, 0x3a, 0x2d, + 0x80, 0xf1, 0xc5, 0x24, 0x8c, 0x39, 0x31, 0xd0, 0xc9, 0x20, 0x74, 0x39, 0xc9, 0x96, 0xca, 0x00, + 0x8b, 0x29, 0xc3, 0xfe, 0x20, 0x0c, 0xb8, 0xdc, 0x57, 0xc1, 0x64, 0xd8, 0xe7, 0x91, 0x4c, 0xa4, + 0x3f, 0xf1, 0x7d, 0x1e, 0x13, 0xcd, 0xfa, 0xb3, 0x06, 0x86, 0xa8, 0xca, 0xf4, 0xbb, 0x70, 0xcf, + 0x0f, 0x07, 0x8e, 0x8f, 0xc5, 0xb2, 0xe3, 0xc4, 0x17, 0xc9, 0x1a, 0xbf, 0xda, 0x49, 0x7f, 0x86, + 0x8b, 0xdd, 0x89, 0x53, 0x15, 0xb7, 0xee, 0x2e, 0xf7, 0xe5, 0x2e, 0xe2, 0x99, 0xa4, 0xd1, 0x1a, + 0xe4, 0x46, 0x11, 0x17, 0x67, 0x95, 0x5c, 0xeb, 0x1f, 0xae, 0xe0, 0xa1, 0x23, 0x19, 0x2c, 0xa5, + 0x5a, 0x3f, 0x87, 0x5c, 0xd2, 0x87, 0x2b, 0x31, 0xbe, 0x98, 0x0c, 0xfb, 0x81, 0xe3, 0xf9, 0x22, + 0xe5, 0x35, 0xb6, 0xe8, 0xc0, 0xfd, 0x1a, 0x38, 0x43, 0x99, 0x6d, 0x81, 0x89, 0x36, 0x4e, 0xe3, + 0x97, 0x9e, 0x1b, 0x5f, 0x88, 0x04, 0x0c, 0x26, 0x8d, 0x52, 0x03, 0xd5, 0xc7, 0x0c, 0x0b, 0x60, + 0xd8, 0xc7, 0x9d, 0xde, 0x73, 0xa2, 0xd0, 0x7b, 0x50, 0x38, 0xe9, 0x34, 0xdb, 0x95, 0x5a, 0xa3, + 0xf5, 0x94, 0xa8, 0xb4, 0x08, 0xb9, 0x0e, 0xb3, 0x4f, 0x1b, 0xf6, 0x33, 0xa2, 0x61, 0xbd, 0xa8, + 0xb5, 0x9f, 0xb5, 0xd2, 0xaf, 0x62, 0x22, 0x6b, 0xed, 0x96, 0x4d, 0x74, 0xa1, 0xa9, 0x38, 0xad, + 0xfe, 0x17, 0x9a, 0x0a, 0xc7, 0xff, 0x91, 0xa6, 0xd2, 0xc3, 0xff, 0x99, 0xa6, 0xbf, 0xd5, 0x40, + 0x47, 0xc1, 0x56, 0x94, 0xf4, 0xc9, 0x55, 0x49, 0x1f, 0xdd, 0x79, 0x3d, 0xb8, 0xaa, 0xe8, 0xc1, + 0x75, 0x45, 0x3f, 0xb8, 0xdb, 0xc1, 0x1b, 0x82, 0xee, 0x2c, 0x04, 0x4d, 0x25, 0x53, 0x97, 0x24, + 0xa3, 0xa0, 0x7b, 0x83, 0x30, 0x48, 0x65, 0xc4, 0xf6, 0x7f, 0x53, 0xb0, 0x97, 0xa0, 0xe3, 0x2d, + 0x71, 0x71, 0x3a, 0xa9, 0x2b, 0x28, 0xd1, 0x91, 0x6b, 0x6b, 0xe9, 0x7c, 0xdc, 0x4b, 0x8b, 0xd2, + 0x52, 0x46, 0x79, 0xd0, 0x7b, 0x95, 0xee, 0x11, 0x51, 0xb1, 0xc0, 0x55, 0xdb, 0xed, 0xa3, 0xe3, + 0x0a, 0x3b, 0x22, 0x1a, 0x1e, 0xe2, 0x5d, 0xbb, 0x47, 0x32, 0xa5, 0x87, 0x90, 0xef, 0x84, 0x63, + 0x2f, 0xf6, 0xc2, 0x00, 0x8b, 0x4d, 0xd5, 0x3e, 0x6c, 0x33, 0x9b, 0x28, 0xe8, 0xa3, 0x72, 0xd8, + 0xb3, 0x19, 0x51, 0xab, 0x05, 0xc8, 0x0d, 0x92, 0xfb, 0xc4, 0x47, 0x60, 0x88, 0x3a, 0x8d, 0x8a, + 0xbc, 0x88, 0xc2, 0xa1, 0xc8, 0xd4, 0x60, 0xa2, 0x8d, 0x4f, 0x80, 0x38, 0x14, 0x1a, 0x19, 0x4c, + 0x8b, 0x43, 0xeb, 0x77, 0x3a, 0x64, 0xe5, 0x35, 0x9f, 0xfe, 0x64, 0xfe, 0x1a, 0x90, 0x67, 0xc8, + 0xc3, 0x1b, 0x5f, 0x03, 0xe5, 0x43, 0x81, 0xb1, 0x83, 0x38, 0x9a, 0xa5, 0x2f, 0x03, 0xeb, 0x14, + 0x8a, 0x4b, 0xdd, 0x94, 0x40, 0xe6, 0x92, 0xcf, 0x92, 0xd9, 0xc1, 0x26, 0xdd, 0x01, 0x63, 0xea, + 0xf8, 0x13, 0x9e, 0x3c, 0x34, 0xde, 0xbd, 0xd9, 0xf5, 0x29, 0x42, 0x98, 0x44, 0x3e, 0xd6, 0x3e, + 0x55, 0xad, 0x3f, 0x60, 0x35, 0x45, 0x8b, 0x7e, 0x0e, 0x10, 0x4c, 0x7c, 0xff, 0x4c, 0x7a, 0x91, + 0xda, 0xbf, 0x77, 0xb3, 0x97, 0xd6, 0xc4, 0xf7, 0x05, 0x09, 0xdf, 0x03, 0x41, 0x6a, 0xd0, 0xf7, + 0x61, 0x4d, 0x56, 0xec, 0xb3, 0x45, 0x26, 0x6a, 0x5d, 0x61, 0x45, 0xd9, 0x3b, 0x07, 0x8d, 0xe3, + 0xc8, 0x0b, 0xce, 0x13, 0x90, 0x38, 0x99, 0x10, 0x24, 0x7b, 0x25, 0xe8, 0x3d, 0x80, 0x7e, 0x18, + 0xa6, 0xb9, 0x88, 0xab, 0x01, 0x86, 0xc2, 0x3e, 0x09, 0x78, 0x2c, 0xbc, 0x4c, 0x06, 0x71, 0x02, + 0x31, 0x6e, 0x79, 0x5d, 0x25, 0xce, 0x27, 0x83, 0x78, 0x3e, 0x50, 0xdf, 0x1b, 0xa7, 0xcc, 0xac, + 0x60, 0xfe, 0x8b, 0x81, 0xe2, 0x3d, 0x65, 0x3e, 0x50, 0x3f, 0x35, 0xaa, 0x59, 0xd0, 0x2f, 0xbd, + 0xc0, 0xb5, 0x3e, 0x87, 0xc2, 0x1c, 0x41, 0xf7, 0x20, 0x2b, 0x3c, 0xa6, 0x93, 0x7b, 0xeb, 0x0c, + 0x24, 0xd0, 0xd2, 0xbb, 0x50, 0x98, 0x8b, 0x49, 0xd7, 0x01, 0x5a, 0x27, 0xcd, 0xe6, 0xd9, 0x69, + 0xa5, 0x79, 0x62, 0x13, 0xc5, 0xfa, 0xa3, 0x0a, 0xb9, 0xca, 0x60, 0x10, 0x4e, 0x82, 0xf8, 0x8d, + 0x87, 0xe5, 0x4d, 0x25, 0xed, 0x47, 0x90, 0x75, 0xa6, 0x4e, 0xec, 0x44, 0x49, 0x09, 0xf8, 0xce, + 0xb5, 0x0c, 0x12, 0x5f, 0xe5, 0x8a, 0x00, 0xb1, 0x04, 0x6c, 0xfd, 0x02, 0xb2, 0xb2, 0x87, 0x7e, + 0x9c, 0xbe, 0x6e, 0x6e, 0xbe, 0x9b, 0x5c, 0x7b, 0xcf, 0xbc, 0x03, 0xc6, 0x20, 0xf4, 0xc3, 0x48, + 0xe6, 0x80, 0xfd, 0xc2, 0xac, 0xe6, 0xd3, 0x34, 0xac, 0x2f, 0xd2, 0x53, 0xe5, 0x7a, 0xf6, 0x3f, + 0x04, 0x63, 0xec, 0xbd, 0xe4, 0xf8, 0x2a, 0xce, 0x6c, 0xad, 0xef, 0x7e, 0xfb, 0xa6, 0x40, 0xe5, + 0xae, 0xf7, 0x12, 0x37, 0x35, 0xe2, 0x4a, 0x8f, 0x40, 0x47, 0x13, 0xf7, 0x63, 0xb3, 0xc2, 0x9e, + 0x26, 0x5b, 0xb3, 0x7b, 0x5c, 0x69, 0x36, 0x89, 0x8a, 0xcd, 0x5e, 0xfd, 0xe4, 0xb8, 0x4a, 0x34, + 0xeb, 0xd7, 0x6a, 0x7a, 0x3b, 0xf8, 0x37, 0x63, 0x26, 0x27, 0xff, 0x52, 0xcc, 0xe7, 0x49, 0xcc, + 0x22, 0xe4, 0xba, 0xb5, 0xb3, 0xbd, 0x1f, 0x6f, 0xe3, 0x15, 0x47, 0x1a, 0xfb, 0x9f, 0x6e, 0x8f, + 0x64, 0x65, 0xab, 0xd7, 0xce, 0x3e, 0xd9, 0xdd, 0x1e, 0x11, 0x0d, 0x2b, 0x4b, 0xbd, 0x76, 0xb6, + 0xb3, 0x8d, 0x9f, 0x32, 0xa2, 0x06, 0xa2, 0xb9, 0xbf, 0xbf, 0x3d, 0x22, 0x7a, 0x6a, 0xee, 0xee, + 0xa0, 0x17, 0xa3, 0xfa, 0xe0, 0x4f, 0xaf, 0x36, 0xd4, 0xaf, 0x5f, 0x6d, 0xa8, 0x7f, 0x7f, 0xb5, + 0xa1, 0xfe, 0xea, 0xf5, 0x86, 0xf2, 0xf5, 0xeb, 0x0d, 0xe5, 0x6f, 0xaf, 0x37, 0x94, 0x5f, 0x6a, + 0xa3, 0x7e, 0x3f, 0x2b, 0xfe, 0x68, 0xd8, 0xfb, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x11, 0xa2, + 0xc7, 0xac, 0x78, 0x10, 0x00, 0x00, } func (m *Model) Marshal() (dAtA []byte, err error) { @@ -2477,6 +2556,29 @@ func (m *ModelBlockContentOfDiv) MarshalToSizedBuffer(dAtA []byte) (int, error) } return len(dAtA) - i, nil } +func (m *ModelBlockContentOfBookmark) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ModelBlockContentOfBookmark) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.Bookmark != nil { + { + size, err := m.Bookmark.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintModels(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 + } + return len(dAtA) - i, nil +} func (m *ModelBlockPermissions) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2624,6 +2726,29 @@ func (m *ModelBlockContentDiv) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ModelBlockContentBookmark) 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 *ModelBlockContentBookmark) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ModelBlockContentBookmark) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + func (m *ModelBlockContentDashboard) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3517,20 +3642,20 @@ func (m *ModelImage) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if len(m.Sizes) > 0 { - dAtA23 := make([]byte, len(m.Sizes)*10) - var j22 int + dAtA24 := make([]byte, len(m.Sizes)*10) + var j23 int for _, num := range m.Sizes { for num >= 1<<7 { - dAtA23[j22] = uint8(uint64(num)&0x7f | 0x80) + dAtA24[j23] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j22++ + j23++ } - dAtA23[j22] = uint8(num) - j22++ + dAtA24[j23] = uint8(num) + j23++ } - i -= j22 - copy(dAtA[i:], dAtA23[:j22]) - i = encodeVarintModels(dAtA, i, uint64(j22)) + i -= j23 + copy(dAtA[i:], dAtA24[:j23]) + i = encodeVarintModels(dAtA, i, uint64(j23)) i-- dAtA[i] = 0x12 } @@ -3565,20 +3690,20 @@ func (m *ModelVideo) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l if len(m.Sizes) > 0 { - dAtA25 := make([]byte, len(m.Sizes)*10) - var j24 int + dAtA26 := make([]byte, len(m.Sizes)*10) + var j25 int for _, num := range m.Sizes { for num >= 1<<7 { - dAtA25[j24] = uint8(uint64(num)&0x7f | 0x80) + dAtA26[j25] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j24++ + j25++ } - dAtA25[j24] = uint8(num) - j24++ + dAtA26[j25] = uint8(num) + j25++ } - i -= j24 - copy(dAtA[i:], dAtA25[:j24]) - i = encodeVarintModels(dAtA, i, uint64(j24)) + i -= j25 + copy(dAtA[i:], dAtA26[:j25]) + i = encodeVarintModels(dAtA, i, uint64(j25)) i-- dAtA[i] = 0x12 } @@ -3750,6 +3875,18 @@ func (m *ModelBlockContentOfDiv) Size() (n int) { } return n } +func (m *ModelBlockContentOfBookmark) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Bookmark != nil { + l = m.Bookmark.Size() + n += 2 + l + sovModels(uint64(l)) + } + return n +} func (m *ModelBlockPermissions) Size() (n int) { if m == nil { return 0 @@ -3804,6 +3941,15 @@ func (m *ModelBlockContentDiv) Size() (n int) { return n } +func (m *ModelBlockContentBookmark) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + func (m *ModelBlockContentDashboard) Size() (n int) { if m == nil { return 0 @@ -4780,6 +4926,41 @@ func (m *ModelBlock) Unmarshal(dAtA []byte) error { } m.Content = &ModelBlockContentOfDiv{v} iNdEx = postIndex + case 20: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Bookmark", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowModels + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthModels + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthModels + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &ModelBlockContentBookmark{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Content = &ModelBlockContentOfBookmark{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipModels(dAtA[iNdEx:]) @@ -5135,6 +5316,59 @@ func (m *ModelBlockContentDiv) Unmarshal(dAtA []byte) error { } return nil } +func (m *ModelBlockContentBookmark) 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 ErrIntOverflowModels + } + 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: Bookmark: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Bookmark: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipModels(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthModels + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthModels + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *ModelBlockContentDashboard) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/pb/protos/commands.proto b/pb/protos/commands.proto index f0ceb9669..5b1730236 100644 --- a/pb/protos/commands.proto +++ b/pb/protos/commands.proto @@ -59,7 +59,8 @@ message Rpc { message Create { message Request { Model.Block block = 1; - string contextBlockId = 2; + string targetId = 2; + Model.Block.Position position = 3; } message Response { diff --git a/pb/protos/models.proto b/pb/protos/models.proto index 3250af951..f596f788d 100644 --- a/pb/protos/models.proto +++ b/pb/protos/models.proto @@ -17,6 +17,11 @@ message Model { bool dropOn = 5; } + enum Position { + BEFORE = 0; + AFTER = 1; + } + oneof content { Content.Dashboard dashboard = 11; Content.Page page = 12; @@ -28,6 +33,7 @@ message Model { Content.File file = 17; Content.Layout layout = 18; Content.Div div = 19; + Content.Bookmark bookmark = 20; } message Content { @@ -42,6 +48,10 @@ message Model { message Div {} + message Bookmark { + // Model.Link.Preview preview = 1; + } + message Dashboard { enum Style { MAIN_SCREEN = 0; From 1734d92c6f6ee2b2c35f9c4357592e86103fbab4 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 6 Nov 2019 21:45:06 +0100 Subject: [PATCH 2/2] Proto rpc.history fix --- docs/proto.md | 3 +- pb/commands.pb.go | 270 ++++++++++++++++----------------------- pb/protos/commands.proto | 5 +- 3 files changed, 112 insertions(+), 166 deletions(-) diff --git a/docs/proto.md b/docs/proto.md index 716460d55..042e2d1bf 100644 --- a/docs/proto.md +++ b/docs/proto.md @@ -775,8 +775,7 @@ Middleware-to-front-end response for an account select request, that can contain | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| id | [string](#string) | | | -| contextBlockId | [string](#string) | | | +| blockId | [string](#string) | | | | moveForward | [bool](#bool) | | | diff --git a/pb/commands.pb.go b/pb/commands.pb.go index 109b563e9..ae056c070 100644 --- a/pb/commands.pb.go +++ b/pb/commands.pb.go @@ -680,9 +680,8 @@ func (m *RpcBlockHistoryMove) XXX_DiscardUnknown() { var xxx_messageInfo_RpcBlockHistoryMove proto.InternalMessageInfo type RpcBlockHistoryMoveRequest struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - ContextBlockId string `protobuf:"bytes,2,opt,name=contextBlockId,proto3" json:"contextBlockId,omitempty"` - MoveForward bool `protobuf:"varint,3,opt,name=moveForward,proto3" json:"moveForward,omitempty"` + BlockId string `protobuf:"bytes,1,opt,name=blockId,proto3" json:"blockId,omitempty"` + MoveForward bool `protobuf:"varint,2,opt,name=moveForward,proto3" json:"moveForward,omitempty"` } func (m *RpcBlockHistoryMoveRequest) Reset() { *m = RpcBlockHistoryMoveRequest{} } @@ -718,16 +717,9 @@ func (m *RpcBlockHistoryMoveRequest) XXX_DiscardUnknown() { var xxx_messageInfo_RpcBlockHistoryMoveRequest proto.InternalMessageInfo -func (m *RpcBlockHistoryMoveRequest) GetId() string { +func (m *RpcBlockHistoryMoveRequest) GetBlockId() string { if m != nil { - return m.Id - } - return "" -} - -func (m *RpcBlockHistoryMoveRequest) GetContextBlockId() string { - if m != nil { - return m.ContextBlockId + return m.BlockId } return "" } @@ -3682,104 +3674,103 @@ func init() { func init() { proto.RegisterFile("commands.proto", fileDescriptor_0dff099eb2e3dfdb) } var fileDescriptor_0dff099eb2e3dfdb = []byte{ - // 1542 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4d, 0x8c, 0xdb, 0xd4, - 0x16, 0x9e, 0x38, 0xce, 0x64, 0xe6, 0xcc, 0x74, 0x9e, 0x6b, 0xf5, 0x55, 0xd3, 0xfb, 0xfa, 0xa6, - 0xd5, 0xf4, 0xbd, 0xbe, 0xe9, 0xb4, 0xf5, 0xab, 0xa6, 0x7a, 0x8b, 0x3e, 0x51, 0x5a, 0x27, 0x71, - 0xa6, 0x86, 0xc4, 0x8e, 0x6e, 0x9c, 0x19, 0x60, 0x63, 0x79, 0x92, 0x3b, 0x19, 0x83, 0x13, 0x07, - 0xc7, 0x9d, 0xd2, 0xee, 0x58, 0xa0, 0x4a, 0xfc, 0x48, 0x08, 0x89, 0x15, 0x12, 0x82, 0x2d, 0x2d, - 0x12, 0xbb, 0x22, 0x24, 0x40, 0x2a, 0x2c, 0x00, 0x09, 0xa9, 0x80, 0x84, 0xd8, 0x80, 0x68, 0xbb, - 0x42, 0xa8, 0xac, 0x60, 0xc1, 0x02, 0x84, 0xae, 0xed, 0x38, 0xf6, 0x68, 0x92, 0x3a, 0xa3, 0x56, - 0xed, 0xce, 0xf7, 0xe6, 0xdc, 0xef, 0x9c, 0xf3, 0x7d, 0xe7, 0xdc, 0x9f, 0xc0, 0x4c, 0xdd, 0x6e, - 0xb5, 0x8c, 0x76, 0xa3, 0x2b, 0x74, 0x1c, 0xdb, 0xb5, 0xf9, 0xac, 0xd1, 0xbe, 0xe8, 0x5e, 0xec, - 0x10, 0x34, 0xdd, 0xb2, 0x1b, 0xc4, 0x0a, 0xa6, 0xd1, 0xae, 0xfa, 0x86, 0xd1, 0x6e, 0x92, 0x60, - 0x38, 0xff, 0xe2, 0x31, 0x48, 0xe3, 0x4e, 0x1d, 0xfd, 0x02, 0x90, 0xc9, 0x59, 0x76, 0xfd, 0x19, - 0xf4, 0x42, 0x1a, 0xb2, 0xe7, 0xcc, 0xae, 0x6b, 0x3b, 0x17, 0xd1, 0xef, 0x0c, 0xb0, 0x65, 0x7b, - 0x93, 0xa0, 0x3a, 0x64, 0x31, 0x79, 0xf6, 0x3c, 0xe9, 0xba, 0xfc, 0x0c, 0x30, 0x66, 0x63, 0x36, - 0x75, 0x30, 0xb5, 0x30, 0x89, 0x19, 0xb3, 0xc1, 0x1f, 0xa6, 0x9e, 0xdb, 0x2e, 0x79, 0xce, 0xf5, - 0xd6, 0xcb, 0x8d, 0x59, 0xc6, 0xfb, 0x6d, 0xcb, 0x2c, 0x7f, 0x10, 0xa6, 0x5a, 0xf6, 0x26, 0x29, - 0xda, 0xce, 0x05, 0xc3, 0x69, 0xcc, 0xa6, 0x0f, 0xa6, 0x16, 0x26, 0x70, 0x74, 0x0a, 0xbd, 0xc4, - 0xc0, 0x04, 0x26, 0xdd, 0x8e, 0xdd, 0xee, 0x12, 0xbe, 0x00, 0x19, 0xe2, 0x38, 0xb6, 0xe3, 0x79, - 0x9a, 0x5a, 0x12, 0x84, 0x20, 0x1d, 0x01, 0x77, 0xea, 0x82, 0x87, 0x29, 0x04, 0x51, 0x0a, 0x34, - 0x42, 0xa1, 0xb7, 0x50, 0x90, 0xe8, 0x2a, 0xec, 0x2f, 0x46, 0xef, 0xa7, 0x20, 0xe3, 0x4d, 0xf0, - 0xcb, 0xc0, 0xd6, 0xed, 0x06, 0xf1, 0xe0, 0x66, 0x96, 0x4e, 0x8e, 0x06, 0x27, 0xe4, 0xed, 0x06, - 0xc1, 0x1e, 0x00, 0xcd, 0xa3, 0x41, 0xba, 0x75, 0xc7, 0xec, 0xb8, 0xa6, 0xdd, 0x0e, 0x92, 0x8d, - 0x4e, 0xcd, 0x17, 0x80, 0xa5, 0xf6, 0xfc, 0x04, 0xb0, 0x4a, 0xad, 0x54, 0xe2, 0xc6, 0xf8, 0xdd, - 0xb0, 0xab, 0xa6, 0x3c, 0xae, 0xa8, 0xab, 0x8a, 0x2e, 0x61, 0xac, 0x62, 0x2e, 0xc5, 0xef, 0x82, - 0xc9, 0x9c, 0x58, 0xd0, 0x65, 0xa5, 0x52, 0xd3, 0x38, 0x86, 0xe7, 0x60, 0x3a, 0x2f, 0x2a, 0xba, - 0xa2, 0x6a, 0x7a, 0x59, 0x5d, 0x91, 0xb8, 0x34, 0x7a, 0x85, 0x01, 0x56, 0xed, 0x90, 0x36, 0xda, - 0x37, 0x90, 0x7b, 0xf4, 0x53, 0x2a, 0xc2, 0xd8, 0x23, 0x71, 0xc6, 0x0e, 0x6f, 0x93, 0x22, 0xc5, - 0x1b, 0xc0, 0xd4, 0x9b, 0x21, 0x53, 0x67, 0x62, 0x4c, 0x1d, 0x4d, 0x06, 0x33, 0x1a, 0x43, 0x4b, - 0xa3, 0x33, 0x84, 0x2e, 0xa7, 0x61, 0x3c, 0xef, 0x10, 0xc3, 0x25, 0xe8, 0xe5, 0x54, 0x9f, 0x92, - 0x45, 0xc8, 0xac, 0xd1, 0xa0, 0x82, 0xac, 0xf7, 0x84, 0xe1, 0x96, 0x69, 0xd5, 0xfb, 0x01, 0x63, - 0xdf, 0x84, 0x47, 0x30, 0xe1, 0x1a, 0x4e, 0x93, 0xb8, 0x61, 0x91, 0x86, 0x63, 0xfe, 0x14, 0x4c, - 0x74, 0xec, 0xae, 0xe9, 0x45, 0x9c, 0xf6, 0x32, 0xff, 0xe7, 0x76, 0x50, 0x42, 0x25, 0x30, 0xc2, - 0xa1, 0x39, 0xba, 0x13, 0x55, 0xe1, 0xd1, 0xb8, 0x0a, 0x0b, 0xdb, 0xd0, 0xe7, 0x67, 0x31, 0x40, - 0x87, 0xb7, 0x42, 0x1d, 0xc4, 0x98, 0x0e, 0xc7, 0x93, 0x02, 0xdd, 0x7f, 0x25, 0xae, 0x33, 0x30, - 0x5e, 0xeb, 0x34, 0xa8, 0x12, 0xe7, 0xfa, 0x42, 0x9c, 0x86, 0x6c, 0xb0, 0xb5, 0x04, 0xa9, 0x1f, - 0x0a, 0x23, 0xce, 0x7b, 0xf3, 0x42, 0xf9, 0xbc, 0xe5, 0x9a, 0x1d, 0x8b, 0xf8, 0xd1, 0x77, 0x4b, - 0x66, 0xd7, 0xc5, 0xbd, 0x35, 0x23, 0x93, 0xe8, 0x07, 0x70, 0x0f, 0x48, 0xdc, 0x16, 0xe8, 0xfe, - 0x93, 0xf8, 0x65, 0x06, 0xc6, 0x57, 0x0d, 0xcb, 0x22, 0x2e, 0xfa, 0x81, 0x09, 0x2b, 0xfb, 0xdf, - 0x7d, 0x3e, 0x11, 0x4c, 0x38, 0xb6, 0xed, 0x56, 0x0c, 0x77, 0x23, 0xe8, 0xf8, 0x70, 0x8c, 0xae, - 0x46, 0x77, 0xca, 0x33, 0x71, 0xb2, 0x8e, 0xc4, 0x72, 0xf4, 0x5d, 0x0c, 0x2d, 0x39, 0xea, 0xa9, - 0xd5, 0x26, 0x2d, 0xbb, 0x6d, 0xd6, 0x7b, 0x6d, 0xd1, 0x1b, 0xa3, 0xeb, 0x21, 0x93, 0xb9, 0x18, - 0x93, 0x42, 0x62, 0x2f, 0xa3, 0x51, 0x59, 0xdd, 0xc1, 0xde, 0x79, 0x00, 0xfe, 0x51, 0x14, 0xe5, - 0x92, 0x54, 0xd0, 0x35, 0x55, 0xcf, 0x63, 0x49, 0xd4, 0x24, 0xbd, 0xa4, 0xe6, 0xc5, 0x92, 0x8e, - 0xa5, 0x8a, 0xca, 0x11, 0x74, 0x93, 0xa1, 0xb4, 0xd6, 0xed, 0x4d, 0xe2, 0x20, 0x31, 0x11, 0xc3, - 0x43, 0x39, 0x79, 0x2d, 0xca, 0xfe, 0xd9, 0x38, 0xfb, 0x8b, 0xdb, 0xf1, 0x12, 0xf8, 0x1e, 0x50, - 0xac, 0x9f, 0x84, 0x14, 0xe7, 0x63, 0x14, 0xff, 0x37, 0x39, 0xd4, 0x43, 0xc0, 0xf1, 0x1b, 0xd3, - 0x90, 0x15, 0xeb, 0x75, 0xfb, 0x7c, 0xdb, 0x45, 0xef, 0xb1, 0x61, 0x41, 0x5f, 0xe8, 0xd3, 0xcd, - 0x03, 0xdb, 0x36, 0x5a, 0x24, 0xa0, 0xda, 0xfb, 0xe6, 0x17, 0xe1, 0x6f, 0xc6, 0xa6, 0xe1, 0x1a, - 0x4e, 0xc9, 0xae, 0x1b, 0x96, 0xa7, 0x84, 0x17, 0xf0, 0xb9, 0x31, 0xbc, 0xf5, 0x07, 0x7e, 0x1e, - 0xa6, 0xfc, 0xa9, 0xbc, 0x6d, 0xd9, 0x8e, 0xb7, 0x49, 0x53, 0xbb, 0xe8, 0x64, 0x6e, 0x02, 0xc6, - 0xfd, 0x21, 0xba, 0x9a, 0x4e, 0x2a, 0x52, 0x10, 0xf5, 0xf0, 0x1e, 0x39, 0x01, 0x59, 0xc3, 0xb7, - 0xf3, 0x02, 0x9c, 0x5a, 0xda, 0xbb, 0xe5, 0x74, 0x08, 0x50, 0x70, 0xcf, 0x0c, 0x5d, 0x61, 0x92, - 0xc8, 0x3a, 0xd4, 0xf9, 0x68, 0xb2, 0x7e, 0x90, 0xda, 0x81, 0xae, 0xc7, 0x60, 0x41, 0xcc, 0xe7, - 0xd5, 0x9a, 0xa2, 0x05, 0xaa, 0x16, 0xf4, 0x5c, 0x4d, 0xd3, 0xfb, 0x5a, 0x57, 0x35, 0x11, 0x6b, - 0xba, 0xa2, 0x16, 0x24, 0x8e, 0xca, 0x75, 0xf8, 0x2e, 0xd6, 0x92, 0xa6, 0x2b, 0x62, 0x59, 0xe2, - 0xd6, 0x13, 0x20, 0x4b, 0x9a, 0x2e, 0xae, 0x88, 0x9a, 0x88, 0xb9, 0x26, 0xfa, 0x34, 0xdd, 0x6f, - 0xd1, 0xc9, 0xb0, 0x66, 0xd0, 0xbb, 0x51, 0x15, 0xc5, 0xb8, 0x8a, 0x47, 0xb7, 0x25, 0x72, 0x78, - 0xaf, 0x7d, 0x1f, 0x8a, 0x52, 0x88, 0x89, 0x72, 0x62, 0x04, 0xac, 0xd1, 0x54, 0xf9, 0x79, 0x27, - 0xaa, 0xfc, 0x1d, 0x76, 0x2b, 0xaa, 0x1e, 0xd0, 0x57, 0xd5, 0x8b, 0x6a, 0x4d, 0x29, 0x70, 0xd4, - 0xdb, 0x7e, 0x45, 0xf2, 0xc9, 0xc3, 0x52, 0x5e, 0x5d, 0x91, 0xb0, 0xbe, 0x2a, 0x96, 0x4a, 0x92, - 0xa6, 0x17, 0x65, 0x5c, 0xd5, 0xb8, 0xf5, 0xbb, 0xb5, 0x69, 0x93, 0x3f, 0x04, 0x07, 0xfa, 0x63, - 0x5d, 0x7a, 0x42, 0xae, 0x6a, 0x55, 0x4f, 0x97, 0xbc, 0x8a, 0x71, 0xad, 0xa2, 0x49, 0x05, 0x6e, - 0x83, 0xdf, 0x0b, 0x7c, 0x1f, 0x05, 0xd7, 0x14, 0x5f, 0x7e, 0x93, 0xfa, 0x0f, 0xfc, 0xf5, 0xdc, - 0xd3, 0xfb, 0x6a, 0x45, 0xc2, 0x45, 0x15, 0x97, 0xa5, 0x02, 0xf7, 0x34, 0x7a, 0x9d, 0x85, 0xf1, - 0x2a, 0xb1, 0x48, 0xdd, 0x45, 0xff, 0x1b, 0xfc, 0x64, 0x88, 0x6e, 0xbc, 0xcc, 0x96, 0xa3, 0xed, - 0x9b, 0x91, 0xfb, 0xd6, 0xf7, 0x77, 0xcf, 0xfa, 0xf6, 0xeb, 0x91, 0xfa, 0x76, 0x5b, 0xe7, 0xa3, - 0x55, 0xc8, 0xcd, 0xd4, 0x7d, 0xd8, 0x8f, 0x93, 0x08, 0xbd, 0x3e, 0x40, 0xe8, 0x66, 0x1c, 0xbd, - 0x28, 0x2b, 0x85, 0x5e, 0x2d, 0xea, 0xb2, 0x52, 0x54, 0xb9, 0x0d, 0x5e, 0x80, 0xc5, 0x08, 0x3a, - 0xad, 0x82, 0xc0, 0x83, 0xa8, 0x14, 0xf4, 0xb2, 0x22, 0x95, 0x55, 0x45, 0xce, 0x7b, 0xf3, 0x55, - 0x49, 0xe3, 0x4c, 0xf4, 0x2d, 0x03, 0xd9, 0x15, 0xe2, 0x74, 0xe9, 0x75, 0xf9, 0x0b, 0x06, 0xd2, - 0xcb, 0xc4, 0x8d, 0xb6, 0xf9, 0xb5, 0xe8, 0x89, 0x7a, 0x3a, 0x2e, 0xfa, 0x7f, 0x62, 0xbc, 0x07, - 0x20, 0xc2, 0x32, 0x19, 0xa4, 0xf8, 0x2c, 0x64, 0x37, 0x7d, 0xa3, 0x80, 0xec, 0xde, 0x10, 0x7d, - 0x15, 0x1e, 0xb4, 0x67, 0x63, 0xca, 0x1e, 0x4b, 0xe8, 0x61, 0x34, 0x59, 0x1b, 0x3b, 0x50, 0x75, - 0x0f, 0x70, 0x2b, 0x12, 0xae, 0xca, 0xaa, 0xa2, 0xcb, 0x55, 0x5d, 0x2a, 0x57, 0xb4, 0x27, 0xb9, - 0x34, 0x35, 0xa2, 0x4c, 0xf6, 0x76, 0x81, 0x29, 0xc8, 0x6a, 0x72, 0x59, 0x52, 0x6b, 0x1a, 0xb7, - 0x8e, 0x3e, 0x4e, 0x43, 0xba, 0x64, 0x37, 0xd1, 0xb5, 0x34, 0xb0, 0x55, 0xd2, 0x6e, 0xa0, 0x77, - 0x22, 0x6f, 0xa3, 0x59, 0xc8, 0xb6, 0x48, 0xb7, 0x6b, 0x34, 0x7b, 0x87, 0x6e, 0x6f, 0xc8, 0x9f, - 0x82, 0x8c, 0x45, 0x36, 0x89, 0xe5, 0x05, 0x3e, 0x13, 0xb9, 0xaa, 0x53, 0x06, 0x4a, 0x76, 0x53, - 0xa0, 0x58, 0x42, 0x80, 0x23, 0x94, 0xa8, 0x29, 0xf6, 0x57, 0xcc, 0x3f, 0x06, 0x19, 0x6f, 0xcc, - 0x4f, 0x42, 0xa6, 0x20, 0xe5, 0x6a, 0xcb, 0xdc, 0x18, 0xfd, 0xec, 0x65, 0x34, 0x09, 0x99, 0xa2, - 0xa8, 0x89, 0x25, 0x8e, 0xa1, 0x99, 0x7b, 0xe5, 0x92, 0xa6, 0x93, 0x15, 0x51, 0x91, 0xf3, 0x1c, - 0x4b, 0xa3, 0x5f, 0x15, 0xb1, 0x22, 0x2b, 0xcb, 0x5c, 0x06, 0x3d, 0x1f, 0xd5, 0xfd, 0xff, 0x71, - 0xdd, 0xff, 0x35, 0x28, 0xa6, 0xe1, 0xef, 0xfc, 0xd3, 0x31, 0x69, 0x8f, 0x24, 0x01, 0x19, 0x4d, - 0x57, 0x65, 0x07, 0xba, 0x0e, 0x53, 0xf0, 0x4f, 0x06, 0x58, 0xb9, 0xb3, 0xde, 0x45, 0xbf, 0x05, - 0x7d, 0x71, 0x87, 0x01, 0xb6, 0x68, 0x5a, 0x64, 0xd8, 0xc3, 0xff, 0xf3, 0xc4, 0x0f, 0x00, 0x0a, - 0xed, 0xd5, 0x32, 0x85, 0x1c, 0xd0, 0x32, 0x3c, 0xb0, 0x0d, 0xc3, 0x35, 0xbc, 0x6c, 0xa7, 0xb1, - 0xf7, 0xcd, 0xef, 0x81, 0x4c, 0x8b, 0x34, 0x4c, 0xc3, 0xbf, 0x67, 0x61, 0x7f, 0x10, 0xde, 0xe1, - 0xd8, 0xfe, 0x1d, 0x0e, 0x7d, 0x98, 0xe8, 0x89, 0x30, 0x2c, 0x8e, 0x07, 0x2b, 0xc0, 0xe5, 0x71, - 0xc8, 0xc8, 0x2d, 0xa3, 0x49, 0xd0, 0x1f, 0x19, 0x5f, 0x81, 0x5f, 0x19, 0x60, 0x73, 0x96, 0xbd, - 0x16, 0x7d, 0xde, 0x6e, 0x3d, 0xc3, 0x8e, 0x03, 0xdb, 0x35, 0x2f, 0x91, 0xa0, 0x81, 0xf6, 0x6d, - 0x39, 0x55, 0x3c, 0x3c, 0xa1, 0x6a, 0x5e, 0x22, 0xd8, 0x33, 0x43, 0x6f, 0x27, 0x7e, 0x33, 0xf8, - 0x4b, 0x29, 0x53, 0x34, 0x84, 0xc1, 0x8a, 0xad, 0x59, 0xf6, 0x5a, 0x4f, 0x31, 0xfa, 0x8d, 0x3e, - 0x4a, 0xf4, 0x8e, 0x18, 0x0a, 0xff, 0xe0, 0x3b, 0xc1, 0x2b, 0xfc, 0x7b, 0x47, 0xfb, 0x95, 0x1d, - 0xd0, 0x3e, 0xa4, 0x51, 0xf6, 0xc3, 0xa4, 0x15, 0x7f, 0xa8, 0xe0, 0xfe, 0xc4, 0xc8, 0x02, 0x3c, - 0x6c, 0x9d, 0x90, 0xdb, 0xff, 0xd9, 0xad, 0xb9, 0xd4, 0x8d, 0x5b, 0x73, 0xa9, 0x1f, 0x6f, 0xcd, - 0xa5, 0x5e, 0xbd, 0x3d, 0x37, 0x76, 0xe3, 0xf6, 0xdc, 0xd8, 0x77, 0xb7, 0xe7, 0xc6, 0x9e, 0x62, - 0x3a, 0x6b, 0x6b, 0xe3, 0xde, 0x3f, 0xc6, 0x27, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xab, 0x6f, - 0x3a, 0x45, 0x69, 0x16, 0x00, 0x00, + // 1531 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4d, 0x6c, 0x1b, 0xd5, + 0x16, 0x8e, 0xc7, 0xe3, 0x38, 0x39, 0x49, 0xf3, 0xa6, 0xa3, 0xbe, 0x2a, 0xbd, 0xaf, 0x2f, 0xad, + 0xd2, 0xf7, 0x4a, 0x9a, 0xb6, 0x43, 0x95, 0x8a, 0x45, 0x11, 0xa5, 0x1d, 0xdb, 0xe3, 0x74, 0xc0, + 0x9e, 0xb1, 0xae, 0xc7, 0x09, 0xb0, 0x19, 0x4d, 0xec, 0x1b, 0x67, 0x60, 0xec, 0x31, 0xe3, 0x69, + 0xaa, 0x76, 0xc7, 0xaa, 0x0b, 0x40, 0x42, 0x48, 0xac, 0x90, 0x10, 0x6c, 0x69, 0x91, 0xd8, 0x15, + 0x21, 0x01, 0x52, 0x61, 0x01, 0x48, 0x48, 0x05, 0x24, 0x84, 0x84, 0x40, 0xb4, 0x5d, 0x20, 0x04, + 0xdd, 0xc1, 0x12, 0x84, 0xee, 0xfc, 0xd9, 0x13, 0xc5, 0xee, 0x38, 0x6a, 0xd5, 0xee, 0xe6, 0x5e, + 0x9f, 0xfb, 0x9d, 0x73, 0xbe, 0xef, 0x9c, 0xfb, 0x63, 0x98, 0xa9, 0xdb, 0xad, 0x96, 0xd1, 0x6e, + 0x74, 0x85, 0x8e, 0x63, 0xbb, 0x36, 0x9f, 0x35, 0xda, 0x17, 0xdd, 0x8b, 0x1d, 0x82, 0xa6, 0x5b, + 0x76, 0x83, 0x58, 0xc1, 0x34, 0xda, 0x55, 0xdf, 0x30, 0xda, 0x4d, 0x12, 0x0c, 0xe7, 0x7f, 0x3f, + 0x0a, 0x69, 0xdc, 0xa9, 0xa3, 0x1b, 0x00, 0x99, 0x9c, 0x65, 0xd7, 0x5f, 0x40, 0xbf, 0x30, 0x90, + 0x3d, 0x67, 0x76, 0x5d, 0xdb, 0xb9, 0x88, 0x7e, 0x60, 0x80, 0x2d, 0xdb, 0x9b, 0x04, 0x49, 0x90, + 0xc5, 0xe4, 0xc5, 0xf3, 0xa4, 0xeb, 0xf2, 0xb3, 0x90, 0x5d, 0xa3, 0x86, 0x72, 0x63, 0x36, 0x75, + 0x30, 0xb5, 0x30, 0x89, 0xc3, 0x21, 0x7f, 0x10, 0xa6, 0x5a, 0xf6, 0x26, 0x29, 0xda, 0xce, 0x05, + 0xc3, 0x69, 0xcc, 0x32, 0x07, 0x53, 0x0b, 0x13, 0xb8, 0x7f, 0x0a, 0xbd, 0xcc, 0xc0, 0x04, 0x26, + 0xdd, 0x8e, 0xdd, 0xee, 0x12, 0xbe, 0x00, 0x19, 0xe2, 0x38, 0xb6, 0xe3, 0xc1, 0x4c, 0x2d, 0x09, + 0x42, 0x10, 0xb0, 0x80, 0x3b, 0x75, 0xc1, 0x8b, 0x45, 0x08, 0xe2, 0x10, 0x68, 0x0c, 0x42, 0xb8, + 0x50, 0x90, 0xe8, 0x2a, 0xec, 0x2f, 0x46, 0x1f, 0xa4, 0x20, 0xe3, 0x4d, 0xf0, 0xcb, 0xc0, 0xd6, + 0xed, 0x06, 0xf1, 0xe0, 0x66, 0x96, 0x4e, 0x8e, 0x06, 0x27, 0xe4, 0xed, 0x06, 0xc1, 0x1e, 0x00, + 0xcd, 0xa3, 0x41, 0xba, 0x75, 0xc7, 0xec, 0xb8, 0xa6, 0xdd, 0xf6, 0xf2, 0x98, 0xc4, 0xfd, 0x53, + 0xf3, 0x05, 0x60, 0xa9, 0x3d, 0x3f, 0x01, 0xac, 0x52, 0x2b, 0x95, 0xb8, 0x31, 0x7e, 0x37, 0xec, + 0xaa, 0x29, 0x4f, 0x2b, 0xea, 0xaa, 0xa2, 0x4b, 0x18, 0xab, 0x98, 0x4b, 0xf1, 0xbb, 0x60, 0x32, + 0x27, 0x16, 0x74, 0x59, 0xa9, 0xd4, 0x34, 0x8e, 0xe1, 0x39, 0x98, 0xce, 0x8b, 0x8a, 0xae, 0xa8, + 0x9a, 0x5e, 0x56, 0x57, 0x24, 0x2e, 0x8d, 0x5e, 0x65, 0x80, 0x55, 0x3b, 0xa4, 0x8d, 0xf6, 0xf5, + 0xd8, 0x9d, 0x01, 0xc6, 0x0c, 0x89, 0x65, 0xcc, 0x06, 0xfa, 0x35, 0xd5, 0xc7, 0xd8, 0x13, 0x71, + 0xc6, 0x0e, 0x6f, 0x93, 0x22, 0xc5, 0x1b, 0xc0, 0xd4, 0x5b, 0x11, 0x53, 0x67, 0x62, 0x4c, 0x1d, + 0x4d, 0x06, 0x33, 0x1a, 0x43, 0x4b, 0xa3, 0x33, 0x84, 0x2e, 0xa7, 0x61, 0x3c, 0xef, 0x10, 0xc3, + 0x25, 0xe8, 0x95, 0x54, 0x8f, 0x92, 0x45, 0xc8, 0x78, 0x15, 0x16, 0x64, 0xbd, 0x27, 0x0a, 0xb7, + 0x4c, 0xeb, 0xda, 0x0f, 0x18, 0xfb, 0x26, 0x3c, 0x82, 0x09, 0xd7, 0x70, 0x9a, 0xc4, 0x95, 0x1b, + 0x41, 0x54, 0xd1, 0x98, 0x3f, 0x05, 0x13, 0x1d, 0xbb, 0x6b, 0x7a, 0x11, 0xa7, 0xbd, 0xcc, 0xff, + 0xbb, 0x1d, 0x94, 0x50, 0x09, 0x8c, 0x70, 0x64, 0x8e, 0xee, 0xf4, 0xab, 0xf0, 0x64, 0x5c, 0x85, + 0x85, 0x6d, 0xe8, 0xf3, 0xb3, 0x18, 0xa0, 0xc3, 0xdb, 0x91, 0x0e, 0x62, 0x4c, 0x87, 0xe3, 0x49, + 0x81, 0xee, 0xbf, 0x12, 0xd7, 0x19, 0x18, 0xaf, 0x75, 0x1a, 0x54, 0x89, 0x73, 0x3d, 0x21, 0x4e, + 0x43, 0x36, 0xd8, 0x3c, 0x82, 0xd4, 0x0f, 0x45, 0x11, 0xe7, 0xbd, 0x79, 0xa1, 0x7c, 0xde, 0x72, + 0xcd, 0x8e, 0x45, 0xfc, 0xe8, 0xbb, 0x25, 0xb3, 0xeb, 0xe2, 0x70, 0xcd, 0xc8, 0x24, 0xfa, 0x01, + 0xdc, 0x03, 0x12, 0xb7, 0x05, 0xba, 0xff, 0x24, 0x7e, 0x95, 0x81, 0xf1, 0x55, 0xc3, 0xb2, 0x88, + 0x8b, 0x7e, 0x62, 0xa2, 0xca, 0xfe, 0x7f, 0x8f, 0x4f, 0x04, 0x13, 0x8e, 0x6d, 0xbb, 0x15, 0xc3, + 0xdd, 0x08, 0x3a, 0x3e, 0x1a, 0xa3, 0xab, 0xfd, 0x3b, 0xe5, 0x99, 0x38, 0x59, 0x47, 0x62, 0x39, + 0xfa, 0x2e, 0x86, 0x96, 0x1c, 0xf5, 0xd4, 0x6a, 0x93, 0x96, 0xdd, 0x36, 0xeb, 0x61, 0x5b, 0x84, + 0x63, 0x74, 0x3d, 0x62, 0x32, 0x17, 0x63, 0x52, 0x48, 0xec, 0x65, 0x34, 0x2a, 0xab, 0x3b, 0xd8, + 0x3b, 0x0f, 0xc0, 0x7f, 0x8a, 0xa2, 0x5c, 0x92, 0x0a, 0xba, 0xa6, 0xea, 0x79, 0x2c, 0x89, 0x9a, + 0xa4, 0x97, 0xd4, 0xbc, 0x58, 0xd2, 0xb1, 0x54, 0x51, 0x39, 0x82, 0x6e, 0x32, 0x94, 0xd6, 0xba, + 0xbd, 0x49, 0x1c, 0x24, 0x26, 0x62, 0x78, 0x28, 0x27, 0xaf, 0xf7, 0xb3, 0x7f, 0x36, 0xce, 0xfe, + 0xe2, 0x76, 0xbc, 0x04, 0xbe, 0x07, 0x14, 0xeb, 0xa7, 0x11, 0xc5, 0xf9, 0x18, 0xc5, 0x8f, 0x26, + 0x87, 0x7a, 0x08, 0x38, 0x7e, 0x73, 0x1a, 0xb2, 0x62, 0xbd, 0x6e, 0x9f, 0x6f, 0xbb, 0xe8, 0x7d, + 0x36, 0x2a, 0xe8, 0x0b, 0x3d, 0xba, 0x79, 0x60, 0xdb, 0x46, 0x8b, 0x04, 0x54, 0x7b, 0xdf, 0xfc, + 0x22, 0xfc, 0xcb, 0xd8, 0x34, 0x5c, 0xc3, 0x29, 0xd9, 0x75, 0xc3, 0xf2, 0x94, 0xf0, 0x02, 0x3e, + 0x37, 0x86, 0xb7, 0xfe, 0xc0, 0xcf, 0xc3, 0x94, 0x3f, 0x95, 0xb7, 0x2d, 0xdb, 0xf1, 0x36, 0x69, + 0x6a, 0xd7, 0x3f, 0x99, 0x9b, 0x80, 0x71, 0x7f, 0x88, 0xae, 0xa6, 0x93, 0x8a, 0x14, 0x44, 0x3d, + 0xbc, 0x47, 0x4e, 0x40, 0xd6, 0xf0, 0xed, 0xbc, 0x00, 0xa7, 0x96, 0xf6, 0x6e, 0x39, 0x1d, 0x02, + 0x14, 0x1c, 0x9a, 0xa1, 0x2b, 0x4c, 0x12, 0x59, 0x87, 0x3a, 0x1f, 0x4d, 0xd6, 0x0f, 0x53, 0x3b, + 0xd0, 0xf5, 0x18, 0x2c, 0x88, 0xf9, 0xbc, 0x5a, 0x53, 0xb4, 0x40, 0xd5, 0x82, 0x9e, 0xab, 0x69, + 0x7a, 0x4f, 0xeb, 0xaa, 0x26, 0x62, 0x4d, 0x57, 0xd4, 0x82, 0xc4, 0x51, 0xb9, 0x0e, 0xdf, 0xc5, + 0x5a, 0xd2, 0x74, 0x45, 0x2c, 0x4b, 0xdc, 0x7a, 0x02, 0x64, 0x49, 0xd3, 0xc5, 0x15, 0x51, 0x13, + 0x31, 0xd7, 0x44, 0x9f, 0xa5, 0x7b, 0x2d, 0x3a, 0x19, 0xd5, 0x0c, 0x7a, 0xaf, 0x5f, 0x45, 0x31, + 0xae, 0xe2, 0xd1, 0x6d, 0x89, 0x1c, 0xde, 0x6b, 0x3f, 0x46, 0xa2, 0x14, 0x62, 0xa2, 0x9c, 0x18, + 0x01, 0x6b, 0x34, 0x55, 0x7e, 0xdb, 0x89, 0x2a, 0xff, 0x86, 0xdd, 0x8a, 0xaa, 0x07, 0xf4, 0x55, + 0xf5, 0xa2, 0x5a, 0x53, 0x0a, 0x1c, 0xf5, 0xb6, 0x5f, 0x91, 0x7c, 0xf2, 0xb0, 0x94, 0x57, 0x57, + 0x24, 0xac, 0xaf, 0x8a, 0xa5, 0x92, 0xa4, 0xe9, 0x45, 0x19, 0x57, 0x35, 0x6e, 0xfd, 0x6e, 0x6d, + 0xda, 0xe4, 0x0f, 0xc1, 0x81, 0xde, 0x58, 0x97, 0x9e, 0x91, 0xab, 0x5a, 0xd5, 0xd3, 0x25, 0xaf, + 0x62, 0x5c, 0xab, 0x68, 0x52, 0x81, 0xdb, 0xe0, 0xf7, 0x02, 0xdf, 0x43, 0xc1, 0x35, 0xc5, 0x97, + 0xdf, 0xa4, 0xfe, 0x03, 0x7f, 0xa1, 0x7b, 0x7a, 0x5f, 0xad, 0x48, 0xb8, 0xa8, 0xe2, 0xb2, 0x54, + 0xe0, 0x9e, 0x47, 0x6f, 0xb0, 0x30, 0x5e, 0x25, 0x16, 0xa9, 0xbb, 0xe8, 0xb1, 0x81, 0xd7, 0xd6, + 0xd8, 0xc6, 0xcb, 0x6c, 0x39, 0xda, 0xbe, 0x1d, 0xb9, 0x6f, 0x7d, 0x7f, 0xf7, 0xac, 0x6f, 0xbf, + 0x19, 0xa9, 0x6f, 0xb7, 0x75, 0x3e, 0x5a, 0x85, 0xdc, 0x4c, 0xdd, 0x87, 0xfd, 0x38, 0x89, 0xd0, + 0xeb, 0x03, 0x84, 0x6e, 0xc6, 0xd1, 0x8b, 0xb2, 0x52, 0x08, 0x6b, 0x51, 0x97, 0x95, 0xa2, 0xca, + 0x6d, 0xf0, 0x02, 0x2c, 0xf6, 0xa1, 0xd3, 0x2a, 0x08, 0x3c, 0x88, 0x4a, 0x41, 0x2f, 0x2b, 0x52, + 0x59, 0x55, 0xe4, 0xbc, 0x37, 0x5f, 0x95, 0x34, 0xce, 0x44, 0xdf, 0x31, 0x90, 0x5d, 0x21, 0x4e, + 0x97, 0x5e, 0x97, 0xbf, 0x64, 0x20, 0xbd, 0x4c, 0xdc, 0xfe, 0x36, 0xbf, 0xd6, 0x7f, 0xa2, 0x9e, + 0x8e, 0x8b, 0xfe, 0x48, 0x8c, 0xf7, 0x00, 0x44, 0x58, 0x26, 0x83, 0x14, 0x9f, 0x85, 0xec, 0xa6, + 0x6f, 0x14, 0x90, 0x1d, 0x0e, 0xd1, 0xd7, 0xd1, 0x41, 0x7b, 0x36, 0xa6, 0xec, 0xb1, 0x84, 0x1e, + 0x46, 0x93, 0xb5, 0xb1, 0x03, 0x55, 0xf7, 0x00, 0xb7, 0x22, 0xe1, 0xaa, 0xac, 0x2a, 0xba, 0x5c, + 0xd5, 0xa5, 0x72, 0x45, 0x7b, 0x96, 0x4b, 0x53, 0x23, 0xca, 0x64, 0xb8, 0x0b, 0x4c, 0x41, 0x56, + 0x93, 0xcb, 0x92, 0x5a, 0xd3, 0xb8, 0x75, 0xf4, 0x49, 0x1a, 0xd2, 0x25, 0xbb, 0x89, 0xae, 0xa5, + 0x81, 0xad, 0x92, 0x76, 0x03, 0xbd, 0x9b, 0x8a, 0x3d, 0xc6, 0x5b, 0xa4, 0xdb, 0x35, 0x9a, 0xe1, + 0xa1, 0x1b, 0x0e, 0xf9, 0x53, 0x90, 0xb1, 0xc8, 0x26, 0xb1, 0xbc, 0xc0, 0x67, 0xfa, 0xae, 0xea, + 0x94, 0x81, 0x92, 0xdd, 0x14, 0x28, 0x96, 0x10, 0xe0, 0x08, 0x25, 0x6a, 0x8a, 0xfd, 0x15, 0xf3, + 0x4f, 0x41, 0xc6, 0x1b, 0xf3, 0x93, 0x90, 0x29, 0x48, 0xb9, 0xda, 0x32, 0x37, 0x46, 0x3f, 0xc3, + 0x8c, 0x26, 0x21, 0x53, 0x14, 0x35, 0xb1, 0xc4, 0x31, 0x34, 0x73, 0xaf, 0x5c, 0xd2, 0x74, 0xb2, + 0x22, 0x2a, 0x72, 0x9e, 0x63, 0x69, 0xf4, 0xab, 0x22, 0x56, 0x64, 0x65, 0x99, 0xcb, 0xa0, 0x97, + 0xfa, 0x75, 0x7f, 0x3c, 0xae, 0xfb, 0xff, 0x06, 0xc5, 0x34, 0xfc, 0x9d, 0x7f, 0x3a, 0x26, 0xed, + 0x91, 0x24, 0x20, 0xa3, 0xe9, 0xaa, 0xec, 0x40, 0xd7, 0x61, 0x0a, 0xfe, 0xcd, 0x00, 0x2b, 0x77, + 0xd6, 0xbb, 0xe8, 0xcf, 0xa0, 0x2f, 0xee, 0x30, 0xc0, 0x16, 0x4d, 0x8b, 0x0c, 0x7b, 0xf8, 0x7f, + 0x91, 0xf8, 0x01, 0x40, 0xa1, 0xbd, 0x5a, 0xa6, 0x90, 0x03, 0x5a, 0x86, 0x07, 0xb6, 0x61, 0xb8, + 0x86, 0x97, 0xed, 0x34, 0xf6, 0xbe, 0xf9, 0x3d, 0x90, 0x69, 0x91, 0x86, 0x69, 0xf8, 0xf7, 0x2c, + 0xec, 0x0f, 0xa2, 0x3b, 0x1c, 0xdb, 0xbb, 0xc3, 0xa1, 0x8f, 0x12, 0x3d, 0x11, 0x86, 0xc5, 0xf1, + 0x60, 0x05, 0xb8, 0x3c, 0x0e, 0x19, 0xb9, 0x65, 0x34, 0x09, 0xfa, 0x2b, 0xe3, 0x2b, 0xf0, 0x07, + 0x03, 0x6c, 0xce, 0xb2, 0xd7, 0xfa, 0x9f, 0xb7, 0x5b, 0xcf, 0xb0, 0xe3, 0xc0, 0x76, 0xcd, 0x4b, + 0x24, 0x68, 0xa0, 0x7d, 0x5b, 0x4e, 0x15, 0x0f, 0x4f, 0xa8, 0x9a, 0x97, 0x08, 0xf6, 0xcc, 0xd0, + 0x3b, 0x89, 0xdf, 0x0c, 0xfe, 0x52, 0xca, 0x14, 0x0d, 0x61, 0xb0, 0x62, 0x6b, 0x96, 0xbd, 0x16, + 0x2a, 0x46, 0xbf, 0xd1, 0xc7, 0x89, 0xde, 0x11, 0x43, 0xe1, 0x1f, 0x7c, 0x27, 0x78, 0x85, 0x7f, + 0xef, 0x68, 0xbf, 0xb2, 0x03, 0xda, 0x87, 0x34, 0xca, 0x7e, 0x98, 0xb4, 0xe2, 0x0f, 0x15, 0xdc, + 0x9b, 0x18, 0x59, 0x80, 0x87, 0xad, 0x13, 0x72, 0xfb, 0x3f, 0xbf, 0x35, 0x97, 0xba, 0x71, 0x6b, + 0x2e, 0xf5, 0xf3, 0xad, 0xb9, 0xd4, 0x6b, 0xb7, 0xe7, 0xc6, 0x6e, 0xdc, 0x9e, 0x1b, 0xfb, 0xfe, + 0xf6, 0xdc, 0xd8, 0x73, 0x4c, 0x67, 0x6d, 0x6d, 0xdc, 0xfb, 0x4f, 0xf8, 0xe4, 0x3f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x92, 0x61, 0xfe, 0x0d, 0x4b, 0x16, 0x00, 0x00, } func (m *Rpc) Marshal() (dAtA []byte, err error) { @@ -3902,19 +3893,12 @@ func (m *RpcBlockHistoryMoveRequest) MarshalToSizedBuffer(dAtA []byte) (int, err dAtA[i] = 0 } i-- - dAtA[i] = 0x18 + dAtA[i] = 0x10 } - if len(m.ContextBlockId) > 0 { - i -= len(m.ContextBlockId) - copy(dAtA[i:], m.ContextBlockId) - i = encodeVarintCommands(dAtA, i, uint64(len(m.ContextBlockId))) - i-- - dAtA[i] = 0x12 - } - if len(m.Id) > 0 { - i -= len(m.Id) - copy(dAtA[i:], m.Id) - i = encodeVarintCommands(dAtA, i, uint64(len(m.Id))) + if len(m.BlockId) > 0 { + i -= len(m.BlockId) + copy(dAtA[i:], m.BlockId) + i = encodeVarintCommands(dAtA, i, uint64(len(m.BlockId))) i-- dAtA[i] = 0xa } @@ -5974,11 +5958,7 @@ func (m *RpcBlockHistoryMoveRequest) Size() (n int) { } var l int _ = l - l = len(m.Id) - if l > 0 { - n += 1 + l + sovCommands(uint64(l)) - } - l = len(m.ContextBlockId) + l = len(m.BlockId) if l > 0 { n += 1 + l + sovCommands(uint64(l)) } @@ -7076,7 +7056,7 @@ func (m *RpcBlockHistoryMoveRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BlockId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7104,41 +7084,9 @@ func (m *RpcBlockHistoryMoveRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Id = string(dAtA[iNdEx:postIndex]) + m.BlockId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ContextBlockId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCommands - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCommands - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCommands - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ContextBlockId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field MoveForward", wireType) } diff --git a/pb/protos/commands.proto b/pb/protos/commands.proto index 5b1730236..44ca416b4 100644 --- a/pb/protos/commands.proto +++ b/pb/protos/commands.proto @@ -10,9 +10,8 @@ message Rpc { message History { message Move { message Request { - string id = 1; - string contextBlockId = 2; - bool moveForward = 3; + string blockId = 1; + bool moveForward = 2; } message Response {