From 62aa3d3d90d222fcc653318aa7b9b894bdd6b0cf Mon Sep 17 00:00:00 2001 From: Junlin Gao Date: Fri, 22 Nov 2019 17:54:04 -0800 Subject: [PATCH 1/4] add preparer in the filestorestatus and contract in case somebody should represent renter to upload file --- protos/guard/guard.proto | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/protos/guard/guard.proto b/protos/guard/guard.proto index 7f625ed..a749013 100644 --- a/protos/guard/guard.proto +++ b/protos/guard/guard.proto @@ -76,8 +76,9 @@ message Contract { SIGNED = 1; // the escrow service received the money from renter, the contract was start. UPLOADED = 2; //the first challenge was done, which means the shard was in the host, all pending payouts can be issued now LOST = 3; // the challenge failed, the following payout should be hold or even stopped - CANCELED = 4; //if the shard was rebuild after LOST, or after some days of NOQUESTION, it go to CANCELED status + CANCELED = 4; //if the shard was rebuild after LOST, or after some days of NO QUESTION, it go to CANCELED status CLOSED = 5; // the all work in such contract was done + RENEWED = 6; // the contract got renewed } ContractState state = 2; bytes renter_signature = 3; //renter’s signature for the sub contract @@ -93,6 +94,8 @@ message Contract { (gogoproto.stdtime) = true ]; bytes guard_signature = 9; + string preparer_pid = 10; //while the contract got renewed, some stakeholder take renter's place to prepare such contract + bytes preparer_signature = 11; } message FileStoreMeta { @@ -127,10 +130,11 @@ message FileStoreStatus { PARTIAL_LOST = 3; //some shards were lost, but the whole file is safe LOST = 4; //some shards were lost and the whole file cannot be recovered now DONE = 5; //all contracts were done + CANCELED = 6; //reserved for the cancel contract } MetaState state = 2; repeated Contract contracts = 3; - bytes renter_signature = 4; //renter's signature for FileStoreMeta and all contractMeta + bytes renter_signature = 4; //rental's signature for the first full file status with contracts google.protobuf.Timestamp guard_receive_time = 5 [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true @@ -141,6 +145,15 @@ message FileStoreStatus { (gogoproto.stdtime) = true ]; //the time for generate the status bytes guard_signature = 8; + enum RentalState { + NEW = 0; //the rental was first initialized + PARTIAL_NEW = 1; //part of the file status was new, indicate that some contracts were rebuild + EXPIRED = 2; //the file rental was expired, indicate that all shards can be removed from host + RENEW = 3; //the contract got renewed + } + RentalState rental_state = 9; + string preparer_pid = 10; //the stakeholder who prepared such file, if the file is NEW state, the preparer is rental + bytes preparer_signature = 11; //preparer's signature for FileStoreMeta } message ChallengeQuestion { From a3541f1992160067e5af9754fb8db6f9702904f2 Mon Sep 17 00:00:00 2001 From: Junlin Gao Date: Mon, 25 Nov 2019 15:00:44 -0800 Subject: [PATCH 2/4] Add change to guard.pb.go --- Makefile | 1 + protos/guard/guard.pb.go | 525 ++++++++++++++++++++++++++++++--------- 2 files changed, 407 insertions(+), 119 deletions(-) diff --git a/Makefile b/Makefile index d51e8a8..03fbb3b 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ TEST_RD_URL="redis://$(TEST_RD_USER)@$(TEST_RD_HOSTNAME):6379/$(TEST_RD_NAME)" PG_FIX_CANDIDATES=./protos/node/node.pb.go \ ./protos/status/status.pb.go \ ./protos/escrow/escrow.pb.go \ + ./protos/guard/guard.pb.go \ install: brew trongogo diff --git a/protos/guard/guard.pb.go b/protos/guard/guard.pb.go index 932c33a..cdc47df 100644 --- a/protos/guard/guard.pb.go +++ b/protos/guard/guard.pb.go @@ -101,6 +101,7 @@ const ( Contract_LOST Contract_ContractState = 3 Contract_CANCELED Contract_ContractState = 4 Contract_CLOSED Contract_ContractState = 5 + Contract_RENEWED Contract_ContractState = 6 ) var Contract_ContractState_name = map[int32]string{ @@ -110,6 +111,7 @@ var Contract_ContractState_name = map[int32]string{ 3: "LOST", 4: "CANCELED", 5: "CLOSED", + 6: "RENEWED", } var Contract_ContractState_value = map[string]int32{ @@ -119,6 +121,7 @@ var Contract_ContractState_value = map[string]int32{ "LOST": 3, "CANCELED": 4, "CLOSED": 5, + "RENEWED": 6, } func (x Contract_ContractState) String() string { @@ -138,6 +141,7 @@ const ( FileStoreStatus_PARTIAL_LOST FileStoreStatus_MetaState = 3 FileStoreStatus_LOST FileStoreStatus_MetaState = 4 FileStoreStatus_DONE FileStoreStatus_MetaState = 5 + FileStoreStatus_CANCELED FileStoreStatus_MetaState = 6 ) var FileStoreStatus_MetaState_name = map[int32]string{ @@ -147,6 +151,7 @@ var FileStoreStatus_MetaState_name = map[int32]string{ 3: "PARTIAL_LOST", 4: "LOST", 5: "DONE", + 6: "CANCELED", } var FileStoreStatus_MetaState_value = map[string]int32{ @@ -156,6 +161,7 @@ var FileStoreStatus_MetaState_value = map[string]int32{ "PARTIAL_LOST": 3, "LOST": 4, "DONE": 5, + "CANCELED": 6, } func (x FileStoreStatus_MetaState) String() string { @@ -166,6 +172,37 @@ func (FileStoreStatus_MetaState) EnumDescriptor() ([]byte, []int) { return fileDescriptor_ad5b6eccdc9ebee8, []int{4, 0} } +type FileStoreStatus_RentalState int32 + +const ( + FileStoreStatus_NEW FileStoreStatus_RentalState = 0 + FileStoreStatus_PARTIAL_NEW FileStoreStatus_RentalState = 1 + FileStoreStatus_EXPIRED FileStoreStatus_RentalState = 2 + FileStoreStatus_RENEW FileStoreStatus_RentalState = 3 +) + +var FileStoreStatus_RentalState_name = map[int32]string{ + 0: "NEW", + 1: "PARTIAL_NEW", + 2: "EXPIRED", + 3: "RENEW", +} + +var FileStoreStatus_RentalState_value = map[string]int32{ + "NEW": 0, + "PARTIAL_NEW": 1, + "EXPIRED": 2, + "RENEW": 3, +} + +func (x FileStoreStatus_RentalState) String() string { + return proto.EnumName(FileStoreStatus_RentalState_name, int32(x)) +} + +func (FileStoreStatus_RentalState) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_ad5b6eccdc9ebee8, []int{4, 1} +} + type Log struct { ChangeTime *types.Timestamp `protobuf:"bytes,1,opt,name=change_time,json=changeTime,proto3" json:"change_time,omitempty" pg:"change_time"` OriginatorPid string `protobuf:"bytes,2,opt,name=originator_pid,json=originatorPid,proto3" json:"originator_pid,omitempty" pg:"originator_pid"` @@ -422,6 +459,8 @@ type Contract struct { ChangeLog []*Log `protobuf:"bytes,7,rep,name=change_log,json=changeLog,proto3" json:"change_log,omitempty" pg:"change_log"` LastModifyTime time.Time `protobuf:"bytes,8,opt,name=last_modify_time,json=lastModifyTime,proto3,stdtime" json:"last_modify_time" pg:"last_modify_time"` GuardSignature []byte `protobuf:"bytes,9,opt,name=guard_signature,json=guardSignature,proto3" json:"guard_signature,omitempty" pg:"guard_signature"` + PreparerPid string `protobuf:"bytes,10,opt,name=preparer_pid,json=preparerPid,proto3" json:"preparer_pid,omitempty" pg:"preparer_pid"` + PreparerSignature []byte `protobuf:"bytes,11,opt,name=preparer_signature,json=preparerSignature,proto3" json:"preparer_signature,omitempty" pg:"preparer_signature"` XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` XXX_unrecognized []byte `json:"-" pg:"-"` XXX_sizecache int32 `json:"-" pg:"-"` @@ -523,6 +562,20 @@ func (m *Contract) GetGuardSignature() []byte { return nil } +func (m *Contract) GetPreparerPid() string { + if m != nil { + return m.PreparerPid + } + return "" +} + +func (m *Contract) GetPreparerSignature() []byte { + if m != nil { + return m.PreparerSignature + } + return nil +} + func (*Contract) XXX_MessageName() string { return "guard.Contract" } @@ -676,17 +729,20 @@ func (*FileStoreMeta) XXX_MessageName() string { } type FileStoreStatus struct { - FileStoreMeta *FileStoreMeta `protobuf:"bytes,1,opt,name=file_store_meta,json=fileStoreMeta,proto3" json:"file_store_meta,omitempty" pg:"file_store_meta"` - State FileStoreStatus_MetaState `protobuf:"varint,2,opt,name=state,proto3,enum=guard.FileStoreStatus_MetaState" json:"state,omitempty" pg:"state"` - Contracts []*Contract `protobuf:"bytes,3,rep,name=contracts,proto3" json:"contracts,omitempty" pg:"contracts"` - RenterSignature []byte `protobuf:"bytes,4,opt,name=renter_signature,json=renterSignature,proto3" json:"renter_signature,omitempty" pg:"renter_signature"` - GuardReceiveTime time.Time `protobuf:"bytes,5,opt,name=guard_receive_time,json=guardReceiveTime,proto3,stdtime" json:"guard_receive_time" pg:"guard_receive_time"` - ChangeLog []*Log `protobuf:"bytes,6,rep,name=change_log,json=changeLog,proto3" json:"change_log,omitempty" pg:"change_log"` - CurrentTime time.Time `protobuf:"bytes,7,opt,name=current_time,json=currentTime,proto3,stdtime" json:"current_time" pg:"current_time"` - GuardSignature []byte `protobuf:"bytes,8,opt,name=guard_signature,json=guardSignature,proto3" json:"guard_signature,omitempty" pg:"guard_signature"` - XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` - XXX_unrecognized []byte `json:"-" pg:"-"` - XXX_sizecache int32 `json:"-" pg:"-"` + FileStoreMeta *FileStoreMeta `protobuf:"bytes,1,opt,name=file_store_meta,json=fileStoreMeta,proto3" json:"file_store_meta,omitempty" pg:"file_store_meta"` + State FileStoreStatus_MetaState `protobuf:"varint,2,opt,name=state,proto3,enum=guard.FileStoreStatus_MetaState" json:"state,omitempty" pg:"state"` + Contracts []*Contract `protobuf:"bytes,3,rep,name=contracts,proto3" json:"contracts,omitempty" pg:"contracts"` + RenterSignature []byte `protobuf:"bytes,4,opt,name=renter_signature,json=renterSignature,proto3" json:"renter_signature,omitempty" pg:"renter_signature"` + GuardReceiveTime time.Time `protobuf:"bytes,5,opt,name=guard_receive_time,json=guardReceiveTime,proto3,stdtime" json:"guard_receive_time" pg:"guard_receive_time"` + ChangeLog []*Log `protobuf:"bytes,6,rep,name=change_log,json=changeLog,proto3" json:"change_log,omitempty" pg:"change_log"` + CurrentTime time.Time `protobuf:"bytes,7,opt,name=current_time,json=currentTime,proto3,stdtime" json:"current_time" pg:"current_time"` + GuardSignature []byte `protobuf:"bytes,8,opt,name=guard_signature,json=guardSignature,proto3" json:"guard_signature,omitempty" pg:"guard_signature"` + RentalState FileStoreStatus_RentalState `protobuf:"varint,9,opt,name=rental_state,json=rentalState,proto3,enum=guard.FileStoreStatus_RentalState" json:"rental_state,omitempty" pg:"rental_state"` + PreparerPid string `protobuf:"bytes,10,opt,name=preparer_pid,json=preparerPid,proto3" json:"preparer_pid,omitempty" pg:"preparer_pid"` + PreparerSignature []byte `protobuf:"bytes,11,opt,name=preparer_signature,json=preparerSignature,proto3" json:"preparer_signature,omitempty" pg:"preparer_signature"` + XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` + XXX_unrecognized []byte `json:"-" pg:"-"` + XXX_sizecache int32 `json:"-" pg:"-"` } func (m *FileStoreStatus) Reset() { *m = FileStoreStatus{} } @@ -778,6 +834,27 @@ func (m *FileStoreStatus) GetGuardSignature() []byte { return nil } +func (m *FileStoreStatus) GetRentalState() FileStoreStatus_RentalState { + if m != nil { + return m.RentalState + } + return FileStoreStatus_NEW +} + +func (m *FileStoreStatus) GetPreparerPid() string { + if m != nil { + return m.PreparerPid + } + return "" +} + +func (m *FileStoreStatus) GetPreparerSignature() []byte { + if m != nil { + return m.PreparerSignature + } + return nil +} + func (*FileStoreStatus) XXX_MessageName() string { return "guard.FileStoreStatus" } @@ -1280,6 +1357,8 @@ func init() { golang_proto.RegisterEnum("guard.Contract_ContractState", Contract_ContractState_name, Contract_ContractState_value) proto.RegisterEnum("guard.FileStoreStatus_MetaState", FileStoreStatus_MetaState_name, FileStoreStatus_MetaState_value) golang_proto.RegisterEnum("guard.FileStoreStatus_MetaState", FileStoreStatus_MetaState_name, FileStoreStatus_MetaState_value) + proto.RegisterEnum("guard.FileStoreStatus_RentalState", FileStoreStatus_RentalState_name, FileStoreStatus_RentalState_value) + golang_proto.RegisterEnum("guard.FileStoreStatus_RentalState", FileStoreStatus_RentalState_name, FileStoreStatus_RentalState_value) proto.RegisterType((*Log)(nil), "guard.Log") golang_proto.RegisterType((*Log)(nil), "guard.Log") proto.RegisterType((*ContractMeta)(nil), "guard.ContractMeta") @@ -1308,114 +1387,119 @@ func init() { proto.RegisterFile("protos/guard/guard.proto", fileDescriptor_ad5b func init() { golang_proto.RegisterFile("protos/guard/guard.proto", fileDescriptor_ad5b6eccdc9ebee8) } var fileDescriptor_ad5b6eccdc9ebee8 = []byte{ - // 1700 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x4f, 0x6f, 0xdb, 0xc8, - 0x15, 0x0f, 0x25, 0xd1, 0x16, 0x9f, 0x44, 0x89, 0x99, 0x4d, 0x53, 0xc6, 0xdd, 0x38, 0xae, 0x16, - 0x69, 0x9c, 0x16, 0x91, 0x0b, 0xef, 0x62, 0x2f, 0x4d, 0x51, 0x28, 0x92, 0xec, 0xb8, 0x95, 0x25, - 0xef, 0x50, 0x06, 0x9a, 0x5e, 0x08, 0x9a, 0x1a, 0x49, 0xc4, 0x4a, 0xa4, 0x96, 0x7f, 0xb2, 0x9b, - 0x3d, 0x14, 0x28, 0xd0, 0x0f, 0xd0, 0x53, 0xd1, 0xaf, 0xb0, 0x40, 0xbf, 0x43, 0x7b, 0xcc, 0xad, - 0xbd, 0x17, 0x68, 0x8b, 0xe4, 0x4b, 0xf4, 0x58, 0xcc, 0x9b, 0xa1, 0x28, 0x32, 0x76, 0x16, 0xda, - 0xbd, 0x04, 0x9e, 0xdf, 0xfb, 0x3d, 0xce, 0x9b, 0xf7, 0xe7, 0x37, 0xa3, 0x80, 0xb9, 0x0a, 0x83, - 0x38, 0x88, 0x8e, 0x66, 0x89, 0x13, 0x4e, 0xc4, 0xbf, 0x6d, 0x84, 0x88, 0x8a, 0x8b, 0xbd, 0x9f, - 0xcf, 0xbc, 0x78, 0x9e, 0x5c, 0xb5, 0xdd, 0x60, 0x79, 0x14, 0x87, 0x81, 0xff, 0x24, 0x89, 0x8e, - 0x90, 0x70, 0x95, 0x4c, 0x8f, 0x66, 0xc1, 0x2c, 0xc0, 0x05, 0xfe, 0x25, 0x1c, 0xf7, 0x1e, 0xcc, - 0x82, 0x60, 0xb6, 0x60, 0x19, 0x2b, 0xf6, 0x96, 0x2c, 0x8a, 0x9d, 0xe5, 0x4a, 0x10, 0x5a, 0x7f, - 0x50, 0xa0, 0x3c, 0x08, 0x66, 0xe4, 0x17, 0x50, 0x73, 0xe7, 0x8e, 0x3f, 0x63, 0x36, 0x67, 0x98, - 0xca, 0x81, 0x72, 0x58, 0x3b, 0xde, 0x6b, 0x0b, 0xf7, 0x76, 0xea, 0xde, 0x1e, 0xa7, 0xee, 0x14, - 0x04, 0x9d, 0x03, 0xe4, 0x21, 0x34, 0x82, 0xd0, 0x9b, 0x79, 0xbe, 0x13, 0x07, 0xa1, 0xbd, 0xf2, - 0x26, 0x66, 0xe9, 0x40, 0x39, 0xd4, 0xa8, 0x9e, 0xa1, 0x17, 0xde, 0x84, 0xdc, 0x85, 0x1d, 0xe1, - 0x64, 0x96, 0xd1, 0x2c, 0x57, 0xad, 0x6f, 0x54, 0xa8, 0x77, 0x03, 0x3f, 0x0e, 0x1d, 0x37, 0x3e, - 0x67, 0xb1, 0x43, 0x1e, 0x40, 0xcd, 0x95, 0x6b, 0xdb, 0x9b, 0x60, 0x30, 0x1a, 0x85, 0x14, 0x3a, - 0x9b, 0x90, 0xfb, 0x00, 0x21, 0xf3, 0x63, 0xb6, 0xb9, 0x99, 0x26, 0x10, 0xbe, 0xd1, 0x3d, 0xa8, - 0xce, 0x83, 0x28, 0x46, 0xa3, 0xd8, 0x6a, 0x97, 0xaf, 0xb9, 0xe9, 0x3e, 0x40, 0x34, 0x77, 0xc2, - 0x89, 0x3d, 0x77, 0xa2, 0xb9, 0x59, 0x11, 0x9e, 0x88, 0x3c, 0x77, 0xa2, 0x39, 0xdf, 0x59, 0x98, - 0x3d, 0x7f, 0xc2, 0xbe, 0x32, 0xd5, 0x03, 0xe5, 0x50, 0xa5, 0xc2, 0xe3, 0x8c, 0x23, 0xe4, 0x27, - 0xd0, 0x14, 0x84, 0xa9, 0xb7, 0x60, 0x76, 0xe4, 0x7d, 0xcd, 0xcc, 0x9d, 0x03, 0xe5, 0xb0, 0x4c, - 0x75, 0x84, 0x4f, 0xbc, 0x05, 0xb3, 0xbc, 0xaf, 0x19, 0xf9, 0x11, 0x68, 0xc8, 0xc0, 0x6d, 0x76, - 0x71, 0x9b, 0x2a, 0x07, 0x70, 0x97, 0xae, 0x08, 0xdf, 0x8e, 0x62, 0x27, 0x8c, 0xcd, 0xea, 0xb7, - 0xe5, 0xfa, 0x59, 0xf5, 0xf5, 0xbf, 0x1f, 0xdc, 0xfa, 0xd3, 0x7f, 0x1e, 0x28, 0xe2, 0x90, 0x16, - 0x77, 0x23, 0xbf, 0x82, 0x2a, 0x7e, 0x84, 0xf9, 0x13, 0x53, 0xdb, 0xe2, 0x13, 0xbb, 0xdc, 0xab, - 0xef, 0x4f, 0x78, 0x88, 0xd8, 0x56, 0x98, 0x26, 0x10, 0x21, 0x22, 0x20, 0xf3, 0xc4, 0x22, 0x37, - 0x0c, 0xbe, 0x44, 0x6b, 0x4d, 0xe4, 0x49, 0x20, 0xdc, 0x7c, 0x07, 0xd4, 0x55, 0xe8, 0xb9, 0xcc, - 0xac, 0xe3, 0xe1, 0xc5, 0x82, 0x17, 0xd8, 0x59, 0x06, 0x89, 0x1f, 0x9b, 0x3a, 0xc2, 0x72, 0x45, - 0x7e, 0x06, 0xb7, 0xdd, 0x60, 0xb1, 0x70, 0x62, 0x16, 0x3a, 0x0b, 0x5b, 0x52, 0x1a, 0x48, 0x31, - 0x32, 0x43, 0x47, 0x90, 0xfb, 0xd0, 0x5c, 0x39, 0xaf, 0x82, 0x24, 0xb6, 0x23, 0x77, 0xce, 0x26, - 0xc9, 0x82, 0x99, 0xcd, 0x03, 0xe5, 0xb0, 0x71, 0xfc, 0x61, 0x5b, 0x8c, 0xc4, 0x66, 0xab, 0xb4, - 0x2d, 0xc9, 0xa1, 0x0d, 0xe1, 0x94, 0xae, 0x79, 0x25, 0xfd, 0x64, 0x69, 0x0b, 0x34, 0x32, 0x0d, - 0x51, 0x49, 0x3f, 0x59, 0x5e, 0x08, 0xa4, 0xf5, 0x09, 0x54, 0xd7, 0xe4, 0x1a, 0xec, 0x9e, 0x8f, - 0x86, 0xe3, 0xe7, 0x83, 0x17, 0xc6, 0x2d, 0xa2, 0x83, 0xf6, 0xd9, 0x65, 0x87, 0x8e, 0xfb, 0x74, - 0xf0, 0xc2, 0x50, 0x48, 0x1d, 0xaa, 0x9d, 0xe1, 0xf0, 0xb2, 0x33, 0x18, 0xbc, 0x30, 0x4a, 0xad, - 0xbf, 0x55, 0xa0, 0x9a, 0x06, 0x40, 0x8e, 0xa0, 0x9a, 0x36, 0xa5, 0x9c, 0x98, 0x0f, 0xae, 0x89, - 0x91, 0xae, 0x49, 0xe4, 0x63, 0x50, 0xa3, 0xd8, 0x89, 0x19, 0xb6, 0x6c, 0xe3, 0xf8, 0x7e, 0x81, - 0xbd, 0xfe, 0xc3, 0xe2, 0x24, 0x2a, 0xb8, 0xe4, 0x31, 0x18, 0xb2, 0xd9, 0x23, 0x6f, 0xe6, 0x3b, - 0x71, 0x12, 0x8a, 0x01, 0xaa, 0xd3, 0xa6, 0xc0, 0xad, 0x14, 0xe6, 0x83, 0x88, 0x8d, 0x9f, 0x11, - 0x2b, 0x48, 0xd4, 0x39, 0x9a, 0xd1, 0x28, 0x10, 0x59, 0x5c, 0x4e, 0x64, 0x13, 0x31, 0xf3, 0xea, - 0x16, 0x4d, 0x64, 0x08, 0x7f, 0x0b, 0xdd, 0x51, 0x03, 0x1e, 0x83, 0xb1, 0xf1, 0x4d, 0xb1, 0xf9, - 0x8e, 0x88, 0x32, 0xe3, 0x8a, 0xed, 0x1f, 0x83, 0x14, 0x0f, 0x7b, 0x11, 0xcc, 0xcc, 0xdd, 0x83, - 0xf2, 0x61, 0xed, 0x18, 0x64, 0x2a, 0x06, 0xc1, 0x8c, 0x6a, 0xc2, 0xca, 0x65, 0x69, 0x08, 0xc6, - 0xc2, 0x89, 0x62, 0x7b, 0x19, 0x4c, 0xbc, 0xe9, 0x2b, 0x11, 0xe7, 0x36, 0xf3, 0xd2, 0xe0, 0xde, - 0xe7, 0xe8, 0x8c, 0x51, 0x3e, 0x82, 0xa6, 0xe8, 0xf9, 0x2c, 0x48, 0x0d, 0x83, 0x6c, 0x20, 0xbc, - 0x8e, 0xb1, 0xf5, 0x5b, 0xd0, 0x73, 0xc5, 0x20, 0x1a, 0xa8, 0x3d, 0xda, 0x39, 0x19, 0x1b, 0xb7, - 0x08, 0xc0, 0x8e, 0x75, 0x76, 0x3a, 0xec, 0xf7, 0x44, 0x77, 0x5c, 0x5e, 0x0c, 0x46, 0x9d, 0x5e, - 0xbf, 0x67, 0x94, 0x48, 0x15, 0x2a, 0x83, 0x91, 0x35, 0x36, 0xca, 0x1c, 0xef, 0x76, 0x86, 0xdd, - 0xfe, 0xa0, 0xdf, 0x33, 0x2a, 0xdc, 0xa3, 0x3b, 0x18, 0x59, 0xfd, 0x9e, 0xa1, 0xb6, 0xfe, 0x58, - 0x01, 0x1d, 0x65, 0x22, 0x0e, 0x42, 0x86, 0x72, 0x97, 0x57, 0x33, 0xa5, 0xa8, 0x66, 0x39, 0x29, - 0x29, 0x15, 0xa4, 0x24, 0x35, 0xa2, 0x12, 0x95, 0x71, 0xa4, 0xd0, 0x88, 0x22, 0x94, 0xd7, 0x99, - 0xca, 0xf7, 0xd7, 0x19, 0xf5, 0xbb, 0xe8, 0xcc, 0x23, 0x68, 0xba, 0x73, 0xe6, 0x7e, 0x6e, 0x4f, - 0x43, 0xf6, 0x45, 0xc2, 0x7c, 0xf7, 0x15, 0x36, 0x86, 0x4a, 0x1b, 0x08, 0x9f, 0xa4, 0x68, 0x26, - 0x48, 0x53, 0xc6, 0x50, 0x33, 0xcb, 0x52, 0x90, 0x4e, 0x18, 0xdb, 0x10, 0x24, 0x6e, 0xad, 0xa2, - 0x55, 0x0a, 0x12, 0x37, 0xaf, 0x85, 0xdb, 0x45, 0x71, 0xd1, 0x36, 0x84, 0xbb, 0x8b, 0xb2, 0xf2, - 0x10, 0x1a, 0x4b, 0xcf, 0xf7, 0x96, 0xc9, 0xd2, 0x46, 0x34, 0x42, 0xc9, 0x53, 0xa9, 0x2e, 0x51, - 0x0b, 0x41, 0x2e, 0x55, 0x21, 0x73, 0x83, 0x97, 0x2c, 0xb4, 0xe3, 0x79, 0xc8, 0xa2, 0x79, 0xb0, - 0x10, 0xf2, 0xa7, 0x52, 0x43, 0x1a, 0xc6, 0x29, 0x5e, 0x10, 0xc9, 0x7a, 0x51, 0x24, 0x73, 0x02, - 0xab, 0xe7, 0x05, 0xb6, 0xf5, 0xd7, 0x0a, 0x34, 0xd7, 0x6d, 0xc0, 0x5b, 0x2c, 0x89, 0xc8, 0x53, - 0x68, 0x8a, 0x62, 0x72, 0xcc, 0x5e, 0xb2, 0xd8, 0x91, 0xb2, 0x72, 0x47, 0x4e, 0x47, 0xae, 0x6f, - 0xa8, 0x3e, 0xcd, 0xb5, 0xd1, 0xa7, 0x79, 0x71, 0x39, 0x28, 0xfa, 0x88, 0x4d, 0xda, 0x9c, 0x9b, - 0xd3, 0x97, 0x27, 0xa0, 0xa5, 0x02, 0x15, 0x99, 0x65, 0x9c, 0xc6, 0x66, 0x41, 0x98, 0x68, 0xc6, - 0xb8, 0x56, 0x8e, 0x2a, 0xd7, 0xcb, 0x11, 0x05, 0x22, 0x12, 0x10, 0x32, 0x97, 0x79, 0x2f, 0xd9, - 0x77, 0xd0, 0x19, 0xf4, 0xa7, 0xc2, 0x5d, 0xea, 0xcc, 0xa6, 0x78, 0xec, 0xbc, 0x4f, 0x3c, 0x4e, - 0xa1, 0xee, 0x26, 0x21, 0x36, 0x2f, 0x6e, 0xbc, 0xbb, 0xc5, 0xc6, 0x35, 0xe9, 0x79, 0x93, 0x6a, - 0x54, 0x6f, 0x50, 0x0d, 0x6d, 0x9d, 0xde, 0x4d, 0xc5, 0xd0, 0x41, 0x13, 0x2a, 0x71, 0x36, 0x3c, - 0x35, 0x14, 0x7e, 0xdd, 0xd0, 0xcb, 0xe1, 0x90, 0x2f, 0x4a, 0xc4, 0x80, 0xfa, 0x45, 0x87, 0x8e, - 0xcf, 0x3a, 0x03, 0x5b, 0x6a, 0x47, 0xaa, 0x22, 0x15, 0xfe, 0x57, 0x6f, 0x34, 0xec, 0x1b, 0x6a, - 0xeb, 0x1b, 0x05, 0x6e, 0x77, 0xe7, 0xce, 0x62, 0xc1, 0xfc, 0x19, 0xfb, 0x2c, 0x61, 0x51, 0xec, - 0x05, 0x7e, 0xe1, 0x35, 0xa3, 0x14, 0x5f, 0x33, 0x9b, 0xef, 0xa0, 0x52, 0xfe, 0x1d, 0xc4, 0x9f, - 0x58, 0xf3, 0xc4, 0xff, 0x5c, 0x3e, 0x74, 0xca, 0x62, 0x5e, 0x10, 0x12, 0x0f, 0x9d, 0x3b, 0xa0, - 0xfa, 0x81, 0xef, 0x32, 0xf9, 0x46, 0x12, 0x0b, 0xf2, 0x11, 0xe8, 0xec, 0xab, 0x15, 0x73, 0x63, - 0xdb, 0xf1, 0xa3, 0x2f, 0x59, 0x88, 0xc5, 0xd4, 0x68, 0x5d, 0x80, 0x1d, 0xc4, 0x5a, 0xff, 0x2b, - 0xc1, 0xbd, 0x8b, 0x30, 0x08, 0xa6, 0xa3, 0x29, 0x65, 0xab, 0x85, 0xe7, 0x3a, 0x31, 0x5b, 0xc7, - 0x4e, 0x3e, 0x81, 0xea, 0x17, 0x32, 0x7e, 0xd9, 0xdd, 0x66, 0xda, 0x6d, 0xc5, 0xf3, 0xd1, 0x35, - 0x93, 0xfc, 0x06, 0x1a, 0x6e, 0x6a, 0x16, 0xd5, 0x2c, 0x6d, 0x51, 0x4d, 0x7d, 0xed, 0x8b, 0xf5, - 0xcc, 0x0d, 0x66, 0xb9, 0xf0, 0xf2, 0xb9, 0xa6, 0xd8, 0x95, 0xeb, 0x8a, 0xcd, 0x53, 0x88, 0xd9, - 0xcd, 0x65, 0x02, 0x38, 0x24, 0xf2, 0x40, 0x7e, 0xbd, 0x71, 0x1b, 0x8b, 0x98, 0x77, 0xb6, 0x88, - 0xb9, 0x9e, 0xde, 0xd9, 0xe9, 0x13, 0xbb, 0x70, 0xb3, 0xef, 0x5e, 0x73, 0xb3, 0xb7, 0x7e, 0x0f, - 0x77, 0xf9, 0xbc, 0xbf, 0x93, 0xc9, 0x28, 0x7f, 0x8b, 0x28, 0x85, 0x5b, 0xe4, 0x34, 0x7d, 0xd5, - 0xa6, 0xf9, 0x8e, 0xcc, 0x12, 0x4e, 0xd6, 0xbe, 0x2c, 0x0d, 0xaa, 0xe3, 0xbb, 0x5f, 0xa5, 0x0d, - 0x74, 0x5b, 0xaf, 0x5b, 0xff, 0x28, 0xc1, 0x0f, 0x6f, 0xe0, 0xbe, 0x3f, 0x82, 0x7c, 0x27, 0x97, - 0x8a, 0x9d, 0xfc, 0x63, 0xa8, 0xaf, 0x42, 0xb6, 0x72, 0x42, 0x79, 0x49, 0x8a, 0xa2, 0xd5, 0x52, - 0x8c, 0xd7, 0xed, 0x21, 0x34, 0xd2, 0xe8, 0xe5, 0x25, 0x50, 0x11, 0x02, 0x9f, 0xa2, 0xe2, 0x1e, - 0xf8, 0x14, 0xb4, 0xec, 0x90, 0x2a, 0x1e, 0xf2, 0xe6, 0xfe, 0xcb, 0xa8, 0x5c, 0x4c, 0xe4, 0x6e, - 0xdb, 0x97, 0x32, 0x8d, 0x13, 0x2b, 0xf9, 0x04, 0xc8, 0xfa, 0x28, 0xc5, 0x6a, 0xde, 0x4e, 0x2d, - 0x59, 0x45, 0xdf, 0x2a, 0x70, 0xaf, 0x8b, 0xf7, 0x64, 0x4e, 0xfb, 0x19, 0x46, 0xf6, 0xad, 0x39, - 0x7d, 0xdf, 0xaf, 0xa4, 0x8f, 0x40, 0x0f, 0xc5, 0x67, 0x72, 0x49, 0xad, 0xaf, 0x41, 0x4e, 0x3a, - 0x85, 0x74, 0x2d, 0x8e, 0xbd, 0xcd, 0x23, 0xa2, 0x26, 0x3d, 0xf1, 0xd8, 0x1f, 0x82, 0x96, 0x9d, - 0x56, 0xc5, 0xd3, 0x66, 0x40, 0xeb, 0xcf, 0x0a, 0xec, 0x50, 0x16, 0x25, 0x8b, 0x98, 0x3c, 0x82, - 0x8a, 0x1b, 0x4c, 0xc4, 0x4f, 0xd0, 0xc6, 0xfa, 0x41, 0x4d, 0x59, 0xb4, 0x0a, 0xfc, 0x88, 0x75, - 0x83, 0x09, 0xa3, 0x48, 0x20, 0x26, 0xec, 0x2e, 0x59, 0x14, 0x39, 0x33, 0x96, 0x8a, 0x9b, 0x5c, - 0x92, 0x33, 0x7e, 0x32, 0xc1, 0x17, 0x51, 0x97, 0xb7, 0x99, 0xbb, 0xd4, 0x95, 0x1b, 0x7f, 0xea, - 0x42, 0x7d, 0x73, 0x6b, 0x2e, 0xdd, 0xd6, 0x65, 0xb7, 0xdb, 0xb7, 0x2c, 0xe3, 0x16, 0xd9, 0x83, - 0xbb, 0xfc, 0x21, 0xd8, 0x19, 0x5f, 0xd2, 0xbe, 0x7d, 0x32, 0xa2, 0xe7, 0x9d, 0xb1, 0xdd, 0xa7, - 0x74, 0x44, 0x0d, 0x85, 0xdc, 0x83, 0x1f, 0x74, 0x47, 0xe7, 0x17, 0x97, 0xe3, 0xbe, 0xdd, 0xe9, - 0xf5, 0x68, 0xdf, 0xb2, 0xa4, 0xa9, 0x44, 0x9a, 0x50, 0x1b, 0x8d, 0x9f, 0xf7, 0xa9, 0x04, 0xee, - 0x1c, 0xff, 0x4b, 0x81, 0xfa, 0x29, 0x8a, 0x0b, 0x0b, 0x5f, 0xf2, 0x1f, 0x52, 0x4f, 0xe1, 0x03, - 0x2b, 0xb9, 0x5a, 0x7a, 0x71, 0xfe, 0xa1, 0x78, 0xf7, 0xfa, 0x2b, 0x7d, 0x4f, 0xcf, 0x92, 0xc4, - 0x33, 0xf8, 0x4b, 0xd0, 0x2d, 0xe6, 0x67, 0x53, 0x49, 0xee, 0x6f, 0xf8, 0xbd, 0x3b, 0x98, 0x45, - 0xf7, 0x21, 0x90, 0x77, 0x1b, 0x8e, 0x1c, 0xac, 0x87, 0xe4, 0x86, 0x5e, 0xdc, 0xbb, 0x21, 0xba, - 0x67, 0x4f, 0x5f, 0xbf, 0xd9, 0x57, 0xfe, 0xf9, 0x66, 0x5f, 0xf9, 0xef, 0x9b, 0x7d, 0xe5, 0x2f, - 0x6f, 0xf7, 0x95, 0xbf, 0xbf, 0xdd, 0x57, 0x5e, 0xbf, 0xdd, 0x57, 0x40, 0xf7, 0x82, 0xf6, 0x55, - 0x3c, 0x8d, 0x84, 0xe3, 0x33, 0xc0, 0x1c, 0x5c, 0xf0, 0xe2, 0x5c, 0x28, 0xbf, 0x13, 0xff, 0xe7, - 0x71, 0xb5, 0x83, 0xc5, 0xfa, 0xf8, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xda, 0xd2, 0x86, 0xb9, - 0x1d, 0x11, 0x00, 0x00, + // 1788 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x8f, 0xdb, 0xc6, + 0x15, 0x5f, 0x4a, 0xa2, 0x24, 0x3e, 0xfd, 0xa3, 0x27, 0xae, 0x4b, 0x6f, 0xe3, 0xdd, 0xad, 0x02, + 0xd7, 0xeb, 0x16, 0xd6, 0x16, 0x9b, 0x20, 0x97, 0xba, 0x08, 0x64, 0x89, 0xbb, 0xde, 0x56, 0x2b, + 0x29, 0x43, 0x2d, 0x52, 0xf7, 0x42, 0x70, 0xa9, 0x91, 0x44, 0x44, 0x22, 0x15, 0xfe, 0x71, 0xe2, + 0x1c, 0x0a, 0x14, 0xe8, 0x07, 0xe8, 0xa1, 0x28, 0x7a, 0xea, 0x3d, 0xdf, 0xa2, 0x47, 0xdf, 0xda, + 0x7b, 0x81, 0xb6, 0xb0, 0xbf, 0x44, 0x8f, 0xc5, 0xbc, 0x21, 0x45, 0x51, 0xab, 0x75, 0xa0, 0x14, + 0xb9, 0x2c, 0x34, 0xbf, 0xf7, 0xde, 0xcc, 0x9b, 0xf7, 0xe7, 0x37, 0x8f, 0x0b, 0xda, 0xd2, 0xf7, + 0x42, 0x2f, 0x38, 0x99, 0x46, 0x96, 0x3f, 0x16, 0x7f, 0x5b, 0x08, 0x11, 0x19, 0x17, 0xfb, 0x3f, + 0x9f, 0x3a, 0xe1, 0x2c, 0xba, 0x6e, 0xd9, 0xde, 0xe2, 0x24, 0xf4, 0x3d, 0xf7, 0x49, 0x14, 0x9c, + 0xa0, 0xc2, 0x75, 0x34, 0x39, 0x99, 0x7a, 0x53, 0x0f, 0x17, 0xf8, 0x4b, 0x18, 0xee, 0x1f, 0x4e, + 0x3d, 0x6f, 0x3a, 0x67, 0xa9, 0x56, 0xe8, 0x2c, 0x58, 0x10, 0x5a, 0x8b, 0xa5, 0x50, 0x68, 0xfe, + 0x5e, 0x82, 0x7c, 0xcf, 0x9b, 0x92, 0x5f, 0x40, 0xc5, 0x9e, 0x59, 0xee, 0x94, 0x99, 0x5c, 0x43, + 0x93, 0x8e, 0xa4, 0xe3, 0xca, 0xe9, 0x7e, 0x4b, 0x98, 0xb7, 0x12, 0xf3, 0xd6, 0x28, 0x31, 0xa7, + 0x20, 0xd4, 0x39, 0x40, 0x1e, 0x42, 0xdd, 0xf3, 0x9d, 0xa9, 0xe3, 0x5a, 0xa1, 0xe7, 0x9b, 0x4b, + 0x67, 0xac, 0xe5, 0x8e, 0xa4, 0x63, 0x85, 0xd6, 0x52, 0x74, 0xe8, 0x8c, 0xc9, 0x3d, 0x28, 0x0a, + 0x23, 0x2d, 0x8f, 0xe2, 0x78, 0xd5, 0xfc, 0x46, 0x86, 0x6a, 0xc7, 0x73, 0x43, 0xdf, 0xb2, 0xc3, + 0x4b, 0x16, 0x5a, 0xe4, 0x10, 0x2a, 0x76, 0xbc, 0x36, 0x9d, 0x31, 0x3a, 0xa3, 0x50, 0x48, 0xa0, + 0x8b, 0x31, 0x79, 0x00, 0xe0, 0x33, 0x37, 0x64, 0xeb, 0x87, 0x29, 0x02, 0xe1, 0x07, 0xdd, 0x87, + 0xf2, 0xcc, 0x0b, 0x42, 0x14, 0x8a, 0xa3, 0x4a, 0x7c, 0xcd, 0x45, 0x0f, 0x00, 0x82, 0x99, 0xe5, + 0x8f, 0xcd, 0x99, 0x15, 0xcc, 0xb4, 0x82, 0xb0, 0x44, 0xe4, 0xb9, 0x15, 0xcc, 0xf8, 0xc9, 0x42, + 0xec, 0xb8, 0x63, 0xf6, 0x95, 0x26, 0x1f, 0x49, 0xc7, 0x32, 0x15, 0x16, 0x17, 0x1c, 0x21, 0x3f, + 0x81, 0x86, 0x50, 0x98, 0x38, 0x73, 0x66, 0x06, 0xce, 0xd7, 0x4c, 0x2b, 0x1e, 0x49, 0xc7, 0x79, + 0x5a, 0x43, 0xf8, 0xcc, 0x99, 0x33, 0xc3, 0xf9, 0x9a, 0x91, 0x1f, 0x81, 0x82, 0x1a, 0x78, 0x4c, + 0x09, 0x8f, 0x29, 0x73, 0x00, 0x4f, 0xe9, 0x08, 0xf7, 0xcd, 0x20, 0xb4, 0xfc, 0x50, 0x2b, 0x7f, + 0x5b, 0xac, 0x9f, 0x95, 0x5f, 0xff, 0xeb, 0x70, 0xef, 0x8f, 0xff, 0x3e, 0x94, 0xc4, 0x25, 0x0d, + 0x6e, 0x46, 0x3e, 0x81, 0x32, 0x6e, 0xc2, 0xdc, 0xb1, 0xa6, 0xec, 0xb0, 0x45, 0x89, 0x5b, 0xe9, + 0xee, 0x98, 0xbb, 0x88, 0x65, 0x85, 0x61, 0x02, 0xe1, 0x22, 0x02, 0x71, 0x9c, 0x58, 0x60, 0xfb, + 0xde, 0x97, 0x28, 0xad, 0x88, 0x38, 0x09, 0x84, 0x8b, 0xef, 0x82, 0xbc, 0xf4, 0x1d, 0x9b, 0x69, + 0x55, 0xbc, 0xbc, 0x58, 0xf0, 0x04, 0x5b, 0x0b, 0x2f, 0x72, 0x43, 0xad, 0x86, 0x70, 0xbc, 0x22, + 0x3f, 0x83, 0x3b, 0xb6, 0x37, 0x9f, 0x5b, 0x21, 0xf3, 0xad, 0xb9, 0x19, 0xab, 0xd4, 0x51, 0x45, + 0x4d, 0x05, 0x6d, 0xa1, 0xac, 0x43, 0x63, 0x69, 0xbd, 0xf2, 0xa2, 0xd0, 0x0c, 0xec, 0x19, 0x1b, + 0x47, 0x73, 0xa6, 0x35, 0x8e, 0xa4, 0xe3, 0xfa, 0xe9, 0xfb, 0x2d, 0xd1, 0x12, 0xeb, 0xa5, 0xd2, + 0x32, 0x62, 0x1d, 0x5a, 0x17, 0x46, 0xc9, 0x9a, 0x67, 0xd2, 0x8d, 0x16, 0xa6, 0x40, 0x03, 0x4d, + 0x15, 0x99, 0x74, 0xa3, 0xc5, 0x50, 0x20, 0xcd, 0x8f, 0xa0, 0xbc, 0x52, 0xae, 0x40, 0xe9, 0x72, + 0xd0, 0x1f, 0x3d, 0xef, 0xbd, 0x50, 0xf7, 0x48, 0x0d, 0x94, 0x4f, 0xaf, 0xda, 0x74, 0xa4, 0xd3, + 0xde, 0x0b, 0x55, 0x22, 0x55, 0x28, 0xb7, 0xfb, 0xfd, 0xab, 0x76, 0xaf, 0xf7, 0x42, 0xcd, 0x35, + 0xff, 0x2a, 0x43, 0x39, 0x71, 0x80, 0x9c, 0x40, 0x39, 0x29, 0xca, 0xb8, 0x63, 0xde, 0xdb, 0xe2, + 0x23, 0x5d, 0x29, 0x91, 0x0f, 0x41, 0x0e, 0x42, 0x2b, 0x64, 0x58, 0xb2, 0xf5, 0xd3, 0x07, 0x1b, + 0xda, 0xab, 0x1f, 0x06, 0x57, 0xa2, 0x42, 0x97, 0x3c, 0x06, 0x35, 0x2e, 0xf6, 0xc0, 0x99, 0xba, + 0x56, 0x18, 0xf9, 0xa2, 0x81, 0xaa, 0xb4, 0x21, 0x70, 0x23, 0x81, 0x79, 0x23, 0x62, 0xe1, 0xa7, + 0x8a, 0x05, 0x54, 0xac, 0x71, 0x34, 0x55, 0xa3, 0x40, 0xe2, 0xe4, 0x72, 0x45, 0x36, 0x16, 0x3d, + 0x2f, 0xef, 0x50, 0x44, 0xaa, 0xb0, 0x37, 0xd0, 0x1c, 0x39, 0xe0, 0x31, 0xa8, 0x6b, 0x7b, 0x8a, + 0xc3, 0x8b, 0xc2, 0xcb, 0x54, 0x57, 0x1c, 0xff, 0x18, 0x62, 0xf2, 0x30, 0xe7, 0xde, 0x54, 0x2b, + 0x1d, 0xe5, 0x8f, 0x2b, 0xa7, 0x10, 0x87, 0xa2, 0xe7, 0x4d, 0xa9, 0x22, 0xa4, 0x9c, 0x96, 0xfa, + 0xa0, 0xce, 0xad, 0x20, 0x34, 0x17, 0xde, 0xd8, 0x99, 0xbc, 0x12, 0x7e, 0xee, 0xd2, 0x2f, 0x75, + 0x6e, 0x7d, 0x89, 0xc6, 0xe8, 0xe5, 0x23, 0x68, 0x88, 0x9a, 0x4f, 0x9d, 0x54, 0xd0, 0xc9, 0x3a, + 0xc2, 0xa9, 0x8f, 0x3f, 0x86, 0xea, 0xd2, 0x67, 0x4b, 0xcb, 0x8f, 0x39, 0x46, 0xf4, 0x47, 0x25, + 0xc1, 0x78, 0x0f, 0x3c, 0x01, 0xb2, 0x52, 0x49, 0xb7, 0xab, 0xe0, 0x76, 0x77, 0x12, 0xc9, 0x6a, + 0xc7, 0x26, 0x83, 0x5a, 0x26, 0xbd, 0x44, 0x01, 0xb9, 0x4b, 0xdb, 0x67, 0x23, 0x75, 0x8f, 0x00, + 0x14, 0x8d, 0x8b, 0xf3, 0xbe, 0xde, 0x15, 0xf5, 0x76, 0x35, 0xec, 0x0d, 0xda, 0x5d, 0xbd, 0xab, + 0xe6, 0x48, 0x19, 0x0a, 0xbd, 0x81, 0x31, 0x52, 0xf3, 0x1c, 0xef, 0xb4, 0xfb, 0x1d, 0xbd, 0xa7, + 0x77, 0xd5, 0x02, 0xb7, 0xe8, 0xf4, 0x06, 0x86, 0xde, 0x55, 0x65, 0x5e, 0xbd, 0x54, 0xef, 0xeb, + 0x9f, 0xe9, 0x5d, 0xb5, 0xd8, 0xfc, 0x43, 0x01, 0x6a, 0xc8, 0x42, 0xa1, 0xe7, 0x33, 0x64, 0xd3, + 0x2c, 0x59, 0x4a, 0x9b, 0x64, 0x99, 0x61, 0xaa, 0xdc, 0x06, 0x53, 0x25, 0x42, 0x24, 0xba, 0x3c, + 0x76, 0x2c, 0x0a, 0x91, 0xe3, 0xb2, 0x34, 0x56, 0xf8, 0xff, 0x69, 0x4c, 0xfe, 0x2e, 0x34, 0xf6, + 0x08, 0x1a, 0xf6, 0x8c, 0xd9, 0x9f, 0x9b, 0x13, 0x9f, 0x7d, 0x11, 0x31, 0xd7, 0x7e, 0x85, 0x75, + 0x27, 0xd3, 0x3a, 0xc2, 0x67, 0x09, 0x9a, 0xf2, 0xdd, 0x84, 0x31, 0xa4, 0xe4, 0x7c, 0xcc, 0x77, + 0x67, 0x8c, 0xad, 0xf1, 0x1d, 0x97, 0x96, 0x51, 0x1a, 0xf3, 0x1d, 0x17, 0xaf, 0xde, 0x05, 0x1b, + 0xb9, 0x4b, 0x59, 0x7b, 0x17, 0x3a, 0xc8, 0x5a, 0x0f, 0xa1, 0xbe, 0x70, 0x5c, 0x67, 0x11, 0x2d, + 0x4c, 0x44, 0x03, 0xac, 0x18, 0x99, 0xd6, 0x62, 0xd4, 0x40, 0x90, 0x33, 0xa1, 0xcf, 0x6c, 0xef, + 0x25, 0xf3, 0xcd, 0x70, 0xe6, 0xb3, 0x60, 0xe6, 0xcd, 0x05, 0xbb, 0xca, 0x54, 0x8d, 0x05, 0xa3, + 0x04, 0xdf, 0xe0, 0xe0, 0xea, 0x26, 0x07, 0x67, 0xf8, 0xbb, 0x96, 0xe5, 0xef, 0xe6, 0x9f, 0x8a, + 0xd0, 0x58, 0x95, 0x01, 0xaf, 0xb7, 0x28, 0x20, 0x4f, 0xa1, 0x21, 0x92, 0xc9, 0x31, 0x73, 0xc1, + 0x42, 0x2b, 0x66, 0xad, 0xbb, 0x71, 0xf3, 0x65, 0xea, 0x86, 0xd6, 0x26, 0x99, 0x32, 0xfa, 0x38, + 0xcb, 0x5d, 0x47, 0x9b, 0x36, 0xe2, 0x90, 0x16, 0xd7, 0xcd, 0xd0, 0xd7, 0x13, 0x50, 0x12, 0xfe, + 0x0b, 0xb4, 0x3c, 0x36, 0x7b, 0x63, 0x83, 0xf7, 0x68, 0xaa, 0xb1, 0x95, 0xed, 0x0a, 0xdb, 0xd9, + 0x8e, 0x02, 0x11, 0x01, 0xf0, 0x99, 0xcd, 0x9c, 0x97, 0xec, 0x3b, 0xd0, 0x18, 0xda, 0x53, 0x61, + 0x1e, 0xd3, 0xd8, 0x3a, 0x37, 0x15, 0xdf, 0xc5, 0x4d, 0xe7, 0x50, 0xb5, 0x23, 0x1f, 0x8b, 0x17, + 0x0f, 0x2e, 0xed, 0x70, 0x70, 0x25, 0xb6, 0xbc, 0x8d, 0x94, 0xca, 0x5b, 0x49, 0x49, 0x87, 0x2a, + 0x37, 0xb2, 0xe6, 0xa6, 0xc8, 0x84, 0x82, 0x99, 0x68, 0xde, 0x92, 0x09, 0x8a, 0xaa, 0x22, 0x17, + 0x15, 0x3f, 0x5d, 0x7c, 0x0f, 0xdc, 0x36, 0x01, 0x65, 0x95, 0xf7, 0x75, 0x5e, 0xab, 0x81, 0x22, + 0xb8, 0xec, 0xa2, 0x7f, 0xae, 0x4a, 0x48, 0x54, 0x57, 0xfd, 0x3e, 0x5f, 0xe4, 0x88, 0x0a, 0xd5, + 0x61, 0x9b, 0x8e, 0x2e, 0xda, 0x3d, 0x33, 0x66, 0xb8, 0x84, 0xeb, 0x0a, 0xfc, 0x57, 0x77, 0xd0, + 0xd7, 0x55, 0x39, 0xc3, 0x7a, 0xc5, 0xe6, 0x27, 0x50, 0x59, 0xbb, 0x15, 0x29, 0x41, 0xbe, 0xaf, + 0x7f, 0xa6, 0xee, 0x91, 0x06, 0x54, 0x92, 0xbd, 0x38, 0x80, 0x27, 0xe9, 0xbf, 0x19, 0x5e, 0x50, + 0xe4, 0x50, 0x05, 0x64, 0xe4, 0x47, 0x35, 0xdf, 0xfc, 0x46, 0x82, 0x3b, 0x9d, 0x99, 0x35, 0x9f, + 0x33, 0x77, 0xca, 0x3e, 0x8d, 0x58, 0x10, 0x3a, 0x9e, 0xbb, 0x31, 0x14, 0x4a, 0x9b, 0x43, 0xe1, + 0xfa, 0x38, 0x99, 0xcb, 0x8e, 0x93, 0x7c, 0x52, 0x9d, 0x45, 0xee, 0xe7, 0xf1, 0xbc, 0x98, 0x17, + 0xbc, 0x80, 0x90, 0x98, 0x17, 0xef, 0x82, 0xec, 0x7a, 0xae, 0xcd, 0xe2, 0x51, 0x53, 0x2c, 0xc8, + 0x07, 0x50, 0x63, 0x5f, 0x2d, 0x99, 0x1d, 0x9a, 0x96, 0x1b, 0x7c, 0xc9, 0x7c, 0x2c, 0x5a, 0x85, + 0x56, 0x05, 0xd8, 0x46, 0xac, 0xf9, 0xdf, 0x1c, 0xdc, 0x1f, 0xfa, 0x9e, 0x37, 0x19, 0x4c, 0x28, + 0x5b, 0xce, 0x1d, 0xdb, 0x0a, 0xd9, 0xca, 0x77, 0xf2, 0x11, 0x94, 0xbf, 0x88, 0xfd, 0x8f, 0xbb, + 0x58, 0x4b, 0xba, 0x6a, 0xf3, 0x7e, 0x74, 0xa5, 0x49, 0x7e, 0x0d, 0x75, 0x3b, 0x11, 0x8b, 0xaa, + 0xcd, 0xed, 0x50, 0xb5, 0xb5, 0x95, 0x2d, 0xd6, 0x6d, 0x86, 0x80, 0xf2, 0x1b, 0x03, 0xe4, 0x96, + 0xa2, 0x2e, 0x6c, 0x2d, 0xea, 0x43, 0xa8, 0x60, 0x74, 0x33, 0x91, 0x00, 0x0e, 0x89, 0x38, 0x90, + 0x5f, 0xad, 0x0d, 0x35, 0xc2, 0xe7, 0xe2, 0x0e, 0x3e, 0x57, 0x93, 0xd1, 0x27, 0xf9, 0x52, 0xd9, + 0x18, 0x90, 0x4a, 0x5b, 0x06, 0xa4, 0xe6, 0xef, 0xe0, 0x1e, 0xef, 0xa6, 0x1b, 0x91, 0x0c, 0xb2, + 0xaf, 0xa5, 0xb4, 0xf1, 0x5a, 0x9e, 0x27, 0x1f, 0x07, 0x49, 0xbc, 0x03, 0x2d, 0x87, 0x0c, 0x72, + 0x10, 0xa7, 0x06, 0x5f, 0x81, 0x9b, 0xbb, 0xd2, 0x3a, 0x9a, 0xad, 0xd6, 0xcd, 0xbf, 0xe7, 0xe0, + 0x87, 0xb7, 0xe8, 0xbe, 0xdb, 0x83, 0x6c, 0x25, 0xe7, 0x36, 0x2b, 0x79, 0xb3, 0xf3, 0xf3, 0x37, + 0x3b, 0xff, 0x21, 0xd4, 0x13, 0xef, 0xe3, 0xc7, 0xae, 0x20, 0x1e, 0xb2, 0x04, 0x15, 0xef, 0xdd, + 0xc7, 0xa0, 0xa4, 0x97, 0x94, 0xf1, 0x92, 0xb7, 0xd7, 0x5f, 0xaa, 0xca, 0x49, 0x33, 0x3e, 0x6d, + 0xf7, 0x54, 0x26, 0x7e, 0x62, 0x26, 0xb7, 0x33, 0x54, 0xe9, 0x36, 0x86, 0x7a, 0x2b, 0xc1, 0xfd, + 0x0e, 0xce, 0x03, 0x99, 0x37, 0x8e, 0xa1, 0x67, 0xdf, 0x1a, 0xd3, 0x77, 0x7d, 0x6c, 0x7e, 0x00, + 0x35, 0x5f, 0x6c, 0x93, 0x09, 0x6a, 0x75, 0x05, 0x72, 0xa5, 0x73, 0x48, 0xd6, 0xe2, 0xda, 0xbb, + 0x0c, 0x4b, 0x95, 0xd8, 0x12, 0xaf, 0xfd, 0x3e, 0x28, 0xe9, 0x6d, 0x65, 0xbc, 0x6d, 0x0a, 0x34, + 0xff, 0x2c, 0x41, 0x91, 0xb2, 0x20, 0x9a, 0x87, 0xe4, 0x11, 0x14, 0x6c, 0x6f, 0x2c, 0xbe, 0xe4, + 0xeb, 0xab, 0xef, 0x12, 0xca, 0x82, 0xa5, 0xe7, 0x06, 0xac, 0xe3, 0x8d, 0x19, 0x45, 0x05, 0xa2, + 0x41, 0x69, 0xc1, 0x82, 0xc0, 0x9a, 0xb2, 0x84, 0xdc, 0xe2, 0x25, 0xb9, 0xe0, 0x37, 0x13, 0xfa, + 0xc2, 0xeb, 0xfc, 0x2e, 0x7d, 0x97, 0x98, 0x72, 0xe1, 0x4f, 0x6d, 0xa8, 0xae, 0x1f, 0xcd, 0xf9, + 0xd9, 0xb8, 0xea, 0x74, 0x74, 0xc3, 0x50, 0xf7, 0xc8, 0x3e, 0xdc, 0xe3, 0xd3, 0x6f, 0x7b, 0x74, + 0x45, 0x75, 0xf3, 0x6c, 0x40, 0x2f, 0xdb, 0x23, 0x53, 0xa7, 0x74, 0x40, 0x55, 0x89, 0xdc, 0x87, + 0x1f, 0x74, 0x06, 0x97, 0xc3, 0xab, 0x91, 0x6e, 0xb6, 0xbb, 0x5d, 0xaa, 0x1b, 0x46, 0x2c, 0xca, + 0x71, 0xd2, 0x1f, 0x8c, 0x9e, 0xeb, 0x34, 0x06, 0xee, 0x9e, 0xfe, 0x53, 0x82, 0xea, 0x39, 0x92, + 0x0b, 0xf3, 0x5f, 0xf2, 0xef, 0xd1, 0xa7, 0xf0, 0x9e, 0x11, 0x5d, 0x2f, 0x9c, 0x30, 0x3b, 0x10, + 0xdf, 0xdb, 0xfe, 0x60, 0xee, 0xd7, 0xd2, 0x20, 0xf1, 0x08, 0xfe, 0x12, 0x6a, 0x06, 0x73, 0xd3, + 0xae, 0x24, 0x0f, 0xd6, 0xec, 0x6e, 0x36, 0xe6, 0xa6, 0x79, 0x1f, 0xc8, 0xcd, 0x82, 0x23, 0x47, + 0xab, 0x26, 0xb9, 0xa5, 0x16, 0xf7, 0x6f, 0xf1, 0xee, 0xd9, 0xd3, 0xd7, 0x6f, 0x0e, 0xa4, 0x7f, + 0xbc, 0x39, 0x90, 0xfe, 0xf3, 0xe6, 0x40, 0xfa, 0xcb, 0xdb, 0x03, 0xe9, 0x6f, 0x6f, 0x0f, 0xa4, + 0xd7, 0x6f, 0x0f, 0x24, 0xa8, 0x39, 0x5e, 0xeb, 0x3a, 0x9c, 0x04, 0xc2, 0xf0, 0x19, 0x60, 0x0c, + 0x86, 0x3c, 0x39, 0x43, 0xe9, 0xb7, 0xe2, 0x5f, 0x47, 0xd7, 0x45, 0x4c, 0xd6, 0x87, 0xff, 0x0b, + 0x00, 0x00, 0xff, 0xff, 0xb4, 0x45, 0x01, 0xd3, 0x64, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1776,6 +1860,20 @@ func (m *Contract) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.PreparerSignature) > 0 { + i -= len(m.PreparerSignature) + copy(dAtA[i:], m.PreparerSignature) + i = encodeVarintGuard(dAtA, i, uint64(len(m.PreparerSignature))) + i-- + dAtA[i] = 0x5a + } + if len(m.PreparerPid) > 0 { + i -= len(m.PreparerPid) + copy(dAtA[i:], m.PreparerPid) + i = encodeVarintGuard(dAtA, i, uint64(len(m.PreparerPid))) + i-- + dAtA[i] = 0x52 + } if len(m.GuardSignature) > 0 { i -= len(m.GuardSignature) copy(dAtA[i:], m.GuardSignature) @@ -1984,6 +2082,25 @@ func (m *FileStoreStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.PreparerSignature) > 0 { + i -= len(m.PreparerSignature) + copy(dAtA[i:], m.PreparerSignature) + i = encodeVarintGuard(dAtA, i, uint64(len(m.PreparerSignature))) + i-- + dAtA[i] = 0x5a + } + if len(m.PreparerPid) > 0 { + i -= len(m.PreparerPid) + copy(dAtA[i:], m.PreparerPid) + i = encodeVarintGuard(dAtA, i, uint64(len(m.PreparerPid))) + i-- + dAtA[i] = 0x52 + } + if m.RentalState != 0 { + i = encodeVarintGuard(dAtA, i, uint64(m.RentalState)) + i-- + dAtA[i] = 0x48 + } if len(m.GuardSignature) > 0 { i -= len(m.GuardSignature) copy(dAtA[i:], m.GuardSignature) @@ -2584,6 +2701,14 @@ func (m *Contract) Size() (n int) { if l > 0 { n += 1 + l + sovGuard(uint64(l)) } + l = len(m.PreparerPid) + if l > 0 { + n += 1 + l + sovGuard(uint64(l)) + } + l = len(m.PreparerSignature) + if l > 0 { + n += 1 + l + sovGuard(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2680,6 +2805,17 @@ func (m *FileStoreStatus) Size() (n int) { if l > 0 { n += 1 + l + sovGuard(uint64(l)) } + if m.RentalState != 0 { + n += 1 + sovGuard(uint64(m.RentalState)) + } + l = len(m.PreparerPid) + if l > 0 { + n += 1 + l + sovGuard(uint64(l)) + } + l = len(m.PreparerSignature) + if l > 0 { + n += 1 + l + sovGuard(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3822,6 +3958,72 @@ func (m *Contract) Unmarshal(dAtA []byte) error { m.GuardSignature = []byte{} } iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PreparerPid", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGuard + } + 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 ErrInvalidLengthGuard + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGuard + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PreparerPid = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 11: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PreparerSignature", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGuard + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthGuard + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthGuard + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PreparerSignature = append(m.PreparerSignature[:0], dAtA[iNdEx:postIndex]...) + if m.PreparerSignature == nil { + m.PreparerSignature = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGuard(dAtA[iNdEx:]) @@ -4514,6 +4716,91 @@ func (m *FileStoreStatus) Unmarshal(dAtA []byte) error { m.GuardSignature = []byte{} } iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field RentalState", wireType) + } + m.RentalState = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGuard + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.RentalState |= FileStoreStatus_RentalState(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PreparerPid", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGuard + } + 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 ErrInvalidLengthGuard + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGuard + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PreparerPid = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 11: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PreparerSignature", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGuard + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthGuard + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthGuard + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PreparerSignature = append(m.PreparerSignature[:0], dAtA[iNdEx:postIndex]...) + if m.PreparerSignature == nil { + m.PreparerSignature = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGuard(dAtA[iNdEx:]) From 198004790664a53b73b9033bc367a0e89ae852ad Mon Sep 17 00:00:00 2001 From: Junlin Gao Date: Tue, 26 Nov 2019 10:43:35 -0800 Subject: [PATCH 3/4] change to address code review comments --- protos/guard/guard.pb.go | 452 +++++++++++++++++---------------------- protos/guard/guard.proto | 26 ++- 2 files changed, 220 insertions(+), 258 deletions(-) diff --git a/protos/guard/guard.pb.go b/protos/guard/guard.pb.go index cdc47df..cce6abf 100644 --- a/protos/guard/guard.pb.go +++ b/protos/guard/guard.pb.go @@ -6,7 +6,7 @@ package guard import ( context "context" fmt "fmt" - types "github.com/gogo/protobuf/types" + _ "github.com/gogo/protobuf/types" golang_proto "github.com/golang/protobuf/proto" _ "github.com/tron-us/protobuf/gogoproto" proto "github.com/tron-us/protobuf/proto" @@ -204,12 +204,12 @@ func (FileStoreStatus_RentalState) EnumDescriptor() ([]byte, []int) { } type Log struct { - ChangeTime *types.Timestamp `protobuf:"bytes,1,opt,name=change_time,json=changeTime,proto3" json:"change_time,omitempty" pg:"change_time"` - OriginatorPid string `protobuf:"bytes,2,opt,name=originator_pid,json=originatorPid,proto3" json:"originator_pid,omitempty" pg:"originator_pid"` - Change string `protobuf:"bytes,3,opt,name=change,proto3" json:"change,omitempty" pg:"change"` - XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` - XXX_unrecognized []byte `json:"-" pg:"-"` - XXX_sizecache int32 `json:"-" pg:"-"` + ChangeTime time.Time `protobuf:"bytes,1,opt,name=change_time,json=changeTime,proto3,stdtime" json:"change_time" pg:"change_time"` + OriginatorPid string `protobuf:"bytes,2,opt,name=originator_pid,json=originatorPid,proto3" json:"originator_pid,omitempty" pg:"originator_pid"` + Change string `protobuf:"bytes,3,opt,name=change,proto3" json:"change,omitempty" pg:"change"` + XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` + XXX_unrecognized []byte `json:"-" pg:"-"` + XXX_sizecache int32 `json:"-" pg:"-"` } func (m *Log) Reset() { *m = Log{} } @@ -245,11 +245,11 @@ func (m *Log) XXX_DiscardUnknown() { var xxx_messageInfo_Log proto.InternalMessageInfo -func (m *Log) GetChangeTime() *types.Timestamp { +func (m *Log) GetChangeTime() time.Time { if m != nil { return m.ChangeTime } - return nil + return time.Time{} } func (m *Log) GetOriginatorPid() string { @@ -450,7 +450,7 @@ func (*ContractMeta) XXX_MessageName() string { type Contract struct { //the contract executor record, changed frequently after proposal - Contract *ContractMeta `protobuf:"bytes,1,opt,name=contract,proto3" json:"contract,omitempty" pg:"contract"` + ContractMeta `protobuf:"bytes,1,opt,name=contract,proto3,embedded=contract" json:"contract" pg:"contract"` State Contract_ContractState `protobuf:"varint,2,opt,name=state,proto3,enum=guard.Contract_ContractState" json:"state,omitempty" pg:"state"` RenterSignature []byte `protobuf:"bytes,3,opt,name=renter_signature,json=renterSignature,proto3" json:"renter_signature,omitempty" pg:"renter_signature"` HostSignature []byte `protobuf:"bytes,4,opt,name=host_signature,json=hostSignature,proto3" json:"host_signature,omitempty" pg:"host_signature"` @@ -499,13 +499,6 @@ func (m *Contract) XXX_DiscardUnknown() { var xxx_messageInfo_Contract proto.InternalMessageInfo -func (m *Contract) GetContract() *ContractMeta { - if m != nil { - return m.Contract - } - return nil -} - func (m *Contract) GetState() Contract_ContractState { if m != nil { return m.State @@ -729,9 +722,9 @@ func (*FileStoreMeta) XXX_MessageName() string { } type FileStoreStatus struct { - FileStoreMeta *FileStoreMeta `protobuf:"bytes,1,opt,name=file_store_meta,json=fileStoreMeta,proto3" json:"file_store_meta,omitempty" pg:"file_store_meta"` + FileStoreMeta `protobuf:"bytes,1,opt,name=file_store_meta,json=fileStoreMeta,proto3,embedded=file_store_meta" json:"file_store_meta" pg:"file_store_meta"` State FileStoreStatus_MetaState `protobuf:"varint,2,opt,name=state,proto3,enum=guard.FileStoreStatus_MetaState" json:"state,omitempty" pg:"state"` - Contracts []*Contract `protobuf:"bytes,3,rep,name=contracts,proto3" json:"contracts,omitempty" pg:"contracts"` + Contracts []Contract `protobuf:"bytes,3,rep,name=contracts,proto3" json:"contracts" pg:"contracts"` RenterSignature []byte `protobuf:"bytes,4,opt,name=renter_signature,json=renterSignature,proto3" json:"renter_signature,omitempty" pg:"renter_signature"` GuardReceiveTime time.Time `protobuf:"bytes,5,opt,name=guard_receive_time,json=guardReceiveTime,proto3,stdtime" json:"guard_receive_time" pg:"guard_receive_time"` ChangeLog []*Log `protobuf:"bytes,6,rep,name=change_log,json=changeLog,proto3" json:"change_log,omitempty" pg:"change_log"` @@ -778,13 +771,6 @@ func (m *FileStoreStatus) XXX_DiscardUnknown() { var xxx_messageInfo_FileStoreStatus proto.InternalMessageInfo -func (m *FileStoreStatus) GetFileStoreMeta() *FileStoreMeta { - if m != nil { - return m.FileStoreMeta - } - return nil -} - func (m *FileStoreStatus) GetState() FileStoreStatus_MetaState { if m != nil { return m.State @@ -792,7 +778,7 @@ func (m *FileStoreStatus) GetState() FileStoreStatus_MetaState { return FileStoreStatus_DRAFT } -func (m *FileStoreStatus) GetContracts() []*Contract { +func (m *FileStoreStatus) GetContracts() []Contract { if m != nil { return m.Contracts } @@ -943,16 +929,16 @@ func (*ChallengeQuestion) XXX_MessageName() string { } type ProofOfReplicateChallenge struct { - Question *ChallengeQuestion `protobuf:"bytes,1,opt,name=question,proto3" json:"question,omitempty" pg:"question"` - ChallengeTime time.Time `protobuf:"bytes,2,opt,name=challenge_time,json=challengeTime,proto3,stdtime" json:"challenge_time" pg:"challenge_time"` - GuardPid string `protobuf:"bytes,3,opt,name=guard_pid,json=guardPid,proto3" json:"guard_pid,omitempty" pg:"guard_pid"` - GuardSignature []byte `protobuf:"bytes,4,opt,name=guard_signature,json=guardSignature,proto3" json:"guard_signature,omitempty" pg:"guard_signature"` - HostAnswer string `protobuf:"bytes,5,opt,name=host_answer,json=hostAnswer,proto3" json:"host_answer,omitempty" pg:"host_answer"` - HostSignTime time.Time `protobuf:"bytes,6,opt,name=host_sign_time,json=hostSignTime,proto3,stdtime" json:"host_sign_time" pg:"host_sign_time"` - HostSignature []byte `protobuf:"bytes,7,opt,name=host_signature,json=hostSignature,proto3" json:"host_signature,omitempty" pg:"host_signature"` - XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` - XXX_unrecognized []byte `json:"-" pg:"-"` - XXX_sizecache int32 `json:"-" pg:"-"` + ChallengeQuestion `protobuf:"bytes,1,opt,name=question,proto3,embedded=question" json:"question" pg:"question"` + ChallengeTime time.Time `protobuf:"bytes,2,opt,name=challenge_time,json=challengeTime,proto3,stdtime" json:"challenge_time" pg:"challenge_time"` + GuardPid string `protobuf:"bytes,3,opt,name=guard_pid,json=guardPid,proto3" json:"guard_pid,omitempty" pg:"guard_pid"` + GuardSignature []byte `protobuf:"bytes,4,opt,name=guard_signature,json=guardSignature,proto3" json:"guard_signature,omitempty" pg:"guard_signature"` + HostAnswer string `protobuf:"bytes,5,opt,name=host_answer,json=hostAnswer,proto3" json:"host_answer,omitempty" pg:"host_answer"` + HostSignTime time.Time `protobuf:"bytes,6,opt,name=host_sign_time,json=hostSignTime,proto3,stdtime" json:"host_sign_time" pg:"host_sign_time"` + HostSignature []byte `protobuf:"bytes,7,opt,name=host_signature,json=hostSignature,proto3" json:"host_signature,omitempty" pg:"host_signature"` + XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` + XXX_unrecognized []byte `json:"-" pg:"-"` + XXX_sizecache int32 `json:"-" pg:"-"` } func (m *ProofOfReplicateChallenge) Reset() { *m = ProofOfReplicateChallenge{} } @@ -988,13 +974,6 @@ func (m *ProofOfReplicateChallenge) XXX_DiscardUnknown() { var xxx_messageInfo_ProofOfReplicateChallenge proto.InternalMessageInfo -func (m *ProofOfReplicateChallenge) GetQuestion() *ChallengeQuestion { - if m != nil { - return m.Question - } - return nil -} - func (m *ProofOfReplicateChallenge) GetChallengeTime() time.Time { if m != nil { return m.ChallengeTime @@ -1042,11 +1021,11 @@ func (*ProofOfReplicateChallenge) XXX_MessageName() string { } type FileChallengeQuestions struct { - FileHash string `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"` - ShardQuestions []*ShardChallengeQuestions `protobuf:"bytes,2,rep,name=shard_questions,json=shardQuestions,proto3" json:"shard_questions,omitempty" pg:"shard_questions"` - XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` - XXX_unrecognized []byte `json:"-" pg:"-"` - XXX_sizecache int32 `json:"-" pg:"-"` + FileHash string `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"` + ShardQuestions []ShardChallengeQuestions `protobuf:"bytes,2,rep,name=shard_questions,json=shardQuestions,proto3" json:"shard_questions" pg:"shard_questions"` + XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` + XXX_unrecognized []byte `json:"-" pg:"-"` + XXX_sizecache int32 `json:"-" pg:"-"` } func (m *FileChallengeQuestions) Reset() { *m = FileChallengeQuestions{} } @@ -1089,7 +1068,7 @@ func (m *FileChallengeQuestions) GetFileHash() string { return "" } -func (m *FileChallengeQuestions) GetShardQuestions() []*ShardChallengeQuestions { +func (m *FileChallengeQuestions) GetShardQuestions() []ShardChallengeQuestions { if m != nil { return m.ShardQuestions } @@ -1101,16 +1080,16 @@ func (*FileChallengeQuestions) XXX_MessageName() string { } type ShardChallengeQuestions struct { - FileHash string `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"` - ShardHash string `protobuf:"bytes,2,opt,name=shard_hash,json=shardHash,proto3" json:"shard_hash,omitempty" pg:"shard_hash"` - PreparerPid string `protobuf:"bytes,3,opt,name=preparer_pid,json=preparerPid,proto3" json:"preparer_pid,omitempty" pg:"preparer_pid"` - QuestionCount int32 `protobuf:"varint,4,opt,name=question_count,json=questionCount,proto3" json:"question_count,omitempty" pg:"question_count"` - Questions []*ChallengeQuestion `protobuf:"bytes,5,rep,name=questions,proto3" json:"questions,omitempty" pg:"questions"` - PrepareTime time.Time `protobuf:"bytes,6,opt,name=prepare_time,json=prepareTime,proto3,stdtime" json:"prepare_time" pg:"prepare_time"` - PreparerSignature []byte `protobuf:"bytes,7,opt,name=preparer_signature,json=preparerSignature,proto3" json:"preparer_signature,omitempty" pg:"preparer_signature"` - XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` - XXX_unrecognized []byte `json:"-" pg:"-"` - XXX_sizecache int32 `json:"-" pg:"-"` + FileHash string `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"` + ShardHash string `protobuf:"bytes,2,opt,name=shard_hash,json=shardHash,proto3" json:"shard_hash,omitempty" pg:"shard_hash"` + PreparerPid string `protobuf:"bytes,3,opt,name=preparer_pid,json=preparerPid,proto3" json:"preparer_pid,omitempty" pg:"preparer_pid"` + QuestionCount int32 `protobuf:"varint,4,opt,name=question_count,json=questionCount,proto3" json:"question_count,omitempty" pg:"question_count"` + Questions []ChallengeQuestion `protobuf:"bytes,5,rep,name=questions,proto3" json:"questions" pg:"questions"` + PrepareTime time.Time `protobuf:"bytes,6,opt,name=prepare_time,json=prepareTime,proto3,stdtime" json:"prepare_time" pg:"prepare_time"` + PreparerSignature []byte `protobuf:"bytes,7,opt,name=preparer_signature,json=preparerSignature,proto3" json:"preparer_signature,omitempty" pg:"preparer_signature"` + XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` + XXX_unrecognized []byte `json:"-" pg:"-"` + XXX_sizecache int32 `json:"-" pg:"-"` } func (m *ShardChallengeQuestions) Reset() { *m = ShardChallengeQuestions{} } @@ -1174,7 +1153,7 @@ func (m *ShardChallengeQuestions) GetQuestionCount() int32 { return 0 } -func (m *ShardChallengeQuestions) GetQuestions() []*ChallengeQuestion { +func (m *ShardChallengeQuestions) GetQuestions() []ChallengeQuestion { if m != nil { return m.Questions } @@ -1387,119 +1366,120 @@ func init() { proto.RegisterFile("protos/guard/guard.proto", fileDescriptor_ad5b func init() { golang_proto.RegisterFile("protos/guard/guard.proto", fileDescriptor_ad5b6eccdc9ebee8) } var fileDescriptor_ad5b6eccdc9ebee8 = []byte{ - // 1788 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x8f, 0xdb, 0xc6, - 0x15, 0x5f, 0x4a, 0xa2, 0x24, 0x3e, 0xfd, 0xa3, 0x27, 0xae, 0x4b, 0x6f, 0xe3, 0xdd, 0xad, 0x02, - 0xd7, 0xeb, 0x16, 0xd6, 0x16, 0x9b, 0x20, 0x97, 0xba, 0x08, 0x64, 0x89, 0xbb, 0xde, 0x56, 0x2b, - 0x29, 0x43, 0x2d, 0x52, 0xf7, 0x42, 0x70, 0xa9, 0x91, 0x44, 0x44, 0x22, 0x15, 0xfe, 0x71, 0xe2, - 0x1c, 0x0a, 0x14, 0xe8, 0x07, 0xe8, 0xa1, 0x28, 0x7a, 0xea, 0x3d, 0xdf, 0xa2, 0x47, 0xdf, 0xda, - 0x7b, 0x81, 0xb6, 0xb0, 0xbf, 0x44, 0x8f, 0xc5, 0xbc, 0x21, 0x45, 0x51, 0xab, 0x75, 0xa0, 0x14, - 0xb9, 0x2c, 0x34, 0xbf, 0xf7, 0xde, 0xcc, 0x9b, 0xf7, 0xe7, 0x37, 0x8f, 0x0b, 0xda, 0xd2, 0xf7, - 0x42, 0x2f, 0x38, 0x99, 0x46, 0x96, 0x3f, 0x16, 0x7f, 0x5b, 0x08, 0x11, 0x19, 0x17, 0xfb, 0x3f, - 0x9f, 0x3a, 0xe1, 0x2c, 0xba, 0x6e, 0xd9, 0xde, 0xe2, 0x24, 0xf4, 0x3d, 0xf7, 0x49, 0x14, 0x9c, - 0xa0, 0xc2, 0x75, 0x34, 0x39, 0x99, 0x7a, 0x53, 0x0f, 0x17, 0xf8, 0x4b, 0x18, 0xee, 0x1f, 0x4e, - 0x3d, 0x6f, 0x3a, 0x67, 0xa9, 0x56, 0xe8, 0x2c, 0x58, 0x10, 0x5a, 0x8b, 0xa5, 0x50, 0x68, 0xfe, - 0x5e, 0x82, 0x7c, 0xcf, 0x9b, 0x92, 0x5f, 0x40, 0xc5, 0x9e, 0x59, 0xee, 0x94, 0x99, 0x5c, 0x43, - 0x93, 0x8e, 0xa4, 0xe3, 0xca, 0xe9, 0x7e, 0x4b, 0x98, 0xb7, 0x12, 0xf3, 0xd6, 0x28, 0x31, 0xa7, - 0x20, 0xd4, 0x39, 0x40, 0x1e, 0x42, 0xdd, 0xf3, 0x9d, 0xa9, 0xe3, 0x5a, 0xa1, 0xe7, 0x9b, 0x4b, - 0x67, 0xac, 0xe5, 0x8e, 0xa4, 0x63, 0x85, 0xd6, 0x52, 0x74, 0xe8, 0x8c, 0xc9, 0x3d, 0x28, 0x0a, - 0x23, 0x2d, 0x8f, 0xe2, 0x78, 0xd5, 0xfc, 0x46, 0x86, 0x6a, 0xc7, 0x73, 0x43, 0xdf, 0xb2, 0xc3, - 0x4b, 0x16, 0x5a, 0xe4, 0x10, 0x2a, 0x76, 0xbc, 0x36, 0x9d, 0x31, 0x3a, 0xa3, 0x50, 0x48, 0xa0, - 0x8b, 0x31, 0x79, 0x00, 0xe0, 0x33, 0x37, 0x64, 0xeb, 0x87, 0x29, 0x02, 0xe1, 0x07, 0xdd, 0x87, - 0xf2, 0xcc, 0x0b, 0x42, 0x14, 0x8a, 0xa3, 0x4a, 0x7c, 0xcd, 0x45, 0x0f, 0x00, 0x82, 0x99, 0xe5, - 0x8f, 0xcd, 0x99, 0x15, 0xcc, 0xb4, 0x82, 0xb0, 0x44, 0xe4, 0xb9, 0x15, 0xcc, 0xf8, 0xc9, 0x42, - 0xec, 0xb8, 0x63, 0xf6, 0x95, 0x26, 0x1f, 0x49, 0xc7, 0x32, 0x15, 0x16, 0x17, 0x1c, 0x21, 0x3f, - 0x81, 0x86, 0x50, 0x98, 0x38, 0x73, 0x66, 0x06, 0xce, 0xd7, 0x4c, 0x2b, 0x1e, 0x49, 0xc7, 0x79, - 0x5a, 0x43, 0xf8, 0xcc, 0x99, 0x33, 0xc3, 0xf9, 0x9a, 0x91, 0x1f, 0x81, 0x82, 0x1a, 0x78, 0x4c, - 0x09, 0x8f, 0x29, 0x73, 0x00, 0x4f, 0xe9, 0x08, 0xf7, 0xcd, 0x20, 0xb4, 0xfc, 0x50, 0x2b, 0x7f, - 0x5b, 0xac, 0x9f, 0x95, 0x5f, 0xff, 0xeb, 0x70, 0xef, 0x8f, 0xff, 0x3e, 0x94, 0xc4, 0x25, 0x0d, - 0x6e, 0x46, 0x3e, 0x81, 0x32, 0x6e, 0xc2, 0xdc, 0xb1, 0xa6, 0xec, 0xb0, 0x45, 0x89, 0x5b, 0xe9, - 0xee, 0x98, 0xbb, 0x88, 0x65, 0x85, 0x61, 0x02, 0xe1, 0x22, 0x02, 0x71, 0x9c, 0x58, 0x60, 0xfb, - 0xde, 0x97, 0x28, 0xad, 0x88, 0x38, 0x09, 0x84, 0x8b, 0xef, 0x82, 0xbc, 0xf4, 0x1d, 0x9b, 0x69, - 0x55, 0xbc, 0xbc, 0x58, 0xf0, 0x04, 0x5b, 0x0b, 0x2f, 0x72, 0x43, 0xad, 0x86, 0x70, 0xbc, 0x22, - 0x3f, 0x83, 0x3b, 0xb6, 0x37, 0x9f, 0x5b, 0x21, 0xf3, 0xad, 0xb9, 0x19, 0xab, 0xd4, 0x51, 0x45, - 0x4d, 0x05, 0x6d, 0xa1, 0xac, 0x43, 0x63, 0x69, 0xbd, 0xf2, 0xa2, 0xd0, 0x0c, 0xec, 0x19, 0x1b, - 0x47, 0x73, 0xa6, 0x35, 0x8e, 0xa4, 0xe3, 0xfa, 0xe9, 0xfb, 0x2d, 0xd1, 0x12, 0xeb, 0xa5, 0xd2, - 0x32, 0x62, 0x1d, 0x5a, 0x17, 0x46, 0xc9, 0x9a, 0x67, 0xd2, 0x8d, 0x16, 0xa6, 0x40, 0x03, 0x4d, - 0x15, 0x99, 0x74, 0xa3, 0xc5, 0x50, 0x20, 0xcd, 0x8f, 0xa0, 0xbc, 0x52, 0xae, 0x40, 0xe9, 0x72, - 0xd0, 0x1f, 0x3d, 0xef, 0xbd, 0x50, 0xf7, 0x48, 0x0d, 0x94, 0x4f, 0xaf, 0xda, 0x74, 0xa4, 0xd3, - 0xde, 0x0b, 0x55, 0x22, 0x55, 0x28, 0xb7, 0xfb, 0xfd, 0xab, 0x76, 0xaf, 0xf7, 0x42, 0xcd, 0x35, - 0xff, 0x2a, 0x43, 0x39, 0x71, 0x80, 0x9c, 0x40, 0x39, 0x29, 0xca, 0xb8, 0x63, 0xde, 0xdb, 0xe2, - 0x23, 0x5d, 0x29, 0x91, 0x0f, 0x41, 0x0e, 0x42, 0x2b, 0x64, 0x58, 0xb2, 0xf5, 0xd3, 0x07, 0x1b, - 0xda, 0xab, 0x1f, 0x06, 0x57, 0xa2, 0x42, 0x97, 0x3c, 0x06, 0x35, 0x2e, 0xf6, 0xc0, 0x99, 0xba, - 0x56, 0x18, 0xf9, 0xa2, 0x81, 0xaa, 0xb4, 0x21, 0x70, 0x23, 0x81, 0x79, 0x23, 0x62, 0xe1, 0xa7, - 0x8a, 0x05, 0x54, 0xac, 0x71, 0x34, 0x55, 0xa3, 0x40, 0xe2, 0xe4, 0x72, 0x45, 0x36, 0x16, 0x3d, - 0x2f, 0xef, 0x50, 0x44, 0xaa, 0xb0, 0x37, 0xd0, 0x1c, 0x39, 0xe0, 0x31, 0xa8, 0x6b, 0x7b, 0x8a, - 0xc3, 0x8b, 0xc2, 0xcb, 0x54, 0x57, 0x1c, 0xff, 0x18, 0x62, 0xf2, 0x30, 0xe7, 0xde, 0x54, 0x2b, - 0x1d, 0xe5, 0x8f, 0x2b, 0xa7, 0x10, 0x87, 0xa2, 0xe7, 0x4d, 0xa9, 0x22, 0xa4, 0x9c, 0x96, 0xfa, - 0xa0, 0xce, 0xad, 0x20, 0x34, 0x17, 0xde, 0xd8, 0x99, 0xbc, 0x12, 0x7e, 0xee, 0xd2, 0x2f, 0x75, - 0x6e, 0x7d, 0x89, 0xc6, 0xe8, 0xe5, 0x23, 0x68, 0x88, 0x9a, 0x4f, 0x9d, 0x54, 0xd0, 0xc9, 0x3a, - 0xc2, 0xa9, 0x8f, 0x3f, 0x86, 0xea, 0xd2, 0x67, 0x4b, 0xcb, 0x8f, 0x39, 0x46, 0xf4, 0x47, 0x25, - 0xc1, 0x78, 0x0f, 0x3c, 0x01, 0xb2, 0x52, 0x49, 0xb7, 0xab, 0xe0, 0x76, 0x77, 0x12, 0xc9, 0x6a, - 0xc7, 0x26, 0x83, 0x5a, 0x26, 0xbd, 0x44, 0x01, 0xb9, 0x4b, 0xdb, 0x67, 0x23, 0x75, 0x8f, 0x00, - 0x14, 0x8d, 0x8b, 0xf3, 0xbe, 0xde, 0x15, 0xf5, 0x76, 0x35, 0xec, 0x0d, 0xda, 0x5d, 0xbd, 0xab, - 0xe6, 0x48, 0x19, 0x0a, 0xbd, 0x81, 0x31, 0x52, 0xf3, 0x1c, 0xef, 0xb4, 0xfb, 0x1d, 0xbd, 0xa7, - 0x77, 0xd5, 0x02, 0xb7, 0xe8, 0xf4, 0x06, 0x86, 0xde, 0x55, 0x65, 0x5e, 0xbd, 0x54, 0xef, 0xeb, - 0x9f, 0xe9, 0x5d, 0xb5, 0xd8, 0xfc, 0x43, 0x01, 0x6a, 0xc8, 0x42, 0xa1, 0xe7, 0x33, 0x64, 0xd3, - 0x2c, 0x59, 0x4a, 0x9b, 0x64, 0x99, 0x61, 0xaa, 0xdc, 0x06, 0x53, 0x25, 0x42, 0x24, 0xba, 0x3c, - 0x76, 0x2c, 0x0a, 0x91, 0xe3, 0xb2, 0x34, 0x56, 0xf8, 0xff, 0x69, 0x4c, 0xfe, 0x2e, 0x34, 0xf6, - 0x08, 0x1a, 0xf6, 0x8c, 0xd9, 0x9f, 0x9b, 0x13, 0x9f, 0x7d, 0x11, 0x31, 0xd7, 0x7e, 0x85, 0x75, - 0x27, 0xd3, 0x3a, 0xc2, 0x67, 0x09, 0x9a, 0xf2, 0xdd, 0x84, 0x31, 0xa4, 0xe4, 0x7c, 0xcc, 0x77, - 0x67, 0x8c, 0xad, 0xf1, 0x1d, 0x97, 0x96, 0x51, 0x1a, 0xf3, 0x1d, 0x17, 0xaf, 0xde, 0x05, 0x1b, - 0xb9, 0x4b, 0x59, 0x7b, 0x17, 0x3a, 0xc8, 0x5a, 0x0f, 0xa1, 0xbe, 0x70, 0x5c, 0x67, 0x11, 0x2d, - 0x4c, 0x44, 0x03, 0xac, 0x18, 0x99, 0xd6, 0x62, 0xd4, 0x40, 0x90, 0x33, 0xa1, 0xcf, 0x6c, 0xef, - 0x25, 0xf3, 0xcd, 0x70, 0xe6, 0xb3, 0x60, 0xe6, 0xcd, 0x05, 0xbb, 0xca, 0x54, 0x8d, 0x05, 0xa3, - 0x04, 0xdf, 0xe0, 0xe0, 0xea, 0x26, 0x07, 0x67, 0xf8, 0xbb, 0x96, 0xe5, 0xef, 0xe6, 0x9f, 0x8a, - 0xd0, 0x58, 0x95, 0x01, 0xaf, 0xb7, 0x28, 0x20, 0x4f, 0xa1, 0x21, 0x92, 0xc9, 0x31, 0x73, 0xc1, - 0x42, 0x2b, 0x66, 0xad, 0xbb, 0x71, 0xf3, 0x65, 0xea, 0x86, 0xd6, 0x26, 0x99, 0x32, 0xfa, 0x38, - 0xcb, 0x5d, 0x47, 0x9b, 0x36, 0xe2, 0x90, 0x16, 0xd7, 0xcd, 0xd0, 0xd7, 0x13, 0x50, 0x12, 0xfe, - 0x0b, 0xb4, 0x3c, 0x36, 0x7b, 0x63, 0x83, 0xf7, 0x68, 0xaa, 0xb1, 0x95, 0xed, 0x0a, 0xdb, 0xd9, - 0x8e, 0x02, 0x11, 0x01, 0xf0, 0x99, 0xcd, 0x9c, 0x97, 0xec, 0x3b, 0xd0, 0x18, 0xda, 0x53, 0x61, - 0x1e, 0xd3, 0xd8, 0x3a, 0x37, 0x15, 0xdf, 0xc5, 0x4d, 0xe7, 0x50, 0xb5, 0x23, 0x1f, 0x8b, 0x17, - 0x0f, 0x2e, 0xed, 0x70, 0x70, 0x25, 0xb6, 0xbc, 0x8d, 0x94, 0xca, 0x5b, 0x49, 0x49, 0x87, 0x2a, - 0x37, 0xb2, 0xe6, 0xa6, 0xc8, 0x84, 0x82, 0x99, 0x68, 0xde, 0x92, 0x09, 0x8a, 0xaa, 0x22, 0x17, - 0x15, 0x3f, 0x5d, 0x7c, 0x0f, 0xdc, 0x36, 0x01, 0x65, 0x95, 0xf7, 0x75, 0x5e, 0xab, 0x81, 0x22, - 0xb8, 0xec, 0xa2, 0x7f, 0xae, 0x4a, 0x48, 0x54, 0x57, 0xfd, 0x3e, 0x5f, 0xe4, 0x88, 0x0a, 0xd5, - 0x61, 0x9b, 0x8e, 0x2e, 0xda, 0x3d, 0x33, 0x66, 0xb8, 0x84, 0xeb, 0x0a, 0xfc, 0x57, 0x77, 0xd0, - 0xd7, 0x55, 0x39, 0xc3, 0x7a, 0xc5, 0xe6, 0x27, 0x50, 0x59, 0xbb, 0x15, 0x29, 0x41, 0xbe, 0xaf, - 0x7f, 0xa6, 0xee, 0x91, 0x06, 0x54, 0x92, 0xbd, 0x38, 0x80, 0x27, 0xe9, 0xbf, 0x19, 0x5e, 0x50, - 0xe4, 0x50, 0x05, 0x64, 0xe4, 0x47, 0x35, 0xdf, 0xfc, 0x46, 0x82, 0x3b, 0x9d, 0x99, 0x35, 0x9f, - 0x33, 0x77, 0xca, 0x3e, 0x8d, 0x58, 0x10, 0x3a, 0x9e, 0xbb, 0x31, 0x14, 0x4a, 0x9b, 0x43, 0xe1, - 0xfa, 0x38, 0x99, 0xcb, 0x8e, 0x93, 0x7c, 0x52, 0x9d, 0x45, 0xee, 0xe7, 0xf1, 0xbc, 0x98, 0x17, - 0xbc, 0x80, 0x90, 0x98, 0x17, 0xef, 0x82, 0xec, 0x7a, 0xae, 0xcd, 0xe2, 0x51, 0x53, 0x2c, 0xc8, - 0x07, 0x50, 0x63, 0x5f, 0x2d, 0x99, 0x1d, 0x9a, 0x96, 0x1b, 0x7c, 0xc9, 0x7c, 0x2c, 0x5a, 0x85, - 0x56, 0x05, 0xd8, 0x46, 0xac, 0xf9, 0xdf, 0x1c, 0xdc, 0x1f, 0xfa, 0x9e, 0x37, 0x19, 0x4c, 0x28, - 0x5b, 0xce, 0x1d, 0xdb, 0x0a, 0xd9, 0xca, 0x77, 0xf2, 0x11, 0x94, 0xbf, 0x88, 0xfd, 0x8f, 0xbb, - 0x58, 0x4b, 0xba, 0x6a, 0xf3, 0x7e, 0x74, 0xa5, 0x49, 0x7e, 0x0d, 0x75, 0x3b, 0x11, 0x8b, 0xaa, - 0xcd, 0xed, 0x50, 0xb5, 0xb5, 0x95, 0x2d, 0xd6, 0x6d, 0x86, 0x80, 0xf2, 0x1b, 0x03, 0xe4, 0x96, - 0xa2, 0x2e, 0x6c, 0x2d, 0xea, 0x43, 0xa8, 0x60, 0x74, 0x33, 0x91, 0x00, 0x0e, 0x89, 0x38, 0x90, - 0x5f, 0xad, 0x0d, 0x35, 0xc2, 0xe7, 0xe2, 0x0e, 0x3e, 0x57, 0x93, 0xd1, 0x27, 0xf9, 0x52, 0xd9, - 0x18, 0x90, 0x4a, 0x5b, 0x06, 0xa4, 0xe6, 0xef, 0xe0, 0x1e, 0xef, 0xa6, 0x1b, 0x91, 0x0c, 0xb2, - 0xaf, 0xa5, 0xb4, 0xf1, 0x5a, 0x9e, 0x27, 0x1f, 0x07, 0x49, 0xbc, 0x03, 0x2d, 0x87, 0x0c, 0x72, - 0x10, 0xa7, 0x06, 0x5f, 0x81, 0x9b, 0xbb, 0xd2, 0x3a, 0x9a, 0xad, 0xd6, 0xcd, 0xbf, 0xe7, 0xe0, - 0x87, 0xb7, 0xe8, 0xbe, 0xdb, 0x83, 0x6c, 0x25, 0xe7, 0x36, 0x2b, 0x79, 0xb3, 0xf3, 0xf3, 0x37, - 0x3b, 0xff, 0x21, 0xd4, 0x13, 0xef, 0xe3, 0xc7, 0xae, 0x20, 0x1e, 0xb2, 0x04, 0x15, 0xef, 0xdd, - 0xc7, 0xa0, 0xa4, 0x97, 0x94, 0xf1, 0x92, 0xb7, 0xd7, 0x5f, 0xaa, 0xca, 0x49, 0x33, 0x3e, 0x6d, - 0xf7, 0x54, 0x26, 0x7e, 0x62, 0x26, 0xb7, 0x33, 0x54, 0xe9, 0x36, 0x86, 0x7a, 0x2b, 0xc1, 0xfd, - 0x0e, 0xce, 0x03, 0x99, 0x37, 0x8e, 0xa1, 0x67, 0xdf, 0x1a, 0xd3, 0x77, 0x7d, 0x6c, 0x7e, 0x00, - 0x35, 0x5f, 0x6c, 0x93, 0x09, 0x6a, 0x75, 0x05, 0x72, 0xa5, 0x73, 0x48, 0xd6, 0xe2, 0xda, 0xbb, - 0x0c, 0x4b, 0x95, 0xd8, 0x12, 0xaf, 0xfd, 0x3e, 0x28, 0xe9, 0x6d, 0x65, 0xbc, 0x6d, 0x0a, 0x34, - 0xff, 0x2c, 0x41, 0x91, 0xb2, 0x20, 0x9a, 0x87, 0xe4, 0x11, 0x14, 0x6c, 0x6f, 0x2c, 0xbe, 0xe4, - 0xeb, 0xab, 0xef, 0x12, 0xca, 0x82, 0xa5, 0xe7, 0x06, 0xac, 0xe3, 0x8d, 0x19, 0x45, 0x05, 0xa2, - 0x41, 0x69, 0xc1, 0x82, 0xc0, 0x9a, 0xb2, 0x84, 0xdc, 0xe2, 0x25, 0xb9, 0xe0, 0x37, 0x13, 0xfa, - 0xc2, 0xeb, 0xfc, 0x2e, 0x7d, 0x97, 0x98, 0x72, 0xe1, 0x4f, 0x6d, 0xa8, 0xae, 0x1f, 0xcd, 0xf9, - 0xd9, 0xb8, 0xea, 0x74, 0x74, 0xc3, 0x50, 0xf7, 0xc8, 0x3e, 0xdc, 0xe3, 0xd3, 0x6f, 0x7b, 0x74, - 0x45, 0x75, 0xf3, 0x6c, 0x40, 0x2f, 0xdb, 0x23, 0x53, 0xa7, 0x74, 0x40, 0x55, 0x89, 0xdc, 0x87, - 0x1f, 0x74, 0x06, 0x97, 0xc3, 0xab, 0x91, 0x6e, 0xb6, 0xbb, 0x5d, 0xaa, 0x1b, 0x46, 0x2c, 0xca, - 0x71, 0xd2, 0x1f, 0x8c, 0x9e, 0xeb, 0x34, 0x06, 0xee, 0x9e, 0xfe, 0x53, 0x82, 0xea, 0x39, 0x92, - 0x0b, 0xf3, 0x5f, 0xf2, 0xef, 0xd1, 0xa7, 0xf0, 0x9e, 0x11, 0x5d, 0x2f, 0x9c, 0x30, 0x3b, 0x10, - 0xdf, 0xdb, 0xfe, 0x60, 0xee, 0xd7, 0xd2, 0x20, 0xf1, 0x08, 0xfe, 0x12, 0x6a, 0x06, 0x73, 0xd3, - 0xae, 0x24, 0x0f, 0xd6, 0xec, 0x6e, 0x36, 0xe6, 0xa6, 0x79, 0x1f, 0xc8, 0xcd, 0x82, 0x23, 0x47, - 0xab, 0x26, 0xb9, 0xa5, 0x16, 0xf7, 0x6f, 0xf1, 0xee, 0xd9, 0xd3, 0xd7, 0x6f, 0x0e, 0xa4, 0x7f, - 0xbc, 0x39, 0x90, 0xfe, 0xf3, 0xe6, 0x40, 0xfa, 0xcb, 0xdb, 0x03, 0xe9, 0x6f, 0x6f, 0x0f, 0xa4, - 0xd7, 0x6f, 0x0f, 0x24, 0xa8, 0x39, 0x5e, 0xeb, 0x3a, 0x9c, 0x04, 0xc2, 0xf0, 0x19, 0x60, 0x0c, - 0x86, 0x3c, 0x39, 0x43, 0xe9, 0xb7, 0xe2, 0x5f, 0x47, 0xd7, 0x45, 0x4c, 0xd6, 0x87, 0xff, 0x0b, - 0x00, 0x00, 0xff, 0xff, 0xb4, 0x45, 0x01, 0xd3, 0x64, 0x12, 0x00, 0x00, + // 1807 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0x1b, 0xc7, + 0x15, 0xd7, 0x92, 0x5c, 0x92, 0xfb, 0xf8, 0x6f, 0x3d, 0x71, 0xdd, 0xb5, 0x1a, 0x4b, 0x2a, 0x03, + 0xd7, 0x72, 0x8b, 0xd0, 0x85, 0x5c, 0x14, 0x28, 0xe0, 0x36, 0xa0, 0xc9, 0x95, 0xac, 0x96, 0x22, + 0x99, 0x21, 0x85, 0xd4, 0xbd, 0x2c, 0x56, 0xcb, 0x21, 0xb9, 0x08, 0xb9, 0xcb, 0xec, 0x1f, 0x27, + 0xce, 0xb1, 0xc8, 0xad, 0x97, 0x9e, 0x8a, 0x7e, 0x80, 0x1e, 0x9a, 0x6f, 0xd1, 0xa3, 0x8f, 0xb9, + 0xf4, 0x54, 0x20, 0x2d, 0xac, 0x2f, 0x52, 0xcc, 0x9b, 0x59, 0x92, 0x4b, 0x51, 0x2e, 0x98, 0x22, + 0x17, 0x81, 0xf3, 0x7b, 0xef, 0xcd, 0xbc, 0x79, 0x7f, 0x7e, 0xf3, 0x56, 0x60, 0x2c, 0x02, 0x3f, + 0xf2, 0xc3, 0x27, 0x93, 0xd8, 0x0e, 0x46, 0xe2, 0x6f, 0x03, 0x21, 0xa2, 0xe2, 0x62, 0xff, 0xe7, + 0x13, 0x37, 0x9a, 0xc6, 0x57, 0x0d, 0xc7, 0x9f, 0x3f, 0x89, 0x02, 0xdf, 0xfb, 0x30, 0x0e, 0x9f, + 0xa0, 0xc2, 0x55, 0x3c, 0x7e, 0x32, 0xf1, 0x27, 0x3e, 0x2e, 0xf0, 0x97, 0x30, 0xdc, 0x3f, 0x9c, + 0xf8, 0xfe, 0x64, 0xc6, 0x56, 0x5a, 0x91, 0x3b, 0x67, 0x61, 0x64, 0xcf, 0x17, 0x42, 0xa1, 0xfe, + 0x27, 0x05, 0xb2, 0x1d, 0x7f, 0x42, 0x4c, 0x28, 0x39, 0x53, 0xdb, 0x9b, 0x30, 0x8b, 0x6b, 0x18, + 0xca, 0x91, 0x72, 0x5c, 0x3a, 0xd9, 0x6f, 0x08, 0xf3, 0x46, 0x62, 0xde, 0x18, 0x26, 0xe6, 0xcf, + 0x8b, 0x6f, 0xbe, 0x3d, 0xdc, 0xfb, 0xf3, 0xbf, 0x0f, 0x15, 0x0a, 0xc2, 0x90, 0x8b, 0xc8, 0x43, + 0xa8, 0xfa, 0x81, 0x3b, 0x71, 0x3d, 0x3b, 0xf2, 0x03, 0x6b, 0xe1, 0x8e, 0x8c, 0xcc, 0x91, 0x72, + 0xac, 0xd1, 0xca, 0x0a, 0xed, 0xbb, 0x23, 0x72, 0x0f, 0xf2, 0xc2, 0xc8, 0xc8, 0xa2, 0x58, 0xae, + 0xea, 0x5f, 0xab, 0x50, 0x6e, 0xf9, 0x5e, 0x14, 0xd8, 0x4e, 0x74, 0xc1, 0x22, 0x9b, 0x1c, 0x42, + 0xc9, 0x91, 0x6b, 0xcb, 0x1d, 0xa1, 0x5b, 0x1a, 0x85, 0x04, 0x3a, 0x1f, 0x91, 0x07, 0x00, 0x01, + 0xf3, 0x22, 0xb6, 0x7e, 0x98, 0x26, 0x10, 0x7e, 0xd0, 0x7d, 0x28, 0x4e, 0xfd, 0x30, 0x42, 0xa1, + 0x38, 0xaa, 0xc0, 0xd7, 0x5c, 0xf4, 0x00, 0x20, 0x9c, 0xda, 0xc1, 0xc8, 0x9a, 0xda, 0xe1, 0xd4, + 0xc8, 0x09, 0x4b, 0x44, 0x5e, 0xd8, 0xe1, 0x94, 0x9f, 0x2c, 0xc4, 0xae, 0x37, 0x62, 0x5f, 0x18, + 0xea, 0x91, 0x72, 0xac, 0x52, 0x61, 0x71, 0xce, 0x11, 0xf2, 0x13, 0xa8, 0x09, 0x85, 0xb1, 0x3b, + 0x63, 0x56, 0xe8, 0x7e, 0xc9, 0x8c, 0xfc, 0x91, 0x72, 0x9c, 0xa5, 0x15, 0x84, 0x4f, 0xdd, 0x19, + 0x1b, 0xb8, 0x5f, 0x32, 0xf2, 0x23, 0xd0, 0x50, 0x03, 0x8f, 0x29, 0xe0, 0x31, 0x45, 0x0e, 0xe0, + 0x29, 0x2d, 0xe1, 0xbe, 0x15, 0x46, 0x76, 0x10, 0x19, 0xc5, 0x1d, 0xa2, 0x8e, 0x97, 0x1c, 0x70, + 0x33, 0xf2, 0x11, 0x14, 0x71, 0x13, 0xe6, 0x8d, 0x0c, 0x6d, 0x87, 0x2d, 0x0a, 0xdc, 0xca, 0xf4, + 0x46, 0xdc, 0x45, 0x2c, 0x30, 0x0c, 0x13, 0x08, 0x17, 0x11, 0x90, 0x71, 0x62, 0xa1, 0x13, 0xf8, + 0x9f, 0xa3, 0xb4, 0x24, 0xe2, 0x24, 0x10, 0x2e, 0xbe, 0x0b, 0xea, 0x22, 0x70, 0x1d, 0x66, 0x94, + 0xf1, 0xf2, 0x62, 0xc1, 0x13, 0x6c, 0xcf, 0xfd, 0xd8, 0x8b, 0x8c, 0x0a, 0xc2, 0x72, 0x45, 0x7e, + 0x06, 0x77, 0x1c, 0x7f, 0x36, 0xb3, 0x23, 0x16, 0xd8, 0x33, 0x4b, 0xaa, 0x54, 0x51, 0x45, 0x5f, + 0x09, 0x9a, 0x42, 0xd9, 0x84, 0xda, 0xc2, 0x7e, 0xed, 0xc7, 0x91, 0x15, 0x3a, 0x53, 0x36, 0x8a, + 0x67, 0xcc, 0xa8, 0x1d, 0x29, 0xc7, 0xd5, 0x93, 0xf7, 0x1b, 0xa2, 0x39, 0xd6, 0x4b, 0xa5, 0x31, + 0x90, 0x3a, 0xb4, 0x2a, 0x8c, 0x92, 0x35, 0xcf, 0xa4, 0x17, 0xcf, 0x2d, 0x81, 0x86, 0x86, 0x2e, + 0x32, 0xe9, 0xc5, 0xf3, 0xbe, 0x40, 0xea, 0xbf, 0x80, 0xe2, 0x52, 0xb9, 0x04, 0x85, 0x8b, 0x5e, + 0x77, 0xf8, 0xa2, 0xf3, 0x52, 0xdf, 0x23, 0x15, 0xd0, 0x3e, 0xbe, 0x6c, 0xd2, 0xa1, 0x49, 0x3b, + 0x2f, 0x75, 0x85, 0x94, 0xa1, 0xd8, 0xec, 0x76, 0x2f, 0x9b, 0x9d, 0xce, 0x4b, 0x3d, 0x53, 0xff, + 0xbb, 0x0a, 0xc5, 0xc4, 0x01, 0xf2, 0x2b, 0x28, 0x26, 0x45, 0x29, 0x7b, 0xe7, 0xbd, 0x2d, 0x3e, + 0x8a, 0xd8, 0x7f, 0xf3, 0xed, 0xa1, 0x42, 0x97, 0xea, 0xe4, 0x29, 0xa8, 0x61, 0x64, 0x47, 0x0c, + 0x8b, 0xb7, 0x7a, 0xf2, 0x60, 0xc3, 0x6e, 0xf9, 0x63, 0xc0, 0x95, 0xa8, 0xd0, 0x25, 0x8f, 0x41, + 0x97, 0x65, 0x1f, 0xba, 0x13, 0xcf, 0x8e, 0xe2, 0x40, 0xb4, 0x52, 0x99, 0xd6, 0x04, 0x3e, 0x48, + 0x60, 0xde, 0x92, 0xd8, 0x02, 0x2b, 0xc5, 0x1c, 0x2a, 0x56, 0x38, 0xba, 0x52, 0xa3, 0x40, 0x64, + 0x9a, 0xb9, 0x22, 0x1b, 0x09, 0x1e, 0x50, 0x77, 0x28, 0x27, 0x5d, 0xd8, 0x0f, 0xd0, 0x1c, 0xd9, + 0xe0, 0x31, 0xe8, 0x6b, 0x7b, 0x8a, 0xc3, 0xf3, 0xc2, 0xcb, 0x95, 0xae, 0x38, 0xfe, 0x31, 0x48, + 0x1a, 0xb1, 0x66, 0xfe, 0xc4, 0x28, 0x1c, 0x65, 0x8f, 0x4b, 0x27, 0x20, 0x43, 0xd1, 0xf1, 0x27, + 0x54, 0x13, 0x52, 0x4e, 0x55, 0x5d, 0xd0, 0x67, 0x76, 0x18, 0x59, 0x73, 0x7f, 0xe4, 0x8e, 0x5f, + 0x0b, 0x3f, 0x77, 0xe9, 0x9c, 0x2a, 0xb7, 0xbe, 0x40, 0x63, 0xf4, 0xf2, 0x11, 0xd4, 0x44, 0xf5, + 0xaf, 0x9c, 0xd4, 0xd0, 0xc9, 0x2a, 0xc2, 0x2b, 0x1f, 0x7f, 0x0c, 0xe5, 0x45, 0xc0, 0x16, 0x76, + 0x20, 0xd9, 0x46, 0x74, 0x4a, 0x29, 0xc1, 0x78, 0x37, 0x7c, 0x08, 0x64, 0xa9, 0xb2, 0xda, 0xae, + 0x84, 0xdb, 0xdd, 0x49, 0x24, 0xcb, 0x1d, 0xeb, 0x0c, 0x2a, 0xa9, 0xf4, 0x12, 0x0d, 0xd4, 0x36, + 0x6d, 0x9e, 0x0e, 0xf5, 0x3d, 0x02, 0x90, 0x1f, 0x9c, 0x9f, 0x75, 0xcd, 0xb6, 0xa8, 0xbc, 0xcb, + 0x7e, 0xa7, 0xd7, 0x6c, 0x9b, 0x6d, 0x3d, 0x43, 0x8a, 0x90, 0xeb, 0xf4, 0x06, 0x43, 0x3d, 0xcb, + 0xf1, 0x56, 0xb3, 0xdb, 0x32, 0x3b, 0x66, 0x5b, 0xcf, 0x71, 0x8b, 0x56, 0xa7, 0x37, 0x30, 0xdb, + 0xba, 0xca, 0xeb, 0x98, 0x9a, 0x5d, 0xf3, 0x13, 0xb3, 0xad, 0xe7, 0xeb, 0x5f, 0xe5, 0xa0, 0x82, + 0x7c, 0x14, 0xf9, 0x01, 0x43, 0x5e, 0x4d, 0xd3, 0xa6, 0xb2, 0x49, 0x9b, 0x29, 0xce, 0xca, 0x6c, + 0x70, 0x56, 0x22, 0x44, 0xca, 0xcb, 0x62, 0xef, 0xa2, 0x10, 0xd9, 0x2e, 0x4d, 0x68, 0xb9, 0xff, + 0x9f, 0xd0, 0xd4, 0xef, 0x42, 0x68, 0x8f, 0xa0, 0xe6, 0x4c, 0x99, 0xf3, 0xa9, 0x35, 0x0e, 0xd8, + 0x67, 0x31, 0xf3, 0x9c, 0xd7, 0x58, 0x77, 0x2a, 0xad, 0x22, 0x7c, 0x9a, 0xa0, 0x2b, 0xe6, 0x1b, + 0x33, 0x86, 0xe4, 0x9c, 0x95, 0xcc, 0x77, 0xca, 0xd8, 0x1a, 0xf3, 0x71, 0x69, 0x11, 0xa5, 0x92, + 0xf9, 0xb8, 0x78, 0xf9, 0x42, 0x38, 0xc8, 0x62, 0xda, 0xda, 0x0b, 0xd1, 0x42, 0xfe, 0x7a, 0x08, + 0xd5, 0xb9, 0xeb, 0xb9, 0xf3, 0x78, 0x6e, 0x21, 0x1a, 0x62, 0xc5, 0xa8, 0xb4, 0x22, 0xd1, 0x01, + 0x82, 0x9c, 0x13, 0x03, 0xe6, 0xf8, 0xaf, 0x58, 0x60, 0x45, 0xd3, 0x80, 0x85, 0x53, 0x7f, 0x26, + 0x78, 0x56, 0xa5, 0xba, 0x14, 0x0c, 0x13, 0x7c, 0x83, 0x8d, 0xcb, 0x9b, 0x6c, 0x9c, 0x62, 0xf2, + 0x4a, 0x9a, 0xc9, 0xeb, 0x7f, 0xcb, 0x43, 0x6d, 0x59, 0x06, 0xbc, 0xde, 0xe2, 0x90, 0x9c, 0x42, + 0x4d, 0x24, 0x93, 0x63, 0xd6, 0x9c, 0x45, 0xb6, 0xe4, 0xaf, 0xbb, 0xb2, 0xf9, 0x52, 0x75, 0xb3, + 0x46, 0x60, 0x95, 0x71, 0xaa, 0xa0, 0x7e, 0x99, 0x66, 0xb1, 0xa3, 0x4d, 0x6b, 0x71, 0x5c, 0x83, + 0xeb, 0xa6, 0x88, 0xec, 0x29, 0x68, 0x09, 0x13, 0x86, 0x46, 0x16, 0xdb, 0xbe, 0xb6, 0xc1, 0x80, + 0xcf, 0x73, 0xfc, 0x50, 0xba, 0xd2, 0xdb, 0xca, 0x7e, 0xb9, 0xed, 0xec, 0x47, 0x81, 0x88, 0x80, + 0x04, 0xcc, 0x61, 0xee, 0x2b, 0xf6, 0x1d, 0x68, 0x0d, 0xed, 0xa9, 0x30, 0x97, 0xb4, 0xb6, 0xce, + 0x55, 0xf9, 0x77, 0x71, 0xd5, 0x19, 0x94, 0x9d, 0x38, 0xc0, 0x62, 0xc6, 0x83, 0x0b, 0x3b, 0x1c, + 0x5c, 0x92, 0x96, 0xb7, 0x91, 0x54, 0x71, 0x2b, 0x49, 0x99, 0x50, 0xe6, 0x46, 0xf6, 0xcc, 0x12, + 0xf9, 0xd0, 0x30, 0x1f, 0xf5, 0x5b, 0xf2, 0x41, 0x51, 0x55, 0x64, 0xa4, 0x14, 0xac, 0x16, 0xdf, + 0x03, 0xd7, 0x8d, 0x41, 0x5b, 0x66, 0x7f, 0x9d, 0xe7, 0x2a, 0xa0, 0x09, 0x6e, 0x3b, 0xef, 0x9e, + 0xe9, 0x0a, 0x12, 0xd7, 0x65, 0xb7, 0xcb, 0x17, 0x19, 0xa2, 0x43, 0xb9, 0xdf, 0xa4, 0xc3, 0xf3, + 0x66, 0xc7, 0x92, 0x8c, 0x97, 0x70, 0x5f, 0x8e, 0xff, 0x6a, 0xf7, 0xba, 0xa6, 0xae, 0xa6, 0x58, + 0x30, 0x5f, 0xff, 0x08, 0x4a, 0x6b, 0xb7, 0x22, 0x05, 0xc8, 0x76, 0xcd, 0x4f, 0xf4, 0x3d, 0x52, + 0x83, 0x52, 0xb2, 0x17, 0x07, 0xf0, 0x24, 0xf3, 0xf7, 0xfd, 0x73, 0x8a, 0x9c, 0xaa, 0x81, 0x8a, + 0x7c, 0xa9, 0x67, 0xeb, 0x5f, 0x2b, 0x70, 0xa7, 0x35, 0xb5, 0x67, 0x33, 0xe6, 0x4d, 0xd8, 0xc7, + 0x31, 0x0b, 0x23, 0xd7, 0xf7, 0x36, 0xc6, 0x45, 0x65, 0x73, 0x5c, 0x5c, 0x1f, 0x34, 0x33, 0xe9, + 0x41, 0x93, 0xcf, 0xb0, 0xd3, 0xd8, 0xfb, 0x54, 0x4e, 0x92, 0x59, 0xc1, 0x13, 0x08, 0x89, 0x49, + 0xf2, 0x2e, 0xa8, 0x9e, 0xef, 0x39, 0x4c, 0x0e, 0xa1, 0x62, 0x41, 0x3e, 0x80, 0x0a, 0xfb, 0x62, + 0xc1, 0x9c, 0xc8, 0xb2, 0xbd, 0xf0, 0x73, 0x16, 0x60, 0xd1, 0x6a, 0xb4, 0x2c, 0xc0, 0x26, 0x62, + 0xf5, 0x3f, 0x66, 0xe1, 0x7e, 0x3f, 0xf0, 0xfd, 0x71, 0x6f, 0x4c, 0xd9, 0x62, 0xe6, 0x3a, 0x76, + 0xc4, 0x96, 0xbe, 0x93, 0xdf, 0x40, 0xf1, 0x33, 0xe9, 0xbf, 0xec, 0x6a, 0x23, 0xe9, 0xad, 0xcd, + 0xfb, 0xad, 0x8f, 0x26, 0x89, 0x0d, 0xf9, 0x1d, 0x54, 0x9d, 0x44, 0x51, 0xd4, 0x6f, 0x66, 0x87, + 0xfa, 0xad, 0x2c, 0x6d, 0xb1, 0x82, 0x53, 0xd4, 0x94, 0xdd, 0x18, 0x32, 0xb7, 0x94, 0x77, 0x6e, + 0x6b, 0x79, 0x1f, 0x42, 0x09, 0xe3, 0x9c, 0x8a, 0x09, 0x70, 0x48, 0x44, 0x84, 0xfc, 0x76, 0x6d, + 0xdc, 0x11, 0x3e, 0xe7, 0x77, 0xf0, 0xb9, 0x9c, 0x0c, 0x45, 0xc9, 0xd7, 0xcc, 0xc6, 0xe8, 0x54, + 0xd8, 0x32, 0x3a, 0xd5, 0xbf, 0x52, 0xe0, 0x1e, 0x6f, 0xac, 0x1b, 0x41, 0x0d, 0xd3, 0x0f, 0xa9, + 0xb2, 0xf1, 0x90, 0x5e, 0x24, 0x5f, 0x10, 0x49, 0xc0, 0x43, 0x23, 0x83, 0x64, 0x72, 0x20, 0xb3, + 0x84, 0x0f, 0xc4, 0xcd, 0x5d, 0x25, 0x21, 0x56, 0xd1, 0x78, 0x89, 0xd6, 0xff, 0x99, 0x81, 0x1f, + 0xde, 0x62, 0xf1, 0x6e, 0x3f, 0xd2, 0xa5, 0x9d, 0xd9, 0x2c, 0xed, 0x4d, 0x2a, 0xc8, 0xde, 0xa4, + 0x82, 0x87, 0x50, 0x4d, 0xee, 0x20, 0x5f, 0xc3, 0x9c, 0x78, 0xe9, 0x12, 0x54, 0x3c, 0x88, 0xcf, + 0x40, 0x5b, 0x5d, 0x55, 0xc5, 0xab, 0xde, 0x5e, 0x90, 0x92, 0xf5, 0x97, 0x06, 0x9c, 0x4b, 0xe5, + 0x99, 0xbb, 0xe7, 0x35, 0xf1, 0x16, 0xd3, 0xba, 0x9d, 0xb8, 0x0a, 0xb7, 0x11, 0xd7, 0xb5, 0x02, + 0xf7, 0x5b, 0x38, 0x36, 0xac, 0xbf, 0x78, 0x94, 0xa1, 0x67, 0xff, 0x33, 0xb2, 0xef, 0xfa, 0x3a, + 0xfd, 0x00, 0x2a, 0x81, 0xd8, 0x26, 0x15, 0xda, 0xf2, 0x12, 0xe4, 0x4a, 0x67, 0x90, 0xac, 0xc5, + 0xb5, 0x77, 0x99, 0xa9, 0x4a, 0xd2, 0x12, 0xaf, 0xfd, 0x3e, 0x68, 0xab, 0xdb, 0xaa, 0x78, 0xdb, + 0x15, 0x50, 0xff, 0x8b, 0x02, 0x79, 0xca, 0xc2, 0x78, 0x16, 0x91, 0x47, 0x90, 0x73, 0xfc, 0x91, + 0xf8, 0x27, 0x40, 0x75, 0xf9, 0x21, 0x43, 0x59, 0xb8, 0xf0, 0xbd, 0x90, 0xb5, 0xfc, 0x11, 0xa3, + 0xa8, 0x40, 0x0c, 0x28, 0xcc, 0x59, 0x18, 0xda, 0x13, 0x96, 0x70, 0x9e, 0x5c, 0x92, 0x73, 0x7e, + 0x33, 0xa1, 0x2f, 0xbc, 0xce, 0xee, 0xd2, 0x84, 0x89, 0x29, 0x17, 0xfe, 0xd4, 0x81, 0xf2, 0xfa, + 0xd1, 0x9c, 0xb6, 0x07, 0x97, 0xad, 0x96, 0x39, 0x18, 0xe8, 0x7b, 0x64, 0x1f, 0xee, 0xf1, 0x21, + 0xb9, 0x39, 0xbc, 0xa4, 0xa6, 0x75, 0xda, 0xa3, 0x17, 0xcd, 0xa1, 0x65, 0x52, 0xda, 0xa3, 0xba, + 0x42, 0xee, 0xc3, 0x0f, 0x5a, 0xbd, 0x8b, 0xfe, 0xe5, 0xd0, 0xb4, 0x9a, 0xed, 0x36, 0x35, 0x07, + 0x03, 0x29, 0xca, 0xf0, 0xb7, 0xa0, 0x37, 0x7c, 0x61, 0x52, 0x09, 0xdc, 0x3d, 0xf9, 0x97, 0x02, + 0xe5, 0x33, 0x64, 0x1a, 0x16, 0xbc, 0xe2, 0x1f, 0xb0, 0xcf, 0xe0, 0xbd, 0x41, 0x7c, 0x35, 0x77, + 0xa3, 0xf4, 0xdc, 0x7c, 0x6f, 0xfb, 0x3b, 0xba, 0x5f, 0x59, 0x05, 0x89, 0x47, 0xf0, 0xd7, 0x50, + 0x19, 0x30, 0x6f, 0xd5, 0x9b, 0xe4, 0xc1, 0x9a, 0xdd, 0xcd, 0xf6, 0xdc, 0x34, 0xef, 0x02, 0xb9, + 0x59, 0x70, 0xe4, 0x68, 0xd9, 0x2a, 0xb7, 0xd4, 0xe2, 0xfe, 0x2d, 0xde, 0x3d, 0x7f, 0xf6, 0xe6, + 0xed, 0x81, 0xf2, 0xcd, 0xdb, 0x03, 0xe5, 0x3f, 0x6f, 0x0f, 0x94, 0xbf, 0x5e, 0x1f, 0x28, 0xff, + 0xb8, 0x3e, 0x50, 0xde, 0x5c, 0x1f, 0x28, 0x50, 0x71, 0xfd, 0xc6, 0x55, 0x34, 0x0e, 0x85, 0xe1, + 0x73, 0xc0, 0x18, 0xf4, 0x79, 0x72, 0xfa, 0xca, 0x1f, 0xc4, 0x7f, 0x9d, 0xae, 0xf2, 0x98, 0xac, + 0xa7, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x51, 0xfa, 0x97, 0xce, 0x9f, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1692,18 +1672,14 @@ func (m *Log) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if m.ChangeTime != nil { - { - size, err := m.ChangeTime.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGuard(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa + n1, err1 := github_com_tron_us_protobuf_types.StdTimeMarshalTo(m.ChangeTime, dAtA[i-github_com_tron_us_protobuf_types.SizeOfStdTime(m.ChangeTime):]) + if err1 != nil { + return 0, err1 } + i -= n1 + i = encodeVarintGuard(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1937,18 +1913,16 @@ func (m *Contract) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - if m.Contract != nil { - { - size, err := m.Contract.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGuard(dAtA, i, uint64(size)) + { + size, err := m.ContractMeta.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0xa + i -= size + i = encodeVarintGuard(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -2164,18 +2138,16 @@ func (m *FileStoreStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - if m.FileStoreMeta != nil { - { - size, err := m.FileStoreMeta.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGuard(dAtA, i, uint64(size)) + { + size, err := m.FileStoreMeta.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0xa + i -= size + i = encodeVarintGuard(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -2307,18 +2279,16 @@ func (m *ProofOfReplicateChallenge) MarshalToSizedBuffer(dAtA []byte) (int, erro i = encodeVarintGuard(dAtA, i, uint64(n13)) i-- dAtA[i] = 0x12 - if m.Question != nil { - { - size, err := m.Question.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGuard(dAtA, i, uint64(size)) + { + size, err := m.ChallengeQuestion.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0xa + i -= size + i = encodeVarintGuard(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -2579,10 +2549,8 @@ func (m *Log) Size() (n int) { } var l int _ = l - if m.ChangeTime != nil { - l = m.ChangeTime.Size() - n += 1 + l + sovGuard(uint64(l)) - } + l = github_com_tron_us_protobuf_types.SizeOfStdTime(m.ChangeTime) + n += 1 + l + sovGuard(uint64(l)) l = len(m.OriginatorPid) if l > 0 { n += 1 + l + sovGuard(uint64(l)) @@ -2668,10 +2636,8 @@ func (m *Contract) Size() (n int) { } var l int _ = l - if m.Contract != nil { - l = m.Contract.Size() - n += 1 + l + sovGuard(uint64(l)) - } + l = m.ContractMeta.Size() + n += 1 + l + sovGuard(uint64(l)) if m.State != 0 { n += 1 + sovGuard(uint64(m.State)) } @@ -2774,10 +2740,8 @@ func (m *FileStoreStatus) Size() (n int) { } var l int _ = l - if m.FileStoreMeta != nil { - l = m.FileStoreMeta.Size() - n += 1 + l + sovGuard(uint64(l)) - } + l = m.FileStoreMeta.Size() + n += 1 + l + sovGuard(uint64(l)) if m.State != 0 { n += 1 + sovGuard(uint64(m.State)) } @@ -2859,10 +2823,8 @@ func (m *ProofOfReplicateChallenge) Size() (n int) { } var l int _ = l - if m.Question != nil { - l = m.Question.Size() - n += 1 + l + sovGuard(uint64(l)) - } + l = m.ChallengeQuestion.Size() + n += 1 + l + sovGuard(uint64(l)) l = github_com_tron_us_protobuf_types.SizeOfStdTime(m.ChallengeTime) n += 1 + l + sovGuard(uint64(l)) l = len(m.GuardPid) @@ -3065,10 +3027,7 @@ func (m *Log) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.ChangeTime == nil { - m.ChangeTime = &types.Timestamp{} - } - if err := m.ChangeTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_tron_us_protobuf_types.StdTimeUnmarshal(&m.ChangeTime, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3669,7 +3628,7 @@ func (m *Contract) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Contract", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContractMeta", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3696,10 +3655,7 @@ func (m *Contract) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Contract == nil { - m.Contract = &ContractMeta{} - } - if err := m.Contract.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.ContractMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4488,9 +4444,6 @@ func (m *FileStoreStatus) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.FileStoreMeta == nil { - m.FileStoreMeta = &FileStoreMeta{} - } if err := m.FileStoreMeta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4543,7 +4496,7 @@ func (m *FileStoreStatus) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Contracts = append(m.Contracts, &Contract{}) + m.Contracts = append(m.Contracts, Contract{}) if err := m.Contracts[len(m.Contracts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5058,7 +5011,7 @@ func (m *ProofOfReplicateChallenge) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Question", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ChallengeQuestion", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5085,10 +5038,7 @@ func (m *ProofOfReplicateChallenge) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Question == nil { - m.Question = &ChallengeQuestion{} - } - if err := m.Question.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.ChallengeQuestion.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5405,7 +5355,7 @@ func (m *FileChallengeQuestions) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ShardQuestions = append(m.ShardQuestions, &ShardChallengeQuestions{}) + m.ShardQuestions = append(m.ShardQuestions, ShardChallengeQuestions{}) if err := m.ShardQuestions[len(m.ShardQuestions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5608,7 +5558,7 @@ func (m *ShardChallengeQuestions) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Questions = append(m.Questions, &ChallengeQuestion{}) + m.Questions = append(m.Questions, ChallengeQuestion{}) if err := m.Questions[len(m.Questions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/protos/guard/guard.proto b/protos/guard/guard.proto index a749013..2c6dc58 100644 --- a/protos/guard/guard.proto +++ b/protos/guard/guard.proto @@ -26,7 +26,10 @@ service GuardService { } message Log { - google.protobuf.Timestamp change_time = 1; + google.protobuf.Timestamp change_time = 1 [ + (gogoproto.nullable) = false, + (gogoproto.stdtime) = true + ]; string originator_pid = 2; string change = 3; } @@ -70,7 +73,10 @@ message ContractMeta { message Contract { //the contract executor record, changed frequently after proposal - ContractMeta contract = 1; + ContractMeta contract = 1 [ + (gogoproto.embed) = true, + (gogoproto.nullable) = false + ]; enum ContractState { DRAFT = 0; //the contract was draft, but the escrow service did not received the money SIGNED = 1; // the escrow service received the money from renter, the contract was start. @@ -122,7 +128,10 @@ message FileStoreMeta { } message FileStoreStatus { - FileStoreMeta file_store_meta = 1; + FileStoreMeta file_store_meta = 1 [ + (gogoproto.embed) = true, + (gogoproto.nullable) = false + ]; enum MetaState { DRAFT = 0; //the proposal was submit by renter UPLOADING = 1; //all related contracts were signed, and renter is uploading shards and questions @@ -133,7 +142,7 @@ message FileStoreStatus { CANCELED = 6; //reserved for the cancel contract } MetaState state = 2; - repeated Contract contracts = 3; + repeated Contract contracts = 3 [(gogoproto.nullable) = false]; bytes renter_signature = 4; //rental's signature for the first full file status with contracts google.protobuf.Timestamp guard_receive_time = 5 [ (gogoproto.nullable) = false, @@ -165,7 +174,10 @@ message ChallengeQuestion { } message ProofOfReplicateChallenge { - ChallengeQuestion question = 1; //of course expect_answer should be clear before send to the host` + ChallengeQuestion question = 1 [ + (gogoproto.embed) = true, + (gogoproto.nullable) = false + ]; //of course expect_answer should be clear before send to the host` google.protobuf.Timestamp challenge_time = 2 [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true @@ -182,7 +194,7 @@ message ProofOfReplicateChallenge { message FileChallengeQuestions { string file_hash = 1; - repeated ShardChallengeQuestions shard_questions = 2; + repeated ShardChallengeQuestions shard_questions = 2 [(gogoproto.nullable) = false]; } message ShardChallengeQuestions { @@ -190,7 +202,7 @@ message ShardChallengeQuestions { string shard_hash = 2; string preparer_pid = 3; //challenge questions preparer's peerId, it is renter peerId at phase 1 int32 question_count = 4; - repeated ChallengeQuestion questions = 5; + repeated ChallengeQuestion questions = 5 [(gogoproto.nullable) = false]; google.protobuf.Timestamp prepare_time = 6 [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true From 7861ef55bdd48a445dacca4353b111ba62d8e077 Mon Sep 17 00:00:00 2001 From: Junlin Gao Date: Tue, 26 Nov 2019 11:44:45 -0800 Subject: [PATCH 4/4] change to address code review comments --- protos/guard/guard.pb.go | 272 +++++++++++++++++++-------------------- protos/guard/guard.proto | 6 +- 2 files changed, 139 insertions(+), 139 deletions(-) diff --git a/protos/guard/guard.pb.go b/protos/guard/guard.pb.go index cce6abf..a26d662 100644 --- a/protos/guard/guard.pb.go +++ b/protos/guard/guard.pb.go @@ -724,7 +724,7 @@ func (*FileStoreMeta) XXX_MessageName() string { type FileStoreStatus struct { FileStoreMeta `protobuf:"bytes,1,opt,name=file_store_meta,json=fileStoreMeta,proto3,embedded=file_store_meta" json:"file_store_meta" pg:"file_store_meta"` State FileStoreStatus_MetaState `protobuf:"varint,2,opt,name=state,proto3,enum=guard.FileStoreStatus_MetaState" json:"state,omitempty" pg:"state"` - Contracts []Contract `protobuf:"bytes,3,rep,name=contracts,proto3" json:"contracts" pg:"contracts"` + Contracts []*Contract `protobuf:"bytes,3,rep,name=contracts,proto3" json:"contracts,omitempty" pg:"contracts"` RenterSignature []byte `protobuf:"bytes,4,opt,name=renter_signature,json=renterSignature,proto3" json:"renter_signature,omitempty" pg:"renter_signature"` GuardReceiveTime time.Time `protobuf:"bytes,5,opt,name=guard_receive_time,json=guardReceiveTime,proto3,stdtime" json:"guard_receive_time" pg:"guard_receive_time"` ChangeLog []*Log `protobuf:"bytes,6,rep,name=change_log,json=changeLog,proto3" json:"change_log,omitempty" pg:"change_log"` @@ -778,7 +778,7 @@ func (m *FileStoreStatus) GetState() FileStoreStatus_MetaState { return FileStoreStatus_DRAFT } -func (m *FileStoreStatus) GetContracts() []Contract { +func (m *FileStoreStatus) GetContracts() []*Contract { if m != nil { return m.Contracts } @@ -1021,11 +1021,11 @@ func (*ProofOfReplicateChallenge) XXX_MessageName() string { } type FileChallengeQuestions struct { - FileHash string `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"` - ShardQuestions []ShardChallengeQuestions `protobuf:"bytes,2,rep,name=shard_questions,json=shardQuestions,proto3" json:"shard_questions" pg:"shard_questions"` - XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` - XXX_unrecognized []byte `json:"-" pg:"-"` - XXX_sizecache int32 `json:"-" pg:"-"` + FileHash string `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"` + ShardQuestions []*ShardChallengeQuestions `protobuf:"bytes,2,rep,name=shard_questions,json=shardQuestions,proto3" json:"shard_questions,omitempty" pg:"shard_questions"` + XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` + XXX_unrecognized []byte `json:"-" pg:"-"` + XXX_sizecache int32 `json:"-" pg:"-"` } func (m *FileChallengeQuestions) Reset() { *m = FileChallengeQuestions{} } @@ -1068,7 +1068,7 @@ func (m *FileChallengeQuestions) GetFileHash() string { return "" } -func (m *FileChallengeQuestions) GetShardQuestions() []ShardChallengeQuestions { +func (m *FileChallengeQuestions) GetShardQuestions() []*ShardChallengeQuestions { if m != nil { return m.ShardQuestions } @@ -1080,16 +1080,16 @@ func (*FileChallengeQuestions) XXX_MessageName() string { } type ShardChallengeQuestions struct { - FileHash string `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"` - ShardHash string `protobuf:"bytes,2,opt,name=shard_hash,json=shardHash,proto3" json:"shard_hash,omitempty" pg:"shard_hash"` - PreparerPid string `protobuf:"bytes,3,opt,name=preparer_pid,json=preparerPid,proto3" json:"preparer_pid,omitempty" pg:"preparer_pid"` - QuestionCount int32 `protobuf:"varint,4,opt,name=question_count,json=questionCount,proto3" json:"question_count,omitempty" pg:"question_count"` - Questions []ChallengeQuestion `protobuf:"bytes,5,rep,name=questions,proto3" json:"questions" pg:"questions"` - PrepareTime time.Time `protobuf:"bytes,6,opt,name=prepare_time,json=prepareTime,proto3,stdtime" json:"prepare_time" pg:"prepare_time"` - PreparerSignature []byte `protobuf:"bytes,7,opt,name=preparer_signature,json=preparerSignature,proto3" json:"preparer_signature,omitempty" pg:"preparer_signature"` - XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` - XXX_unrecognized []byte `json:"-" pg:"-"` - XXX_sizecache int32 `json:"-" pg:"-"` + FileHash string `protobuf:"bytes,1,opt,name=file_hash,json=fileHash,proto3" json:"file_hash,omitempty" pg:"file_hash"` + ShardHash string `protobuf:"bytes,2,opt,name=shard_hash,json=shardHash,proto3" json:"shard_hash,omitempty" pg:"shard_hash"` + PreparerPid string `protobuf:"bytes,3,opt,name=preparer_pid,json=preparerPid,proto3" json:"preparer_pid,omitempty" pg:"preparer_pid"` + QuestionCount int32 `protobuf:"varint,4,opt,name=question_count,json=questionCount,proto3" json:"question_count,omitempty" pg:"question_count"` + Questions []*ChallengeQuestion `protobuf:"bytes,5,rep,name=questions,proto3" json:"questions,omitempty" pg:"questions"` + PrepareTime time.Time `protobuf:"bytes,6,opt,name=prepare_time,json=prepareTime,proto3,stdtime" json:"prepare_time" pg:"prepare_time"` + PreparerSignature []byte `protobuf:"bytes,7,opt,name=preparer_signature,json=preparerSignature,proto3" json:"preparer_signature,omitempty" pg:"preparer_signature"` + XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` + XXX_unrecognized []byte `json:"-" pg:"-"` + XXX_sizecache int32 `json:"-" pg:"-"` } func (m *ShardChallengeQuestions) Reset() { *m = ShardChallengeQuestions{} } @@ -1153,7 +1153,7 @@ func (m *ShardChallengeQuestions) GetQuestionCount() int32 { return 0 } -func (m *ShardChallengeQuestions) GetQuestions() []ChallengeQuestion { +func (m *ShardChallengeQuestions) GetQuestions() []*ChallengeQuestion { if m != nil { return m.Questions } @@ -1366,120 +1366,120 @@ func init() { proto.RegisterFile("protos/guard/guard.proto", fileDescriptor_ad5b func init() { golang_proto.RegisterFile("protos/guard/guard.proto", fileDescriptor_ad5b6eccdc9ebee8) } var fileDescriptor_ad5b6eccdc9ebee8 = []byte{ - // 1807 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x92, 0x5c, 0x92, 0xfb, 0xf8, 0x6f, 0x3d, 0x71, 0xdd, 0xb5, 0x1a, 0x4b, 0x2a, 0x03, - 0xd7, 0x72, 0x8b, 0xd0, 0x85, 0x5c, 0x14, 0x28, 0xe0, 0x36, 0xa0, 0xc9, 0x95, 0xac, 0x96, 0x22, - 0x99, 0x21, 0x85, 0xd4, 0xbd, 0x2c, 0x56, 0xcb, 0x21, 0xb9, 0x08, 0xb9, 0xcb, 0xec, 0x1f, 0x27, - 0xce, 0xb1, 0xc8, 0xad, 0x97, 0x9e, 0x8a, 0x7e, 0x80, 0x1e, 0x9a, 0x6f, 0xd1, 0xa3, 0x8f, 0xb9, - 0xf4, 0x54, 0x20, 0x2d, 0xac, 0x2f, 0x52, 0xcc, 0x9b, 0x59, 0x92, 0x4b, 0x51, 0x2e, 0x98, 0x22, - 0x17, 0x81, 0xf3, 0x7b, 0xef, 0xcd, 0xbc, 0x79, 0x7f, 0x7e, 0xf3, 0x56, 0x60, 0x2c, 0x02, 0x3f, - 0xf2, 0xc3, 0x27, 0x93, 0xd8, 0x0e, 0x46, 0xe2, 0x6f, 0x03, 0x21, 0xa2, 0xe2, 0x62, 0xff, 0xe7, - 0x13, 0x37, 0x9a, 0xc6, 0x57, 0x0d, 0xc7, 0x9f, 0x3f, 0x89, 0x02, 0xdf, 0xfb, 0x30, 0x0e, 0x9f, - 0xa0, 0xc2, 0x55, 0x3c, 0x7e, 0x32, 0xf1, 0x27, 0x3e, 0x2e, 0xf0, 0x97, 0x30, 0xdc, 0x3f, 0x9c, - 0xf8, 0xfe, 0x64, 0xc6, 0x56, 0x5a, 0x91, 0x3b, 0x67, 0x61, 0x64, 0xcf, 0x17, 0x42, 0xa1, 0xfe, - 0x27, 0x05, 0xb2, 0x1d, 0x7f, 0x42, 0x4c, 0x28, 0x39, 0x53, 0xdb, 0x9b, 0x30, 0x8b, 0x6b, 0x18, - 0xca, 0x91, 0x72, 0x5c, 0x3a, 0xd9, 0x6f, 0x08, 0xf3, 0x46, 0x62, 0xde, 0x18, 0x26, 0xe6, 0xcf, - 0x8b, 0x6f, 0xbe, 0x3d, 0xdc, 0xfb, 0xf3, 0xbf, 0x0f, 0x15, 0x0a, 0xc2, 0x90, 0x8b, 0xc8, 0x43, - 0xa8, 0xfa, 0x81, 0x3b, 0x71, 0x3d, 0x3b, 0xf2, 0x03, 0x6b, 0xe1, 0x8e, 0x8c, 0xcc, 0x91, 0x72, - 0xac, 0xd1, 0xca, 0x0a, 0xed, 0xbb, 0x23, 0x72, 0x0f, 0xf2, 0xc2, 0xc8, 0xc8, 0xa2, 0x58, 0xae, - 0xea, 0x5f, 0xab, 0x50, 0x6e, 0xf9, 0x5e, 0x14, 0xd8, 0x4e, 0x74, 0xc1, 0x22, 0x9b, 0x1c, 0x42, - 0xc9, 0x91, 0x6b, 0xcb, 0x1d, 0xa1, 0x5b, 0x1a, 0x85, 0x04, 0x3a, 0x1f, 0x91, 0x07, 0x00, 0x01, - 0xf3, 0x22, 0xb6, 0x7e, 0x98, 0x26, 0x10, 0x7e, 0xd0, 0x7d, 0x28, 0x4e, 0xfd, 0x30, 0x42, 0xa1, - 0x38, 0xaa, 0xc0, 0xd7, 0x5c, 0xf4, 0x00, 0x20, 0x9c, 0xda, 0xc1, 0xc8, 0x9a, 0xda, 0xe1, 0xd4, - 0xc8, 0x09, 0x4b, 0x44, 0x5e, 0xd8, 0xe1, 0x94, 0x9f, 0x2c, 0xc4, 0xae, 0x37, 0x62, 0x5f, 0x18, - 0xea, 0x91, 0x72, 0xac, 0x52, 0x61, 0x71, 0xce, 0x11, 0xf2, 0x13, 0xa8, 0x09, 0x85, 0xb1, 0x3b, - 0x63, 0x56, 0xe8, 0x7e, 0xc9, 0x8c, 0xfc, 0x91, 0x72, 0x9c, 0xa5, 0x15, 0x84, 0x4f, 0xdd, 0x19, - 0x1b, 0xb8, 0x5f, 0x32, 0xf2, 0x23, 0xd0, 0x50, 0x03, 0x8f, 0x29, 0xe0, 0x31, 0x45, 0x0e, 0xe0, - 0x29, 0x2d, 0xe1, 0xbe, 0x15, 0x46, 0x76, 0x10, 0x19, 0xc5, 0x1d, 0xa2, 0x8e, 0x97, 0x1c, 0x70, - 0x33, 0xf2, 0x11, 0x14, 0x71, 0x13, 0xe6, 0x8d, 0x0c, 0x6d, 0x87, 0x2d, 0x0a, 0xdc, 0xca, 0xf4, - 0x46, 0xdc, 0x45, 0x2c, 0x30, 0x0c, 0x13, 0x08, 0x17, 0x11, 0x90, 0x71, 0x62, 0xa1, 0x13, 0xf8, - 0x9f, 0xa3, 0xb4, 0x24, 0xe2, 0x24, 0x10, 0x2e, 0xbe, 0x0b, 0xea, 0x22, 0x70, 0x1d, 0x66, 0x94, - 0xf1, 0xf2, 0x62, 0xc1, 0x13, 0x6c, 0xcf, 0xfd, 0xd8, 0x8b, 0x8c, 0x0a, 0xc2, 0x72, 0x45, 0x7e, - 0x06, 0x77, 0x1c, 0x7f, 0x36, 0xb3, 0x23, 0x16, 0xd8, 0x33, 0x4b, 0xaa, 0x54, 0x51, 0x45, 0x5f, - 0x09, 0x9a, 0x42, 0xd9, 0x84, 0xda, 0xc2, 0x7e, 0xed, 0xc7, 0x91, 0x15, 0x3a, 0x53, 0x36, 0x8a, - 0x67, 0xcc, 0xa8, 0x1d, 0x29, 0xc7, 0xd5, 0x93, 0xf7, 0x1b, 0xa2, 0x39, 0xd6, 0x4b, 0xa5, 0x31, - 0x90, 0x3a, 0xb4, 0x2a, 0x8c, 0x92, 0x35, 0xcf, 0xa4, 0x17, 0xcf, 0x2d, 0x81, 0x86, 0x86, 0x2e, - 0x32, 0xe9, 0xc5, 0xf3, 0xbe, 0x40, 0xea, 0xbf, 0x80, 0xe2, 0x52, 0xb9, 0x04, 0x85, 0x8b, 0x5e, - 0x77, 0xf8, 0xa2, 0xf3, 0x52, 0xdf, 0x23, 0x15, 0xd0, 0x3e, 0xbe, 0x6c, 0xd2, 0xa1, 0x49, 0x3b, - 0x2f, 0x75, 0x85, 0x94, 0xa1, 0xd8, 0xec, 0x76, 0x2f, 0x9b, 0x9d, 0xce, 0x4b, 0x3d, 0x53, 0xff, - 0xbb, 0x0a, 0xc5, 0xc4, 0x01, 0xf2, 0x2b, 0x28, 0x26, 0x45, 0x29, 0x7b, 0xe7, 0xbd, 0x2d, 0x3e, - 0x8a, 0xd8, 0x7f, 0xf3, 0xed, 0xa1, 0x42, 0x97, 0xea, 0xe4, 0x29, 0xa8, 0x61, 0x64, 0x47, 0x0c, - 0x8b, 0xb7, 0x7a, 0xf2, 0x60, 0xc3, 0x6e, 0xf9, 0x63, 0xc0, 0x95, 0xa8, 0xd0, 0x25, 0x8f, 0x41, - 0x97, 0x65, 0x1f, 0xba, 0x13, 0xcf, 0x8e, 0xe2, 0x40, 0xb4, 0x52, 0x99, 0xd6, 0x04, 0x3e, 0x48, - 0x60, 0xde, 0x92, 0xd8, 0x02, 0x2b, 0xc5, 0x1c, 0x2a, 0x56, 0x38, 0xba, 0x52, 0xa3, 0x40, 0x64, - 0x9a, 0xb9, 0x22, 0x1b, 0x09, 0x1e, 0x50, 0x77, 0x28, 0x27, 0x5d, 0xd8, 0x0f, 0xd0, 0x1c, 0xd9, - 0xe0, 0x31, 0xe8, 0x6b, 0x7b, 0x8a, 0xc3, 0xf3, 0xc2, 0xcb, 0x95, 0xae, 0x38, 0xfe, 0x31, 0x48, - 0x1a, 0xb1, 0x66, 0xfe, 0xc4, 0x28, 0x1c, 0x65, 0x8f, 0x4b, 0x27, 0x20, 0x43, 0xd1, 0xf1, 0x27, - 0x54, 0x13, 0x52, 0x4e, 0x55, 0x5d, 0xd0, 0x67, 0x76, 0x18, 0x59, 0x73, 0x7f, 0xe4, 0x8e, 0x5f, - 0x0b, 0x3f, 0x77, 0xe9, 0x9c, 0x2a, 0xb7, 0xbe, 0x40, 0x63, 0xf4, 0xf2, 0x11, 0xd4, 0x44, 0xf5, - 0xaf, 0x9c, 0xd4, 0xd0, 0xc9, 0x2a, 0xc2, 0x2b, 0x1f, 0x7f, 0x0c, 0xe5, 0x45, 0xc0, 0x16, 0x76, - 0x20, 0xd9, 0x46, 0x74, 0x4a, 0x29, 0xc1, 0x78, 0x37, 0x7c, 0x08, 0x64, 0xa9, 0xb2, 0xda, 0xae, - 0x84, 0xdb, 0xdd, 0x49, 0x24, 0xcb, 0x1d, 0xeb, 0x0c, 0x2a, 0xa9, 0xf4, 0x12, 0x0d, 0xd4, 0x36, - 0x6d, 0x9e, 0x0e, 0xf5, 0x3d, 0x02, 0x90, 0x1f, 0x9c, 0x9f, 0x75, 0xcd, 0xb6, 0xa8, 0xbc, 0xcb, - 0x7e, 0xa7, 0xd7, 0x6c, 0x9b, 0x6d, 0x3d, 0x43, 0x8a, 0x90, 0xeb, 0xf4, 0x06, 0x43, 0x3d, 0xcb, - 0xf1, 0x56, 0xb3, 0xdb, 0x32, 0x3b, 0x66, 0x5b, 0xcf, 0x71, 0x8b, 0x56, 0xa7, 0x37, 0x30, 0xdb, - 0xba, 0xca, 0xeb, 0x98, 0x9a, 0x5d, 0xf3, 0x13, 0xb3, 0xad, 0xe7, 0xeb, 0x5f, 0xe5, 0xa0, 0x82, - 0x7c, 0x14, 0xf9, 0x01, 0x43, 0x5e, 0x4d, 0xd3, 0xa6, 0xb2, 0x49, 0x9b, 0x29, 0xce, 0xca, 0x6c, - 0x70, 0x56, 0x22, 0x44, 0xca, 0xcb, 0x62, 0xef, 0xa2, 0x10, 0xd9, 0x2e, 0x4d, 0x68, 0xb9, 0xff, - 0x9f, 0xd0, 0xd4, 0xef, 0x42, 0x68, 0x8f, 0xa0, 0xe6, 0x4c, 0x99, 0xf3, 0xa9, 0x35, 0x0e, 0xd8, - 0x67, 0x31, 0xf3, 0x9c, 0xd7, 0x58, 0x77, 0x2a, 0xad, 0x22, 0x7c, 0x9a, 0xa0, 0x2b, 0xe6, 0x1b, - 0x33, 0x86, 0xe4, 0x9c, 0x95, 0xcc, 0x77, 0xca, 0xd8, 0x1a, 0xf3, 0x71, 0x69, 0x11, 0xa5, 0x92, - 0xf9, 0xb8, 0x78, 0xf9, 0x42, 0x38, 0xc8, 0x62, 0xda, 0xda, 0x0b, 0xd1, 0x42, 0xfe, 0x7a, 0x08, - 0xd5, 0xb9, 0xeb, 0xb9, 0xf3, 0x78, 0x6e, 0x21, 0x1a, 0x62, 0xc5, 0xa8, 0xb4, 0x22, 0xd1, 0x01, - 0x82, 0x9c, 0x13, 0x03, 0xe6, 0xf8, 0xaf, 0x58, 0x60, 0x45, 0xd3, 0x80, 0x85, 0x53, 0x7f, 0x26, - 0x78, 0x56, 0xa5, 0xba, 0x14, 0x0c, 0x13, 0x7c, 0x83, 0x8d, 0xcb, 0x9b, 0x6c, 0x9c, 0x62, 0xf2, - 0x4a, 0x9a, 0xc9, 0xeb, 0x7f, 0xcb, 0x43, 0x6d, 0x59, 0x06, 0xbc, 0xde, 0xe2, 0x90, 0x9c, 0x42, - 0x4d, 0x24, 0x93, 0x63, 0xd6, 0x9c, 0x45, 0xb6, 0xe4, 0xaf, 0xbb, 0xb2, 0xf9, 0x52, 0x75, 0xb3, - 0x46, 0x60, 0x95, 0x71, 0xaa, 0xa0, 0x7e, 0x99, 0x66, 0xb1, 0xa3, 0x4d, 0x6b, 0x71, 0x5c, 0x83, - 0xeb, 0xa6, 0x88, 0xec, 0x29, 0x68, 0x09, 0x13, 0x86, 0x46, 0x16, 0xdb, 0xbe, 0xb6, 0xc1, 0x80, - 0xcf, 0x73, 0xfc, 0x50, 0xba, 0xd2, 0xdb, 0xca, 0x7e, 0xb9, 0xed, 0xec, 0x47, 0x81, 0x88, 0x80, - 0x04, 0xcc, 0x61, 0xee, 0x2b, 0xf6, 0x1d, 0x68, 0x0d, 0xed, 0xa9, 0x30, 0x97, 0xb4, 0xb6, 0xce, - 0x55, 0xf9, 0x77, 0x71, 0xd5, 0x19, 0x94, 0x9d, 0x38, 0xc0, 0x62, 0xc6, 0x83, 0x0b, 0x3b, 0x1c, - 0x5c, 0x92, 0x96, 0xb7, 0x91, 0x54, 0x71, 0x2b, 0x49, 0x99, 0x50, 0xe6, 0x46, 0xf6, 0xcc, 0x12, - 0xf9, 0xd0, 0x30, 0x1f, 0xf5, 0x5b, 0xf2, 0x41, 0x51, 0x55, 0x64, 0xa4, 0x14, 0xac, 0x16, 0xdf, - 0x03, 0xd7, 0x8d, 0x41, 0x5b, 0x66, 0x7f, 0x9d, 0xe7, 0x2a, 0xa0, 0x09, 0x6e, 0x3b, 0xef, 0x9e, - 0xe9, 0x0a, 0x12, 0xd7, 0x65, 0xb7, 0xcb, 0x17, 0x19, 0xa2, 0x43, 0xb9, 0xdf, 0xa4, 0xc3, 0xf3, - 0x66, 0xc7, 0x92, 0x8c, 0x97, 0x70, 0x5f, 0x8e, 0xff, 0x6a, 0xf7, 0xba, 0xa6, 0xae, 0xa6, 0x58, - 0x30, 0x5f, 0xff, 0x08, 0x4a, 0x6b, 0xb7, 0x22, 0x05, 0xc8, 0x76, 0xcd, 0x4f, 0xf4, 0x3d, 0x52, - 0x83, 0x52, 0xb2, 0x17, 0x07, 0xf0, 0x24, 0xf3, 0xf7, 0xfd, 0x73, 0x8a, 0x9c, 0xaa, 0x81, 0x8a, - 0x7c, 0xa9, 0x67, 0xeb, 0x5f, 0x2b, 0x70, 0xa7, 0x35, 0xb5, 0x67, 0x33, 0xe6, 0x4d, 0xd8, 0xc7, - 0x31, 0x0b, 0x23, 0xd7, 0xf7, 0x36, 0xc6, 0x45, 0x65, 0x73, 0x5c, 0x5c, 0x1f, 0x34, 0x33, 0xe9, - 0x41, 0x93, 0xcf, 0xb0, 0xd3, 0xd8, 0xfb, 0x54, 0x4e, 0x92, 0x59, 0xc1, 0x13, 0x08, 0x89, 0x49, - 0xf2, 0x2e, 0xa8, 0x9e, 0xef, 0x39, 0x4c, 0x0e, 0xa1, 0x62, 0x41, 0x3e, 0x80, 0x0a, 0xfb, 0x62, - 0xc1, 0x9c, 0xc8, 0xb2, 0xbd, 0xf0, 0x73, 0x16, 0x60, 0xd1, 0x6a, 0xb4, 0x2c, 0xc0, 0x26, 0x62, - 0xf5, 0x3f, 0x66, 0xe1, 0x7e, 0x3f, 0xf0, 0xfd, 0x71, 0x6f, 0x4c, 0xd9, 0x62, 0xe6, 0x3a, 0x76, - 0xc4, 0x96, 0xbe, 0x93, 0xdf, 0x40, 0xf1, 0x33, 0xe9, 0xbf, 0xec, 0x6a, 0x23, 0xe9, 0xad, 0xcd, - 0xfb, 0xad, 0x8f, 0x26, 0x89, 0x0d, 0xf9, 0x1d, 0x54, 0x9d, 0x44, 0x51, 0xd4, 0x6f, 0x66, 0x87, - 0xfa, 0xad, 0x2c, 0x6d, 0xb1, 0x82, 0x53, 0xd4, 0x94, 0xdd, 0x18, 0x32, 0xb7, 0x94, 0x77, 0x6e, - 0x6b, 0x79, 0x1f, 0x42, 0x09, 0xe3, 0x9c, 0x8a, 0x09, 0x70, 0x48, 0x44, 0x84, 0xfc, 0x76, 0x6d, - 0xdc, 0x11, 0x3e, 0xe7, 0x77, 0xf0, 0xb9, 0x9c, 0x0c, 0x45, 0xc9, 0xd7, 0xcc, 0xc6, 0xe8, 0x54, - 0xd8, 0x32, 0x3a, 0xd5, 0xbf, 0x52, 0xe0, 0x1e, 0x6f, 0xac, 0x1b, 0x41, 0x0d, 0xd3, 0x0f, 0xa9, - 0xb2, 0xf1, 0x90, 0x5e, 0x24, 0x5f, 0x10, 0x49, 0xc0, 0x43, 0x23, 0x83, 0x64, 0x72, 0x20, 0xb3, - 0x84, 0x0f, 0xc4, 0xcd, 0x5d, 0x25, 0x21, 0x56, 0xd1, 0x78, 0x89, 0xd6, 0xff, 0x99, 0x81, 0x1f, - 0xde, 0x62, 0xf1, 0x6e, 0x3f, 0xd2, 0xa5, 0x9d, 0xd9, 0x2c, 0xed, 0x4d, 0x2a, 0xc8, 0xde, 0xa4, - 0x82, 0x87, 0x50, 0x4d, 0xee, 0x20, 0x5f, 0xc3, 0x9c, 0x78, 0xe9, 0x12, 0x54, 0x3c, 0x88, 0xcf, - 0x40, 0x5b, 0x5d, 0x55, 0xc5, 0xab, 0xde, 0x5e, 0x90, 0x92, 0xf5, 0x97, 0x06, 0x9c, 0x4b, 0xe5, - 0x99, 0xbb, 0xe7, 0x35, 0xf1, 0x16, 0xd3, 0xba, 0x9d, 0xb8, 0x0a, 0xb7, 0x11, 0xd7, 0xb5, 0x02, - 0xf7, 0x5b, 0x38, 0x36, 0xac, 0xbf, 0x78, 0x94, 0xa1, 0x67, 0xff, 0x33, 0xb2, 0xef, 0xfa, 0x3a, - 0xfd, 0x00, 0x2a, 0x81, 0xd8, 0x26, 0x15, 0xda, 0xf2, 0x12, 0xe4, 0x4a, 0x67, 0x90, 0xac, 0xc5, - 0xb5, 0x77, 0x99, 0xa9, 0x4a, 0xd2, 0x12, 0xaf, 0xfd, 0x3e, 0x68, 0xab, 0xdb, 0xaa, 0x78, 0xdb, - 0x15, 0x50, 0xff, 0x8b, 0x02, 0x79, 0xca, 0xc2, 0x78, 0x16, 0x91, 0x47, 0x90, 0x73, 0xfc, 0x91, - 0xf8, 0x27, 0x40, 0x75, 0xf9, 0x21, 0x43, 0x59, 0xb8, 0xf0, 0xbd, 0x90, 0xb5, 0xfc, 0x11, 0xa3, - 0xa8, 0x40, 0x0c, 0x28, 0xcc, 0x59, 0x18, 0xda, 0x13, 0x96, 0x70, 0x9e, 0x5c, 0x92, 0x73, 0x7e, - 0x33, 0xa1, 0x2f, 0xbc, 0xce, 0xee, 0xd2, 0x84, 0x89, 0x29, 0x17, 0xfe, 0xd4, 0x81, 0xf2, 0xfa, - 0xd1, 0x9c, 0xb6, 0x07, 0x97, 0xad, 0x96, 0x39, 0x18, 0xe8, 0x7b, 0x64, 0x1f, 0xee, 0xf1, 0x21, - 0xb9, 0x39, 0xbc, 0xa4, 0xa6, 0x75, 0xda, 0xa3, 0x17, 0xcd, 0xa1, 0x65, 0x52, 0xda, 0xa3, 0xba, - 0x42, 0xee, 0xc3, 0x0f, 0x5a, 0xbd, 0x8b, 0xfe, 0xe5, 0xd0, 0xb4, 0x9a, 0xed, 0x36, 0x35, 0x07, - 0x03, 0x29, 0xca, 0xf0, 0xb7, 0xa0, 0x37, 0x7c, 0x61, 0x52, 0x09, 0xdc, 0x3d, 0xf9, 0x97, 0x02, - 0xe5, 0x33, 0x64, 0x1a, 0x16, 0xbc, 0xe2, 0x1f, 0xb0, 0xcf, 0xe0, 0xbd, 0x41, 0x7c, 0x35, 0x77, - 0xa3, 0xf4, 0xdc, 0x7c, 0x6f, 0xfb, 0x3b, 0xba, 0x5f, 0x59, 0x05, 0x89, 0x47, 0xf0, 0xd7, 0x50, - 0x19, 0x30, 0x6f, 0xd5, 0x9b, 0xe4, 0xc1, 0x9a, 0xdd, 0xcd, 0xf6, 0xdc, 0x34, 0xef, 0x02, 0xb9, - 0x59, 0x70, 0xe4, 0x68, 0xd9, 0x2a, 0xb7, 0xd4, 0xe2, 0xfe, 0x2d, 0xde, 0x3d, 0x7f, 0xf6, 0xe6, - 0xed, 0x81, 0xf2, 0xcd, 0xdb, 0x03, 0xe5, 0x3f, 0x6f, 0x0f, 0x94, 0xbf, 0x5e, 0x1f, 0x28, 0xff, - 0xb8, 0x3e, 0x50, 0xde, 0x5c, 0x1f, 0x28, 0x50, 0x71, 0xfd, 0xc6, 0x55, 0x34, 0x0e, 0x85, 0xe1, - 0x73, 0xc0, 0x18, 0xf4, 0x79, 0x72, 0xfa, 0xca, 0x1f, 0xc4, 0x7f, 0x9d, 0xae, 0xf2, 0x98, 0xac, - 0xa7, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x51, 0xfa, 0x97, 0xce, 0x9f, 0x12, 0x00, 0x00, + // 1798 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6f, 0xdb, 0xc8, + 0x15, 0x37, 0x25, 0x51, 0x12, 0x9f, 0xbe, 0x98, 0xd9, 0x34, 0x65, 0xdc, 0x8d, 0xed, 0x6a, 0x91, + 0xc6, 0x69, 0x11, 0xa5, 0xf0, 0x16, 0x0b, 0x14, 0xd8, 0x76, 0xa1, 0x48, 0xb4, 0xe3, 0x56, 0x96, + 0xb4, 0x43, 0x19, 0xdb, 0xf4, 0x42, 0xd0, 0xd4, 0x48, 0x22, 0x56, 0x22, 0xb5, 0xfc, 0xc8, 0x6e, + 0xf6, 0xd0, 0x43, 0xd1, 0x5b, 0x2f, 0x3d, 0x15, 0x3d, 0xf5, 0xdc, 0xfd, 0x2f, 0x7a, 0xcc, 0xad, + 0x7b, 0x2f, 0xb0, 0x2d, 0xe2, 0x7f, 0xa4, 0x98, 0x37, 0xa4, 0x28, 0xca, 0x72, 0x0a, 0xa5, 0xe8, + 0xc5, 0xd0, 0xfc, 0xde, 0x7b, 0x33, 0x6f, 0xde, 0xc7, 0x6f, 0x1e, 0x0d, 0xda, 0xd2, 0xf7, 0x42, + 0x2f, 0x78, 0x3a, 0x8d, 0x2c, 0x7f, 0x2c, 0xfe, 0xb6, 0x10, 0x22, 0x32, 0x2e, 0xf6, 0x7f, 0x3a, + 0x75, 0xc2, 0x59, 0x74, 0xd5, 0xb2, 0xbd, 0xc5, 0xd3, 0xd0, 0xf7, 0xdc, 0x27, 0x51, 0xf0, 0x14, + 0x15, 0xae, 0xa2, 0xc9, 0xd3, 0xa9, 0x37, 0xf5, 0x70, 0x81, 0xbf, 0x84, 0xe1, 0xfe, 0xe1, 0xd4, + 0xf3, 0xa6, 0x73, 0x96, 0x6a, 0x85, 0xce, 0x82, 0x05, 0xa1, 0xb5, 0x58, 0x0a, 0x85, 0xe6, 0x1f, + 0x25, 0xc8, 0xf7, 0xbc, 0x29, 0xd1, 0xa1, 0x62, 0xcf, 0x2c, 0x77, 0xca, 0x4c, 0xae, 0xa1, 0x49, + 0x47, 0xd2, 0x71, 0xe5, 0x64, 0xbf, 0x25, 0xcc, 0x5b, 0x89, 0x79, 0x6b, 0x94, 0x98, 0x3f, 0x2b, + 0xbf, 0xfe, 0xee, 0x70, 0xef, 0x4f, 0xff, 0x3a, 0x94, 0x28, 0x08, 0x43, 0x2e, 0x22, 0x0f, 0xa1, + 0xee, 0xf9, 0xce, 0xd4, 0x71, 0xad, 0xd0, 0xf3, 0xcd, 0xa5, 0x33, 0xd6, 0x72, 0x47, 0xd2, 0xb1, + 0x42, 0x6b, 0x29, 0x3a, 0x74, 0xc6, 0xe4, 0x1e, 0x14, 0x85, 0x91, 0x96, 0x47, 0x71, 0xbc, 0x6a, + 0x7e, 0x23, 0x43, 0xb5, 0xe3, 0xb9, 0xa1, 0x6f, 0xd9, 0xe1, 0x05, 0x0b, 0x2d, 0x72, 0x08, 0x15, + 0x3b, 0x5e, 0x9b, 0xce, 0x18, 0xdd, 0x52, 0x28, 0x24, 0xd0, 0xf9, 0x98, 0x3c, 0x00, 0xf0, 0x99, + 0x1b, 0xb2, 0xf5, 0xc3, 0x14, 0x81, 0xf0, 0x83, 0xee, 0x43, 0x79, 0xe6, 0x05, 0x21, 0x0a, 0xc5, + 0x51, 0x25, 0xbe, 0xe6, 0xa2, 0x07, 0x00, 0xc1, 0xcc, 0xf2, 0xc7, 0xe6, 0xcc, 0x0a, 0x66, 0x5a, + 0x41, 0x58, 0x22, 0xf2, 0xdc, 0x0a, 0x66, 0xfc, 0x64, 0x21, 0x76, 0xdc, 0x31, 0xfb, 0x4a, 0x93, + 0x8f, 0xa4, 0x63, 0x99, 0x0a, 0x8b, 0x73, 0x8e, 0x90, 0x1f, 0x41, 0x43, 0x28, 0x4c, 0x9c, 0x39, + 0x33, 0x03, 0xe7, 0x6b, 0xa6, 0x15, 0x8f, 0xa4, 0xe3, 0x3c, 0xad, 0x21, 0x7c, 0xea, 0xcc, 0x99, + 0xe1, 0x7c, 0xcd, 0xc8, 0x0f, 0x40, 0x41, 0x0d, 0x3c, 0xa6, 0x84, 0xc7, 0x94, 0x39, 0x80, 0xa7, + 0x74, 0x84, 0xfb, 0x66, 0x10, 0x5a, 0x7e, 0xa8, 0x95, 0x77, 0x88, 0x3a, 0x5e, 0xd2, 0xe0, 0x66, + 0xe4, 0x13, 0x28, 0xe3, 0x26, 0xcc, 0x1d, 0x6b, 0xca, 0x0e, 0x5b, 0x94, 0xb8, 0x95, 0xee, 0x8e, + 0xb9, 0x8b, 0x58, 0x60, 0x18, 0x26, 0x10, 0x2e, 0x22, 0x10, 0xc7, 0x89, 0x05, 0xb6, 0xef, 0x7d, + 0x89, 0xd2, 0x8a, 0x88, 0x93, 0x40, 0xb8, 0xf8, 0x2e, 0xc8, 0x4b, 0xdf, 0xb1, 0x99, 0x56, 0xc5, + 0xcb, 0x8b, 0x05, 0x4f, 0xb0, 0xb5, 0xf0, 0x22, 0x37, 0xd4, 0x6a, 0x08, 0xc7, 0x2b, 0xf2, 0x13, + 0xb8, 0x63, 0x7b, 0xf3, 0xb9, 0x15, 0x32, 0xdf, 0x9a, 0x9b, 0xb1, 0x4a, 0x1d, 0x55, 0xd4, 0x54, + 0xd0, 0x16, 0xca, 0x3a, 0x34, 0x96, 0xd6, 0x2b, 0x2f, 0x0a, 0xcd, 0xc0, 0x9e, 0xb1, 0x71, 0x34, + 0x67, 0x5a, 0xe3, 0x48, 0x3a, 0xae, 0x9f, 0xbc, 0xdf, 0x12, 0xcd, 0xb1, 0x5e, 0x2a, 0x2d, 0x23, + 0xd6, 0xa1, 0x75, 0x61, 0x94, 0xac, 0x79, 0x26, 0xdd, 0x68, 0x61, 0x0a, 0x34, 0xd0, 0x54, 0x91, + 0x49, 0x37, 0x5a, 0x0c, 0x05, 0xd2, 0xfc, 0x19, 0x94, 0x57, 0xca, 0x15, 0x28, 0x5d, 0x0c, 0xfa, + 0xa3, 0xe7, 0xbd, 0x17, 0xea, 0x1e, 0xa9, 0x81, 0xf2, 0xe9, 0x65, 0x9b, 0x8e, 0x74, 0xda, 0x7b, + 0xa1, 0x4a, 0xa4, 0x0a, 0xe5, 0x76, 0xbf, 0x7f, 0xd9, 0xee, 0xf5, 0x5e, 0xa8, 0xb9, 0xe6, 0xdf, + 0x64, 0x28, 0x27, 0x0e, 0x90, 0x9f, 0x43, 0x39, 0x29, 0xca, 0xb8, 0x77, 0xde, 0xdb, 0xe2, 0xa3, + 0x88, 0xfd, 0xb7, 0xdf, 0x1d, 0x4a, 0x74, 0xa5, 0x4e, 0x3e, 0x04, 0x39, 0x08, 0xad, 0x90, 0x61, + 0xf1, 0xd6, 0x4f, 0x1e, 0x6c, 0xd8, 0xad, 0x7e, 0x18, 0x5c, 0x89, 0x0a, 0x5d, 0xf2, 0x18, 0xd4, + 0xb8, 0xec, 0x03, 0x67, 0xea, 0x5a, 0x61, 0xe4, 0x8b, 0x56, 0xaa, 0xd2, 0x86, 0xc0, 0x8d, 0x04, + 0xe6, 0x2d, 0x89, 0x2d, 0x90, 0x2a, 0x16, 0x50, 0xb1, 0xc6, 0xd1, 0x54, 0x8d, 0x02, 0x89, 0xd3, + 0xcc, 0x15, 0xd9, 0x58, 0xf0, 0x80, 0xbc, 0x43, 0x39, 0xa9, 0xc2, 0xde, 0x40, 0x73, 0x64, 0x83, + 0xc7, 0xa0, 0xae, 0xed, 0x29, 0x0e, 0x2f, 0x0a, 0x2f, 0x53, 0x5d, 0x71, 0xfc, 0x63, 0x88, 0x69, + 0xc4, 0x9c, 0x7b, 0x53, 0xad, 0x74, 0x94, 0x3f, 0xae, 0x9c, 0x40, 0x1c, 0x8a, 0x9e, 0x37, 0xa5, + 0x8a, 0x90, 0x72, 0xaa, 0xea, 0x83, 0x3a, 0xb7, 0x82, 0xd0, 0x5c, 0x78, 0x63, 0x67, 0xf2, 0x4a, + 0xf8, 0xb9, 0x4b, 0xe7, 0xd4, 0xb9, 0xf5, 0x05, 0x1a, 0xa3, 0x97, 0x8f, 0xa0, 0x21, 0xaa, 0x3f, + 0x75, 0x52, 0x41, 0x27, 0xeb, 0x08, 0xa7, 0x3e, 0xfe, 0x10, 0xaa, 0x4b, 0x9f, 0x2d, 0x2d, 0x3f, + 0x66, 0x1b, 0xd1, 0x29, 0x95, 0x04, 0xe3, 0xdd, 0xf0, 0x04, 0xc8, 0x4a, 0x25, 0xdd, 0xae, 0x82, + 0xdb, 0xdd, 0x49, 0x24, 0xab, 0x1d, 0x9b, 0x0c, 0x6a, 0x99, 0xf4, 0x12, 0x05, 0xe4, 0x2e, 0x6d, + 0x9f, 0x8e, 0xd4, 0x3d, 0x02, 0x50, 0x34, 0xce, 0xcf, 0xfa, 0x7a, 0x57, 0x54, 0xde, 0xe5, 0xb0, + 0x37, 0x68, 0x77, 0xf5, 0xae, 0x9a, 0x23, 0x65, 0x28, 0xf4, 0x06, 0xc6, 0x48, 0xcd, 0x73, 0xbc, + 0xd3, 0xee, 0x77, 0xf4, 0x9e, 0xde, 0x55, 0x0b, 0xdc, 0xa2, 0xd3, 0x1b, 0x18, 0x7a, 0x57, 0x95, + 0x79, 0x1d, 0x53, 0xbd, 0xaf, 0x7f, 0xa6, 0x77, 0xd5, 0x62, 0xf3, 0x0f, 0x05, 0xa8, 0x21, 0x1f, + 0x85, 0x9e, 0xcf, 0x90, 0x57, 0xb3, 0xb4, 0x29, 0x6d, 0xd2, 0x66, 0x86, 0xb3, 0x72, 0x1b, 0x9c, + 0x95, 0x08, 0x91, 0xf2, 0xf2, 0xd8, 0xbb, 0x28, 0x44, 0xb6, 0xcb, 0x12, 0x5a, 0xe1, 0x7f, 0x27, + 0x34, 0xf9, 0x5d, 0x08, 0xed, 0x11, 0x34, 0xec, 0x19, 0xb3, 0x3f, 0x37, 0x27, 0x3e, 0xfb, 0x22, + 0x62, 0xae, 0xfd, 0x0a, 0xeb, 0x4e, 0xa6, 0x75, 0x84, 0x4f, 0x13, 0x34, 0x65, 0xbe, 0x09, 0x63, + 0x48, 0xce, 0xf9, 0x98, 0xf9, 0x4e, 0x19, 0x5b, 0x63, 0x3e, 0x2e, 0x2d, 0xa3, 0x34, 0x66, 0x3e, + 0x2e, 0x5e, 0xbd, 0x10, 0x36, 0xb2, 0x98, 0xb2, 0xf6, 0x42, 0x74, 0x90, 0xbf, 0x1e, 0x42, 0x7d, + 0xe1, 0xb8, 0xce, 0x22, 0x5a, 0x98, 0x88, 0x06, 0x58, 0x31, 0x32, 0xad, 0xc5, 0xa8, 0x81, 0x20, + 0xe7, 0x44, 0x9f, 0xd9, 0xde, 0x4b, 0xe6, 0x9b, 0xe1, 0xcc, 0x67, 0xc1, 0xcc, 0x9b, 0x0b, 0x9e, + 0x95, 0xa9, 0x1a, 0x0b, 0x46, 0x09, 0xbe, 0xc1, 0xc6, 0xd5, 0x4d, 0x36, 0xce, 0x30, 0x79, 0x2d, + 0xcb, 0xe4, 0xcd, 0xbf, 0x16, 0xa1, 0xb1, 0x2a, 0x03, 0x5e, 0x6f, 0x51, 0x40, 0x4e, 0xa1, 0x21, + 0x92, 0xc9, 0x31, 0x73, 0xc1, 0x42, 0x2b, 0xe6, 0xaf, 0xbb, 0x71, 0xf3, 0x65, 0xea, 0x66, 0x8d, + 0xc0, 0x6a, 0x93, 0x4c, 0x41, 0x7d, 0x94, 0x65, 0xb1, 0xa3, 0x4d, 0x6b, 0x71, 0x5c, 0x8b, 0xeb, + 0x66, 0x88, 0xec, 0x09, 0x28, 0x09, 0x13, 0x06, 0x5a, 0x1e, 0xdb, 0xbe, 0xb1, 0xc1, 0x80, 0x34, + 0xd5, 0xd8, 0xca, 0x7b, 0x85, 0xed, 0xbc, 0x47, 0x81, 0x88, 0x50, 0xf8, 0xcc, 0x66, 0xce, 0x4b, + 0xf6, 0x0e, 0x84, 0x86, 0xf6, 0x54, 0x98, 0xc7, 0x84, 0xb6, 0xce, 0x52, 0xc5, 0xb7, 0xb1, 0xd4, + 0x19, 0x54, 0xed, 0xc8, 0xc7, 0x32, 0xc6, 0x83, 0x4b, 0x3b, 0x1c, 0x5c, 0x89, 0x2d, 0x6f, 0xa3, + 0xa7, 0xf2, 0x56, 0x7a, 0xd2, 0xa1, 0xca, 0x8d, 0xac, 0xb9, 0x29, 0x32, 0xa1, 0x60, 0x26, 0x9a, + 0xb7, 0x64, 0x82, 0xa2, 0xaa, 0xc8, 0x45, 0xc5, 0x4f, 0x17, 0xff, 0x07, 0x96, 0x9b, 0x80, 0xb2, + 0xca, 0xfb, 0x3a, 0xc3, 0xd5, 0x40, 0x11, 0xac, 0x76, 0xde, 0x3f, 0x53, 0x25, 0xa4, 0xac, 0xcb, + 0x7e, 0x9f, 0x2f, 0x72, 0x44, 0x85, 0xea, 0xb0, 0x4d, 0x47, 0xe7, 0xed, 0x9e, 0x19, 0x73, 0x5d, + 0xc2, 0x7a, 0x05, 0xfe, 0xab, 0x3b, 0xe8, 0xeb, 0xaa, 0x9c, 0xe1, 0xbf, 0x62, 0xf3, 0x13, 0xa8, + 0xac, 0xdd, 0x8a, 0x94, 0x20, 0xdf, 0xd7, 0x3f, 0x53, 0xf7, 0x48, 0x03, 0x2a, 0xc9, 0x5e, 0x1c, + 0xc0, 0x93, 0xf4, 0xdf, 0x0c, 0xcf, 0x29, 0xb2, 0xa9, 0x02, 0x32, 0x32, 0xa5, 0x9a, 0x6f, 0x7e, + 0x23, 0xc1, 0x9d, 0xce, 0xcc, 0x9a, 0xcf, 0x99, 0x3b, 0x65, 0x9f, 0x46, 0x2c, 0x08, 0x1d, 0xcf, + 0xdd, 0x18, 0x14, 0xa5, 0xcd, 0x41, 0x71, 0x7d, 0xc4, 0xcc, 0x65, 0x47, 0x4c, 0x3e, 0xbd, 0xce, + 0x22, 0xf7, 0xf3, 0x78, 0x86, 0xcc, 0x0b, 0x86, 0x40, 0x48, 0xcc, 0x90, 0x77, 0x41, 0x76, 0x3d, + 0xd7, 0x66, 0xf1, 0xf8, 0x29, 0x16, 0xe4, 0x03, 0xa8, 0xb1, 0xaf, 0x96, 0xcc, 0x0e, 0x4d, 0xcb, + 0x0d, 0xbe, 0x64, 0x3e, 0x16, 0xad, 0x42, 0xab, 0x02, 0x6c, 0x23, 0xd6, 0xfc, 0x7d, 0x1e, 0xee, + 0x0f, 0x7d, 0xcf, 0x9b, 0x0c, 0x26, 0x94, 0x2d, 0xe7, 0x8e, 0x6d, 0x85, 0x6c, 0xe5, 0x3b, 0xf9, + 0x25, 0x94, 0xbf, 0x88, 0xfd, 0x8f, 0xfb, 0x59, 0x4b, 0xba, 0x6a, 0xf3, 0x7e, 0xeb, 0x43, 0x49, + 0x62, 0x43, 0x7e, 0x0d, 0x75, 0x3b, 0x51, 0x14, 0xf5, 0x9b, 0xdb, 0xa1, 0x7e, 0x6b, 0x2b, 0x5b, + 0xac, 0xe0, 0x0c, 0x29, 0xe5, 0x37, 0xc6, 0xcb, 0x2d, 0xe5, 0x5d, 0xd8, 0x5a, 0xde, 0x87, 0x50, + 0xc1, 0x38, 0x67, 0x62, 0x02, 0x1c, 0x12, 0x11, 0x21, 0xbf, 0x5a, 0x1b, 0x74, 0x84, 0xcf, 0xc5, + 0x1d, 0x7c, 0xae, 0x26, 0xe3, 0x50, 0xf2, 0x1d, 0xb3, 0x31, 0x34, 0x95, 0xb6, 0x0c, 0x4d, 0xcd, + 0xdf, 0xc1, 0x3d, 0xde, 0x57, 0x37, 0x62, 0x1a, 0x64, 0x5f, 0x50, 0x69, 0xe3, 0x05, 0x3d, 0x4b, + 0x3e, 0x1d, 0x92, 0x78, 0x07, 0x5a, 0x0e, 0xb9, 0xe4, 0x20, 0x4e, 0x12, 0xbe, 0x0c, 0x37, 0x77, + 0xa5, 0x75, 0x34, 0x5b, 0xad, 0x9b, 0xff, 0xc8, 0xc1, 0xf7, 0x6f, 0xd1, 0x7d, 0xbb, 0x07, 0xd9, + 0x9a, 0xce, 0x6d, 0xd6, 0xf4, 0x26, 0x07, 0xe4, 0x6f, 0x72, 0xc0, 0x43, 0xa8, 0x27, 0xde, 0xc7, + 0x0f, 0x60, 0x41, 0x3c, 0x6e, 0x09, 0x2a, 0xde, 0xc0, 0x8f, 0x40, 0x49, 0x2f, 0x29, 0xe3, 0x25, + 0x6f, 0xad, 0x44, 0x9a, 0xaa, 0x72, 0xfa, 0x8c, 0x4f, 0xdb, 0x3d, 0x95, 0x89, 0x9f, 0x98, 0xc9, + 0xed, 0x5c, 0x55, 0xba, 0x8d, 0xab, 0xae, 0x25, 0xb8, 0xdf, 0xc1, 0x19, 0x61, 0xfd, 0x79, 0xa3, + 0x0c, 0x3d, 0xfb, 0xaf, 0x31, 0x7d, 0xdb, 0xa7, 0xe8, 0x07, 0x50, 0xf3, 0xc5, 0x36, 0x99, 0xa0, + 0x56, 0x57, 0x20, 0x57, 0x3a, 0x83, 0x64, 0x2d, 0xae, 0xbd, 0xcb, 0x00, 0x55, 0x89, 0x2d, 0xf1, + 0xda, 0xef, 0x83, 0x92, 0xde, 0x56, 0xc6, 0xdb, 0xa6, 0x40, 0xf3, 0xcf, 0x12, 0x14, 0x29, 0x0b, + 0xa2, 0x79, 0x48, 0x1e, 0x41, 0xc1, 0xf6, 0xc6, 0xe2, 0x8b, 0xbf, 0xbe, 0xfa, 0x6a, 0xa1, 0x2c, + 0x58, 0x7a, 0x6e, 0xc0, 0x3a, 0xde, 0x98, 0x51, 0x54, 0x20, 0x1a, 0x94, 0x16, 0x2c, 0x08, 0xac, + 0x29, 0x4b, 0x68, 0x2e, 0x5e, 0x92, 0x73, 0x7e, 0x33, 0xa1, 0x2f, 0xbc, 0xce, 0xef, 0xd2, 0x77, + 0x89, 0x29, 0x17, 0xfe, 0xd8, 0x86, 0xea, 0xfa, 0xd1, 0x9c, 0xa9, 0x8d, 0xcb, 0x4e, 0x47, 0x37, + 0x0c, 0x75, 0x8f, 0xec, 0xc3, 0x3d, 0x3e, 0x11, 0xb7, 0x47, 0x97, 0x54, 0x37, 0x4f, 0x07, 0xf4, + 0xa2, 0x3d, 0x32, 0x75, 0x4a, 0x07, 0x54, 0x95, 0xc8, 0x7d, 0xf8, 0x5e, 0x67, 0x70, 0x31, 0xbc, + 0x1c, 0xe9, 0x66, 0xbb, 0xdb, 0xa5, 0xba, 0x61, 0xc4, 0xa2, 0x1c, 0xa7, 0xff, 0xc1, 0xe8, 0xb9, + 0x4e, 0x63, 0xe0, 0xee, 0xc9, 0x3f, 0x25, 0xa8, 0x9e, 0x21, 0xb9, 0x30, 0xff, 0x25, 0xff, 0x5a, + 0xfd, 0x18, 0xde, 0x33, 0xa2, 0xab, 0x85, 0x13, 0x66, 0x87, 0xe4, 0x7b, 0xdb, 0x9f, 0xce, 0xfd, + 0x5a, 0x1a, 0x24, 0x1e, 0xc1, 0x5f, 0x40, 0xcd, 0x60, 0x6e, 0xda, 0x95, 0xe4, 0xc1, 0x9a, 0xdd, + 0xcd, 0xc6, 0xdc, 0x34, 0xef, 0x03, 0xb9, 0x59, 0x70, 0xe4, 0x68, 0xd5, 0x24, 0xb7, 0xd4, 0xe2, + 0xfe, 0x2d, 0xde, 0x3d, 0xfb, 0xf8, 0xf5, 0x9b, 0x03, 0xe9, 0xdb, 0x37, 0x07, 0xd2, 0xbf, 0xdf, + 0x1c, 0x48, 0x7f, 0xb9, 0x3e, 0x90, 0xfe, 0x7e, 0x7d, 0x20, 0xbd, 0xbe, 0x3e, 0x90, 0xa0, 0xe6, + 0x78, 0xad, 0xab, 0x70, 0x12, 0x08, 0xc3, 0x67, 0x80, 0x31, 0x18, 0xf2, 0xe4, 0x0c, 0xa5, 0xdf, + 0x8a, 0x7f, 0x31, 0x5d, 0x15, 0x31, 0x59, 0x1f, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x57, 0x05, + 0x9e, 0x72, 0x8c, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4496,7 +4496,7 @@ func (m *FileStoreStatus) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Contracts = append(m.Contracts, Contract{}) + m.Contracts = append(m.Contracts, &Contract{}) if err := m.Contracts[len(m.Contracts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5355,7 +5355,7 @@ func (m *FileChallengeQuestions) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ShardQuestions = append(m.ShardQuestions, ShardChallengeQuestions{}) + m.ShardQuestions = append(m.ShardQuestions, &ShardChallengeQuestions{}) if err := m.ShardQuestions[len(m.ShardQuestions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5558,7 +5558,7 @@ func (m *ShardChallengeQuestions) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Questions = append(m.Questions, ChallengeQuestion{}) + m.Questions = append(m.Questions, &ChallengeQuestion{}) if err := m.Questions[len(m.Questions)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/protos/guard/guard.proto b/protos/guard/guard.proto index 2c6dc58..6c7f595 100644 --- a/protos/guard/guard.proto +++ b/protos/guard/guard.proto @@ -142,7 +142,7 @@ message FileStoreStatus { CANCELED = 6; //reserved for the cancel contract } MetaState state = 2; - repeated Contract contracts = 3 [(gogoproto.nullable) = false]; + repeated Contract contracts = 3; bytes renter_signature = 4; //rental's signature for the first full file status with contracts google.protobuf.Timestamp guard_receive_time = 5 [ (gogoproto.nullable) = false, @@ -194,7 +194,7 @@ message ProofOfReplicateChallenge { message FileChallengeQuestions { string file_hash = 1; - repeated ShardChallengeQuestions shard_questions = 2 [(gogoproto.nullable) = false]; + repeated ShardChallengeQuestions shard_questions = 2; } message ShardChallengeQuestions { @@ -202,7 +202,7 @@ message ShardChallengeQuestions { string shard_hash = 2; string preparer_pid = 3; //challenge questions preparer's peerId, it is renter peerId at phase 1 int32 question_count = 4; - repeated ChallengeQuestion questions = 5 [(gogoproto.nullable) = false]; + repeated ChallengeQuestion questions = 5; google.protobuf.Timestamp prepare_time = 6 [ (gogoproto.nullable) = false, (gogoproto.stdtime) = true