diff --git a/fabric/protos/common/collection.pb.go b/fabric/protos/common/collection.pb.go index 573285f..990af31 100644 --- a/fabric/protos/common/collection.pb.go +++ b/fabric/protos/common/collection.pb.go @@ -22,30 +22,33 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type CollectionType int32 const ( - CollectionType_UNKNOWN CollectionType = 0 - CollectionType_PRIVATE CollectionType = 1 - CollectionType_TRANSIENT CollectionType = 2 - CollectionType_DCAS CollectionType = 3 + CollectionType_COL_UNKNOWN CollectionType = 0 + CollectionType_COL_PRIVATE CollectionType = 1 + CollectionType_COL_TRANSIENT CollectionType = 2 + CollectionType_COL_OFFLEDGER CollectionType = 3 + CollectionType_COL_DCAS CollectionType = 4 ) var CollectionType_name = map[int32]string{ - 0: "UNKNOWN", - 1: "PRIVATE", - 2: "TRANSIENT", - 3: "DCAS", + 0: "COL_UNKNOWN", + 1: "COL_PRIVATE", + 2: "COL_TRANSIENT", + 3: "COL_OFFLEDGER", + 4: "COL_DCAS", } var CollectionType_value = map[string]int32{ - "UNKNOWN": 0, - "PRIVATE": 1, - "TRANSIENT": 2, - "DCAS": 3, + "COL_UNKNOWN": 0, + "COL_PRIVATE": 1, + "COL_TRANSIENT": 2, + "COL_OFFLEDGER": 3, + "COL_DCAS": 4, } func (x CollectionType) String() string { return proto.EnumName(CollectionType_name, int32(x)) } func (CollectionType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_collection_c912aa7b45171da9, []int{0} + return fileDescriptor_collection_451c6dbeb05528aa, []int{0} } // CollectionConfigPackage represents an array of CollectionConfig @@ -62,7 +65,7 @@ func (m *CollectionConfigPackage) Reset() { *m = CollectionConfigPackage func (m *CollectionConfigPackage) String() string { return proto.CompactTextString(m) } func (*CollectionConfigPackage) ProtoMessage() {} func (*CollectionConfigPackage) Descriptor() ([]byte, []int) { - return fileDescriptor_collection_c912aa7b45171da9, []int{0} + return fileDescriptor_collection_451c6dbeb05528aa, []int{0} } func (m *CollectionConfigPackage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CollectionConfigPackage.Unmarshal(m, b) @@ -95,7 +98,6 @@ func (m *CollectionConfigPackage) GetConfig() []*CollectionConfig { type CollectionConfig struct { // Types that are valid to be assigned to Payload: // *CollectionConfig_StaticCollectionConfig - // *CollectionConfig_TransientCollectionConfig Payload isCollectionConfig_Payload `protobuf_oneof:"payload"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -106,7 +108,7 @@ func (m *CollectionConfig) Reset() { *m = CollectionConfig{} } func (m *CollectionConfig) String() string { return proto.CompactTextString(m) } func (*CollectionConfig) ProtoMessage() {} func (*CollectionConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_collection_c912aa7b45171da9, []int{1} + return fileDescriptor_collection_451c6dbeb05528aa, []int{1} } func (m *CollectionConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CollectionConfig.Unmarshal(m, b) @@ -131,7 +133,7 @@ type isCollectionConfig_Payload interface { } type CollectionConfig_StaticCollectionConfig struct { - StaticCollectionConfig *StaticCollectionConfig `protobuf:"bytes,1,opt,name=static_collection_config,json=staticCollectionConfig,oneof"` + StaticCollectionConfig *StaticCollectionConfig `protobuf:"bytes,1,opt,name=static_collection_config,json=staticCollectionConfig,proto3,oneof"` } func (*CollectionConfig_StaticCollectionConfig) isCollectionConfig_Payload() {} @@ -237,13 +239,13 @@ type StaticCollectionConfig struct { // access logic in the chaincode) MemberOnlyWrite bool `protobuf:"varint,7,opt,name=member_only_write,json=memberOnlyWrite,proto3" json:"member_only_write,omitempty"` // The type of collection. - Type CollectionType `protobuf:"varint,9900,opt,name=type,enum=common.CollectionType" json:"type,omitempty"` + Type CollectionType `protobuf:"varint,9900,opt,name=type,proto3,enum=common.CollectionType" json:"type,omitempty"` // The time after which the collection data expires. For example, // if the value is set to "10m" then the data will be purged // 10 minutes after it was stored. An empty value indicates that // the data should never be purged. // The format of this string must be parseable by time.ParseDuration - TimeToLive string `protobuf:"bytes,9901,opt,name=time_to_live,json=timeToLive" json:"time_to_live,omitempty"` + TimeToLive string `protobuf:"bytes,9901,opt,name=time_to_live,json=timeToLive,proto3" json:"time_to_live,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -253,7 +255,7 @@ func (m *StaticCollectionConfig) Reset() { *m = StaticCollectionConfig{} func (m *StaticCollectionConfig) String() string { return proto.CompactTextString(m) } func (*StaticCollectionConfig) ProtoMessage() {} func (*StaticCollectionConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_collection_c912aa7b45171da9, []int{2} + return fileDescriptor_collection_451c6dbeb05528aa, []int{2} } func (m *StaticCollectionConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StaticCollectionConfig.Unmarshal(m, b) @@ -326,7 +328,7 @@ func (m *StaticCollectionConfig) GetType() CollectionType { if m != nil { return m.Type } - return CollectionType_UNKNOWN + return CollectionType_COL_UNKNOWN } func (m *StaticCollectionConfig) GetTimeToLive() string { @@ -353,7 +355,7 @@ func (m *CollectionPolicyConfig) Reset() { *m = CollectionPolicyConfig{} func (m *CollectionPolicyConfig) String() string { return proto.CompactTextString(m) } func (*CollectionPolicyConfig) ProtoMessage() {} func (*CollectionPolicyConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_collection_c912aa7b45171da9, []int{3} + return fileDescriptor_collection_451c6dbeb05528aa, []int{3} } func (m *CollectionPolicyConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CollectionPolicyConfig.Unmarshal(m, b) @@ -468,7 +470,7 @@ func (m *CollectionCriteria) Reset() { *m = CollectionCriteria{} } func (m *CollectionCriteria) String() string { return proto.CompactTextString(m) } func (*CollectionCriteria) ProtoMessage() {} func (*CollectionCriteria) Descriptor() ([]byte, []int) { - return fileDescriptor_collection_c912aa7b45171da9, []int{4} + return fileDescriptor_collection_451c6dbeb05528aa, []int{4} } func (m *CollectionCriteria) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CollectionCriteria.Unmarshal(m, b) @@ -525,40 +527,47 @@ func init() { proto.RegisterEnum("common.CollectionType", CollectionType_name, CollectionType_value) } -func init() { proto.RegisterFile("common/collection.proto", fileDescriptor_collection_c912aa7b45171da9) } - -var fileDescriptor_collection_c912aa7b45171da9 = []byte{ - // 500 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0x5f, 0x6b, 0xdb, 0x3c, - 0x14, 0xc6, 0xeb, 0x36, 0x7f, 0x5e, 0x9f, 0xf0, 0xae, 0xa9, 0xca, 0x52, 0x33, 0x46, 0x17, 0xc2, - 0x2e, 0xcc, 0x36, 0x9c, 0xd1, 0x7d, 0x83, 0x86, 0x41, 0xc7, 0x02, 0x0b, 0xee, 0x60, 0xd0, 0x1b, - 0xa3, 0xc8, 0xa7, 0x8e, 0xa8, 0x2d, 0xb9, 0xb2, 0x92, 0xc5, 0x97, 0xfb, 0x8a, 0xfb, 0x44, 0x23, - 0x92, 0x1d, 0xbb, 0x21, 0x77, 0xd1, 0xf3, 0xfc, 0xce, 0xc9, 0xd1, 0x79, 0x64, 0xb8, 0x62, 0x32, - 0xcb, 0xa4, 0x98, 0x32, 0x99, 0xa6, 0xc8, 0x34, 0x97, 0x22, 0xc8, 0x95, 0xd4, 0x92, 0xf4, 0xac, - 0xf1, 0xe6, 0x75, 0x05, 0xe4, 0x32, 0xe5, 0x8c, 0x63, 0x61, 0xed, 0xc9, 0x77, 0xb8, 0x9a, 0xed, - 0x4b, 0x66, 0x52, 0x3c, 0xf2, 0x64, 0x41, 0xd9, 0x13, 0x4d, 0x90, 0x7c, 0x86, 0x1e, 0x33, 0x82, - 0xe7, 0x8c, 0xcf, 0xfc, 0xc1, 0x8d, 0x17, 0xd8, 0x16, 0xc1, 0x61, 0x41, 0x58, 0x71, 0x93, 0x12, - 0x86, 0x87, 0x1e, 0x79, 0x00, 0xaf, 0xd0, 0x54, 0x73, 0x16, 0x35, 0xa3, 0x45, 0xfb, 0xbe, 0x8e, - 0x3f, 0xb8, 0xb9, 0xae, 0xfb, 0xde, 0x1b, 0xee, 0xb0, 0xc3, 0xdd, 0x49, 0x38, 0x2a, 0x8e, 0x3a, - 0xb7, 0x2e, 0xf4, 0x73, 0x5a, 0xa6, 0x92, 0xc6, 0x93, 0xbf, 0xa7, 0x30, 0x3a, 0x5e, 0x4f, 0x08, - 0x74, 0x04, 0xcd, 0xd0, 0xfc, 0x9b, 0x1b, 0x9a, 0xdf, 0x64, 0x0e, 0x24, 0xc3, 0x6c, 0x89, 0x2a, - 0x92, 0x2a, 0x29, 0x22, 0xb3, 0x94, 0xd2, 0x3b, 0x7d, 0x39, 0x4f, 0xd3, 0x69, 0x61, 0xfc, 0xea, - 0xb6, 0x43, 0x5b, 0xf9, 0x43, 0x25, 0x85, 0xd5, 0x49, 0x00, 0x97, 0x0a, 0x9f, 0xd7, 0x5c, 0x61, - 0x1c, 0xe5, 0x88, 0x2a, 0x62, 0x72, 0x2d, 0xb4, 0x77, 0x36, 0x76, 0xfc, 0x6e, 0x78, 0x51, 0x5b, - 0x0b, 0x44, 0x35, 0xdb, 0x19, 0xe4, 0x13, 0x90, 0x8c, 0x6e, 0x79, 0xb6, 0xce, 0xda, 0x78, 0xc7, - 0xe0, 0xc3, 0xca, 0x69, 0xe8, 0x09, 0xfc, 0xbf, 0x4c, 0x25, 0x7b, 0x8a, 0xb4, 0x8c, 0x52, 0xbe, - 0x41, 0xaf, 0x3b, 0x76, 0xfc, 0x4e, 0x38, 0x30, 0xe2, 0x4f, 0x39, 0xe7, 0x1b, 0x24, 0x3e, 0x0c, - 0xeb, 0xfb, 0x88, 0xb4, 0x8c, 0x14, 0xd2, 0xd8, 0xeb, 0x8d, 0x1d, 0xff, 0xbf, 0xf0, 0x55, 0x35, - 0xad, 0x48, 0xcb, 0x10, 0x69, 0x4c, 0x3e, 0xc0, 0x45, 0x9b, 0xfc, 0xad, 0xb8, 0x46, 0xaf, 0x6f, - 0xd0, 0xf3, 0x06, 0xfd, 0xb5, 0x93, 0x27, 0xcf, 0x30, 0x3a, 0xbe, 0x03, 0x32, 0x87, 0x61, 0xc1, - 0x13, 0x41, 0xf5, 0x5a, 0x61, 0xbd, 0x3d, 0x9b, 0xe6, 0xbb, 0x7d, 0x9a, 0xb5, 0x6f, 0x0b, 0xbf, - 0x8a, 0x0d, 0xa6, 0x32, 0xc7, 0xbb, 0x93, 0xf0, 0xbc, 0x78, 0x69, 0xb5, 0x73, 0xfc, 0xe3, 0x00, - 0x69, 0x25, 0xb8, 0x1b, 0x43, 0x71, 0x4a, 0x3c, 0xe8, 0xb3, 0x15, 0x15, 0x02, 0xd3, 0x2a, 0xc6, - 0xfa, 0x48, 0x2e, 0xa1, 0xab, 0xb7, 0x11, 0x8f, 0x4d, 0x78, 0x6e, 0xd8, 0xd1, 0xdb, 0x6f, 0x31, - 0xb9, 0x06, 0x68, 0x5e, 0x9b, 0xc9, 0xc1, 0x0d, 0x5b, 0x0a, 0x79, 0x0b, 0xee, 0xee, 0x19, 0x14, - 0x39, 0x65, 0x68, 0xf6, 0xee, 0x86, 0x8d, 0x70, 0x7b, 0x0f, 0xef, 0xa5, 0x4a, 0x82, 0x55, 0x99, - 0xa3, 0x4a, 0x31, 0x4e, 0x50, 0x05, 0x8f, 0x74, 0xa9, 0x38, 0xb3, 0xdf, 0x4c, 0x51, 0xdd, 0xf0, - 0xe1, 0x63, 0xc2, 0xf5, 0x6a, 0xbd, 0xdc, 0x1d, 0xa7, 0x2d, 0x78, 0x6a, 0xe1, 0xa9, 0x85, 0xa7, - 0x16, 0x5e, 0xf6, 0xcc, 0xf1, 0xcb, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb1, 0x4b, 0x91, 0x18, - 0xa9, 0x03, 0x00, 0x00, +func init() { proto.RegisterFile("common/collection.proto", fileDescriptor_collection_451c6dbeb05528aa) } + +var fileDescriptor_collection_451c6dbeb05528aa = []byte{ + // 610 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0xdf, 0x4e, 0xdb, 0x4c, + 0x10, 0xc5, 0x31, 0x09, 0x81, 0x4c, 0xf8, 0x63, 0x16, 0x7d, 0xc1, 0xfa, 0x54, 0xd1, 0x34, 0xea, + 0x45, 0x04, 0x55, 0x52, 0xd1, 0x27, 0x80, 0x10, 0x0a, 0x22, 0x24, 0xd1, 0x26, 0x2d, 0x12, 0x37, + 0xd6, 0xc6, 0x1e, 0xcc, 0x0a, 0xdb, 0x6b, 0xd6, 0x1b, 0x8a, 0x2f, 0xfb, 0x2a, 0xbd, 0x6e, 0xdf, + 0xb1, 0xf2, 0xda, 0x4e, 0x02, 0xe5, 0x2e, 0x7b, 0xce, 0x6f, 0x26, 0xb3, 0xb3, 0xc7, 0xb0, 0xef, + 0x88, 0x20, 0x10, 0x61, 0xc7, 0x11, 0xbe, 0x8f, 0x8e, 0xe2, 0x22, 0x6c, 0x47, 0x52, 0x28, 0x41, + 0x2a, 0x99, 0xf1, 0xff, 0x7f, 0x39, 0x10, 0x09, 0x9f, 0x3b, 0x1c, 0xe3, 0xcc, 0x6e, 0x5e, 0xc1, + 0x7e, 0x77, 0x5e, 0xd2, 0x15, 0xe1, 0x1d, 0xf7, 0x46, 0xcc, 0x79, 0x60, 0x1e, 0x92, 0xcf, 0x50, + 0x71, 0xb4, 0x60, 0x19, 0x8d, 0x52, 0xab, 0x76, 0x6c, 0xb5, 0xb3, 0x16, 0xed, 0xd7, 0x05, 0x34, + 0xe7, 0x9a, 0x09, 0x98, 0xaf, 0x3d, 0x72, 0x0b, 0x56, 0xac, 0x98, 0xe2, 0x8e, 0xbd, 0x18, 0xcd, + 0x9e, 0xf7, 0x35, 0x5a, 0xb5, 0xe3, 0x83, 0xa2, 0xef, 0x58, 0x73, 0xaf, 0x3b, 0x5c, 0xac, 0xd0, + 0x7a, 0xfc, 0xa6, 0x73, 0x5a, 0x85, 0xf5, 0x88, 0x25, 0xbe, 0x60, 0x6e, 0xf3, 0x57, 0x09, 0xea, + 0x6f, 0xd7, 0x13, 0x02, 0xe5, 0x90, 0x05, 0xa8, 0xff, 0xad, 0x4a, 0xf5, 0x6f, 0xd2, 0x07, 0x12, + 0x60, 0x30, 0x45, 0x69, 0x0b, 0xe9, 0xc5, 0xb6, 0x5e, 0x4a, 0x62, 0xad, 0xbe, 0x9c, 0x67, 0xd1, + 0x69, 0xa4, 0xfd, 0xfc, 0xb6, 0x66, 0x56, 0x39, 0x94, 0x5e, 0x9c, 0xe9, 0xa4, 0x0d, 0x7b, 0x12, + 0x1f, 0x67, 0x5c, 0xa2, 0x6b, 0x47, 0x88, 0xd2, 0x76, 0xc4, 0x2c, 0x54, 0x56, 0xa9, 0x61, 0xb4, + 0xd6, 0xe8, 0x6e, 0x61, 0x8d, 0x10, 0x65, 0x37, 0x35, 0xc8, 0x27, 0x20, 0x01, 0x7b, 0xe6, 0xc1, + 0x2c, 0x58, 0xc6, 0xcb, 0x1a, 0x37, 0x73, 0x67, 0x41, 0x37, 0x61, 0x6b, 0xea, 0x0b, 0xe7, 0xc1, + 0x56, 0xc2, 0xf6, 0xf9, 0x13, 0x5a, 0x6b, 0x0d, 0xa3, 0x55, 0xa6, 0x35, 0x2d, 0x4e, 0x44, 0x9f, + 0x3f, 0x21, 0x69, 0x81, 0x59, 0xdc, 0x27, 0xf4, 0x13, 0x5b, 0x22, 0x73, 0xad, 0x4a, 0xc3, 0x68, + 0x6d, 0xd0, 0xed, 0x7c, 0xda, 0xd0, 0x4f, 0x28, 0x32, 0x97, 0x1c, 0xc2, 0xee, 0x32, 0xf9, 0x43, + 0x72, 0x85, 0xd6, 0xba, 0x46, 0x77, 0x16, 0xe8, 0x4d, 0x2a, 0x93, 0x23, 0x28, 0xab, 0x24, 0x42, + 0xeb, 0xf7, 0x75, 0xc3, 0x68, 0x6d, 0x1f, 0xd7, 0xff, 0x5d, 0xcc, 0x24, 0x89, 0x90, 0x6a, 0x88, + 0x7c, 0x80, 0x4d, 0xc5, 0x03, 0x9c, 0x4f, 0xf9, 0xe7, 0x5a, 0xef, 0x1b, 0x52, 0x31, 0x9b, 0xb2, + 0xf9, 0x08, 0xf5, 0xb7, 0x77, 0x4a, 0xfa, 0x60, 0xc6, 0xdc, 0x0b, 0x99, 0x9a, 0x49, 0x2c, 0x5e, + 0x23, 0x4b, 0xc7, 0xfb, 0x79, 0x3a, 0x0a, 0x3f, 0x2b, 0xec, 0x85, 0x4f, 0xe8, 0x8b, 0x08, 0x2f, + 0x56, 0xe8, 0x4e, 0xfc, 0xd2, 0x5a, 0xce, 0xc5, 0x4f, 0x03, 0xc8, 0x52, 0x22, 0xd2, 0x6b, 0x49, + 0xce, 0x88, 0x05, 0xeb, 0xce, 0x3d, 0x0b, 0x43, 0xf4, 0xf3, 0x58, 0x14, 0x47, 0xb2, 0x07, 0x6b, + 0xea, 0xd9, 0xe6, 0xae, 0x0e, 0x43, 0x95, 0x96, 0xd5, 0xf3, 0xa5, 0x4b, 0x0e, 0x00, 0x16, 0xe9, + 0xd5, 0xef, 0x5a, 0xa5, 0x4b, 0x0a, 0x79, 0x07, 0xd5, 0x34, 0x56, 0x71, 0xc4, 0x1c, 0xd4, 0xef, + 0x58, 0xa5, 0x0b, 0xe1, 0xf0, 0x0e, 0xb6, 0x5f, 0x6e, 0x8c, 0xec, 0x40, 0xad, 0x3b, 0xec, 0xdb, + 0xdf, 0x06, 0x57, 0x83, 0xe1, 0xcd, 0xc0, 0x5c, 0x29, 0x84, 0x11, 0xbd, 0xfc, 0x7e, 0x32, 0xe9, + 0x99, 0x06, 0xd9, 0x85, 0xad, 0x54, 0x98, 0xd0, 0x93, 0xc1, 0xf8, 0xb2, 0x37, 0x98, 0x98, 0xab, + 0x85, 0x34, 0x3c, 0x3f, 0xef, 0xf7, 0xce, 0xbe, 0xf6, 0xa8, 0x59, 0x22, 0x9b, 0xb0, 0x91, 0x4a, + 0x67, 0xdd, 0x93, 0xb1, 0x59, 0x3e, 0x1d, 0xc3, 0x47, 0x21, 0xbd, 0xf6, 0x7d, 0x12, 0xa1, 0xf4, + 0xd1, 0xf5, 0x50, 0xb6, 0xef, 0xd8, 0x54, 0x72, 0x27, 0xfb, 0xd6, 0xe3, 0x7c, 0x93, 0xb7, 0x47, + 0x1e, 0x57, 0xf7, 0xb3, 0x69, 0x7a, 0xec, 0x2c, 0xc1, 0x9d, 0x0c, 0xee, 0x64, 0x70, 0x27, 0x83, + 0xa7, 0x15, 0x7d, 0xfc, 0xf2, 0x37, 0x00, 0x00, 0xff, 0xff, 0x45, 0x74, 0xa1, 0x4c, 0x61, 0x04, + 0x00, 0x00, }