diff --git a/protos/common/common.pb.go b/protos/common/common.pb.go index 56bbd337c72..ac40bb0db35 100644 --- a/protos/common/common.pb.go +++ b/protos/common/common.pb.go @@ -2,6 +2,39 @@ // source: common/common.proto // DO NOT EDIT! +/* +Package common is a generated protocol buffer package. + +It is generated from these files: + common/common.proto + common/configuration.proto + common/msp_principal.proto + +It has these top-level messages: + LastConfiguration + Metadata + MetadataSignature + Header + ChainHeader + SignatureHeader + Payload + Envelope + Block + BlockHeader + BlockData + BlockMetadata + ConfigurationEnvelope + ConfigurationTemplate + SignedConfigurationItem + ConfigurationItem + ConfigurationSignature + Policy + SignaturePolicyEnvelope + SignaturePolicy + MSPPrincipal + OrganizationUnit + MSPRole +*/ package common import proto "github.com/golang/protobuf/proto" @@ -14,6 +47,12 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package + // These status codes are intended to resemble selected HTTP status codes type Status int32 @@ -52,7 +91,7 @@ var Status_value = map[string]int32{ func (x Status) String() string { return proto.EnumName(Status_name, int32(x)) } -func (Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } +func (Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } type HeaderType int32 @@ -85,7 +124,7 @@ var HeaderType_value = map[string]int32{ func (x HeaderType) String() string { return proto.EnumName(HeaderType_name, int32(x)) } -func (HeaderType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } +func (HeaderType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } // This enum enlist indexes of the block metadata array type BlockMetadataIndex int32 @@ -110,7 +149,7 @@ var BlockMetadataIndex_value = map[string]int32{ func (x BlockMetadataIndex) String() string { return proto.EnumName(BlockMetadataIndex_name, int32(x)) } -func (BlockMetadataIndex) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } +func (BlockMetadataIndex) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } // LastConfiguration is the encoded value for the Metadata message which is encoded in the LAST_CONFIGURATION block metadata index type LastConfiguration struct { @@ -120,7 +159,7 @@ type LastConfiguration struct { func (m *LastConfiguration) Reset() { *m = LastConfiguration{} } func (m *LastConfiguration) String() string { return proto.CompactTextString(m) } func (*LastConfiguration) ProtoMessage() {} -func (*LastConfiguration) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } +func (*LastConfiguration) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } // Metadata is a common structure to be used to encode block metadata type Metadata struct { @@ -131,7 +170,7 @@ type Metadata struct { func (m *Metadata) Reset() { *m = Metadata{} } func (m *Metadata) String() string { return proto.CompactTextString(m) } func (*Metadata) ProtoMessage() {} -func (*Metadata) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } +func (*Metadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } func (m *Metadata) GetSignatures() []*MetadataSignature { if m != nil { @@ -148,7 +187,7 @@ type MetadataSignature struct { func (m *MetadataSignature) Reset() { *m = MetadataSignature{} } func (m *MetadataSignature) String() string { return proto.CompactTextString(m) } func (*MetadataSignature) ProtoMessage() {} -func (*MetadataSignature) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } +func (*MetadataSignature) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } type Header struct { ChainHeader *ChainHeader `protobuf:"bytes,1,opt,name=chainHeader" json:"chainHeader,omitempty"` @@ -158,7 +197,7 @@ type Header struct { func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} -func (*Header) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} } +func (*Header) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } func (m *Header) GetChainHeader() *ChainHeader { if m != nil { @@ -206,7 +245,7 @@ type ChainHeader struct { func (m *ChainHeader) Reset() { *m = ChainHeader{} } func (m *ChainHeader) String() string { return proto.CompactTextString(m) } func (*ChainHeader) ProtoMessage() {} -func (*ChainHeader) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } +func (*ChainHeader) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } func (m *ChainHeader) GetTimestamp() *google_protobuf.Timestamp { if m != nil { @@ -225,7 +264,7 @@ type SignatureHeader struct { func (m *SignatureHeader) Reset() { *m = SignatureHeader{} } func (m *SignatureHeader) String() string { return proto.CompactTextString(m) } func (*SignatureHeader) ProtoMessage() {} -func (*SignatureHeader) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} } +func (*SignatureHeader) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } // Payload is the message contents (and header to allow for signing) type Payload struct { @@ -238,7 +277,7 @@ type Payload struct { func (m *Payload) Reset() { *m = Payload{} } func (m *Payload) String() string { return proto.CompactTextString(m) } func (*Payload) ProtoMessage() {} -func (*Payload) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} } +func (*Payload) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } func (m *Payload) GetHeader() *Header { if m != nil { @@ -258,7 +297,7 @@ type Envelope struct { func (m *Envelope) Reset() { *m = Envelope{} } func (m *Envelope) String() string { return proto.CompactTextString(m) } func (*Envelope) ProtoMessage() {} -func (*Envelope) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} } +func (*Envelope) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } // This is finalized block structure to be shared among the orderer and peer // Note that the BlockHeader chains to the previous BlockHeader, and the BlockData hash is embedded @@ -273,7 +312,7 @@ type Block struct { func (m *Block) Reset() { *m = Block{} } func (m *Block) String() string { return proto.CompactTextString(m) } func (*Block) ProtoMessage() {} -func (*Block) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} } +func (*Block) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } func (m *Block) GetHeader() *BlockHeader { if m != nil { @@ -305,7 +344,7 @@ type BlockHeader struct { func (m *BlockHeader) Reset() { *m = BlockHeader{} } func (m *BlockHeader) String() string { return proto.CompactTextString(m) } func (*BlockHeader) ProtoMessage() {} -func (*BlockHeader) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{9} } +func (*BlockHeader) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } type BlockData struct { Data [][]byte `protobuf:"bytes,1,rep,name=Data,proto3" json:"Data,omitempty"` @@ -314,7 +353,7 @@ type BlockData struct { func (m *BlockData) Reset() { *m = BlockData{} } func (m *BlockData) String() string { return proto.CompactTextString(m) } func (*BlockData) ProtoMessage() {} -func (*BlockData) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{10} } +func (*BlockData) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } type BlockMetadata struct { Metadata [][]byte `protobuf:"bytes,1,rep,name=Metadata,proto3" json:"Metadata,omitempty"` @@ -323,7 +362,7 @@ type BlockMetadata struct { func (m *BlockMetadata) Reset() { *m = BlockMetadata{} } func (m *BlockMetadata) String() string { return proto.CompactTextString(m) } func (*BlockMetadata) ProtoMessage() {} -func (*BlockMetadata) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{11} } +func (*BlockMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } func init() { proto.RegisterType((*LastConfiguration)(nil), "common.LastConfiguration") @@ -343,9 +382,9 @@ func init() { proto.RegisterEnum("common.BlockMetadataIndex", BlockMetadataIndex_name, BlockMetadataIndex_value) } -func init() { proto.RegisterFile("common/common.proto", fileDescriptor1) } +func init() { proto.RegisterFile("common/common.proto", fileDescriptor0) } -var fileDescriptor1 = []byte{ +var fileDescriptor0 = []byte{ // 866 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x55, 0xdd, 0x6e, 0xe3, 0x44, 0x14, 0xae, 0xe3, 0xfc, 0x34, 0x27, 0xa5, 0xeb, 0x4e, 0xb7, 0xbb, 0xde, 0x8a, 0xd5, 0x56, 0x96, diff --git a/protos/common/configuration.pb.go b/protos/common/configuration.pb.go index f83e87d5c6e..9e859bb4c61 100644 --- a/protos/common/configuration.pb.go +++ b/protos/common/configuration.pb.go @@ -39,7 +39,7 @@ func (x ConfigurationItem_ConfigurationType) String() string { return proto.EnumName(ConfigurationItem_ConfigurationType_name, int32(x)) } func (ConfigurationItem_ConfigurationType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor2, []int{3, 0} + return fileDescriptor1, []int{3, 0} } type Policy_PolicyType int32 @@ -64,7 +64,7 @@ var Policy_PolicyType_value = map[string]int32{ func (x Policy_PolicyType) String() string { return proto.EnumName(Policy_PolicyType_name, int32(x)) } -func (Policy_PolicyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{5, 0} } +func (Policy_PolicyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{5, 0} } // ConfigurationEnvelope is designed to contain _all_ configuration for a chain with no dependency // on previous configuration transactions. @@ -94,7 +94,7 @@ type ConfigurationEnvelope struct { func (m *ConfigurationEnvelope) Reset() { *m = ConfigurationEnvelope{} } func (m *ConfigurationEnvelope) String() string { return proto.CompactTextString(m) } func (*ConfigurationEnvelope) ProtoMessage() {} -func (*ConfigurationEnvelope) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } +func (*ConfigurationEnvelope) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } func (m *ConfigurationEnvelope) GetItems() []*SignedConfigurationItem { if m != nil { @@ -113,7 +113,7 @@ type ConfigurationTemplate struct { func (m *ConfigurationTemplate) Reset() { *m = ConfigurationTemplate{} } func (m *ConfigurationTemplate) String() string { return proto.CompactTextString(m) } func (*ConfigurationTemplate) ProtoMessage() {} -func (*ConfigurationTemplate) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } +func (*ConfigurationTemplate) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } func (m *ConfigurationTemplate) GetItems() []*ConfigurationItem { if m != nil { @@ -131,7 +131,7 @@ type SignedConfigurationItem struct { func (m *SignedConfigurationItem) Reset() { *m = SignedConfigurationItem{} } func (m *SignedConfigurationItem) String() string { return proto.CompactTextString(m) } func (*SignedConfigurationItem) ProtoMessage() {} -func (*SignedConfigurationItem) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} } +func (*SignedConfigurationItem) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } func (m *SignedConfigurationItem) GetSignatures() []*ConfigurationSignature { if m != nil { @@ -152,7 +152,7 @@ type ConfigurationItem struct { func (m *ConfigurationItem) Reset() { *m = ConfigurationItem{} } func (m *ConfigurationItem) String() string { return proto.CompactTextString(m) } func (*ConfigurationItem) ProtoMessage() {} -func (*ConfigurationItem) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} } +func (*ConfigurationItem) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} } func (m *ConfigurationItem) GetHeader() *ChainHeader { if m != nil { @@ -169,7 +169,7 @@ type ConfigurationSignature struct { func (m *ConfigurationSignature) Reset() { *m = ConfigurationSignature{} } func (m *ConfigurationSignature) String() string { return proto.CompactTextString(m) } func (*ConfigurationSignature) ProtoMessage() {} -func (*ConfigurationSignature) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} } +func (*ConfigurationSignature) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } // Policy expresses a policy which the orderer can evaluate, because there has been some desire expressed to support // multiple policy engines, this is typed as a oneof for now @@ -181,7 +181,7 @@ type Policy struct { func (m *Policy) Reset() { *m = Policy{} } func (m *Policy) String() string { return proto.CompactTextString(m) } func (*Policy) ProtoMessage() {} -func (*Policy) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{5} } +func (*Policy) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} } // SignaturePolicyEnvelope wraps a SignaturePolicy and includes a version for future enhancements type SignaturePolicyEnvelope struct { @@ -193,7 +193,7 @@ type SignaturePolicyEnvelope struct { func (m *SignaturePolicyEnvelope) Reset() { *m = SignaturePolicyEnvelope{} } func (m *SignaturePolicyEnvelope) String() string { return proto.CompactTextString(m) } func (*SignaturePolicyEnvelope) ProtoMessage() {} -func (*SignaturePolicyEnvelope) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} } +func (*SignaturePolicyEnvelope) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} } func (m *SignaturePolicyEnvelope) GetPolicy() *SignaturePolicy { if m != nil { @@ -225,7 +225,7 @@ type SignaturePolicy struct { func (m *SignaturePolicy) Reset() { *m = SignaturePolicy{} } func (m *SignaturePolicy) String() string { return proto.CompactTextString(m) } func (*SignaturePolicy) ProtoMessage() {} -func (*SignaturePolicy) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} } +func (*SignaturePolicy) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} } type isSignaturePolicy_Type interface { isSignaturePolicy_Type() @@ -339,7 +339,7 @@ type SignaturePolicy_NOutOf struct { func (m *SignaturePolicy_NOutOf) Reset() { *m = SignaturePolicy_NOutOf{} } func (m *SignaturePolicy_NOutOf) String() string { return proto.CompactTextString(m) } func (*SignaturePolicy_NOutOf) ProtoMessage() {} -func (*SignaturePolicy_NOutOf) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7, 0} } +func (*SignaturePolicy_NOutOf) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7, 0} } func (m *SignaturePolicy_NOutOf) GetPolicies() []*SignaturePolicy { if m != nil { @@ -362,47 +362,47 @@ func init() { proto.RegisterEnum("common.Policy_PolicyType", Policy_PolicyType_name, Policy_PolicyType_value) } -func init() { proto.RegisterFile("common/configuration.proto", fileDescriptor2) } - -var fileDescriptor2 = []byte{ - // 617 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x54, 0xdb, 0x6e, 0xda, 0x40, - 0x10, 0x65, 0xb9, 0x98, 0x30, 0xd0, 0xc6, 0x9d, 0xa4, 0x89, 0x83, 0xa2, 0x14, 0xf9, 0x09, 0x29, - 0x0d, 0xa8, 0x24, 0x7d, 0x6d, 0x95, 0x54, 0x69, 0x89, 0xd2, 0x18, 0xb4, 0x24, 0xa9, 0xd4, 0xa7, - 0x3a, 0x78, 0x81, 0x95, 0x8c, 0x6d, 0xad, 0x4d, 0x25, 0xbe, 0xa0, 0xff, 0xd0, 0x4f, 0xe9, 0x53, - 0x3f, 0xad, 0xf2, 0xae, 0xed, 0x1a, 0x02, 0x4f, 0xec, 0x9c, 0x39, 0xe7, 0xcc, 0x45, 0x8c, 0xa1, - 0x39, 0xf6, 0xe7, 0x73, 0xdf, 0xeb, 0x8e, 0x7d, 0x6f, 0xc2, 0xa7, 0x0b, 0x61, 0x47, 0xdc, 0xf7, - 0x3a, 0x81, 0xf0, 0x23, 0x1f, 0x35, 0x95, 0x6b, 0xee, 0x65, 0x9c, 0xf8, 0x47, 0x25, 0x9b, 0x47, - 0x29, 0x38, 0xb3, 0xb9, 0x77, 0xa6, 0xe4, 0x2a, 0x65, 0x5a, 0xf0, 0xfa, 0x53, 0xde, 0xee, 0xda, - 0xfb, 0xc9, 0x5c, 0x3f, 0x60, 0xf8, 0x1e, 0x2a, 0x37, 0x11, 0x9b, 0x87, 0x06, 0x69, 0x95, 0xda, - 0xf5, 0xde, 0x9b, 0x4e, 0xe2, 0x38, 0xe2, 0x53, 0x8f, 0x39, 0x2b, 0x9a, 0x98, 0x47, 0x15, 0xdb, - 0xec, 0xaf, 0xf9, 0xdd, 0xb3, 0x79, 0xe0, 0xda, 0x11, 0xc3, 0xee, 0xaa, 0xdf, 0x51, 0xea, 0xb7, - 0xd5, 0xe9, 0x17, 0x81, 0xc3, 0x2d, 0xc5, 0xf0, 0x2d, 0xbc, 0x7a, 0x06, 0x1a, 0xa4, 0x45, 0xda, - 0x0d, 0xfa, 0x3c, 0x81, 0x1f, 0x00, 0x62, 0x23, 0x3b, 0x5a, 0x08, 0x16, 0x1a, 0x45, 0x59, 0xff, - 0x64, 0x63, 0xfd, 0x8c, 0x46, 0x73, 0x0a, 0xf3, 0x6f, 0x71, 0x43, 0x39, 0x3c, 0x05, 0xad, 0xcf, - 0x6c, 0x87, 0x09, 0x59, 0xb8, 0xde, 0xdb, 0xcb, 0x1c, 0xe3, 0x2d, 0xab, 0x14, 0x4d, 0x28, 0xf8, - 0x11, 0xca, 0xf7, 0xcb, 0x80, 0x19, 0xc5, 0x16, 0x69, 0xbf, 0xec, 0x9d, 0x6e, 0x1d, 0x7e, 0x15, - 0x89, 0x25, 0x54, 0x0a, 0xd1, 0x84, 0xc6, 0x57, 0x3b, 0x8c, 0xee, 0x7c, 0x87, 0x4f, 0x38, 0x73, - 0x8c, 0x52, 0x8b, 0xb4, 0xcb, 0x74, 0x05, 0xc3, 0x0e, 0xa0, 0x7a, 0x8f, 0xa5, 0x7a, 0xe8, 0xbb, - 0x7c, 0xbc, 0x34, 0xca, 0x2d, 0xd2, 0xae, 0xd1, 0x0d, 0x19, 0xd4, 0xa1, 0x74, 0xcb, 0x96, 0x46, - 0x45, 0x12, 0xe2, 0x27, 0xee, 0x43, 0xe5, 0xd1, 0x76, 0x17, 0xcc, 0xd0, 0xe4, 0x2e, 0x55, 0x60, - 0x5e, 0xae, 0x8d, 0x2f, 0x1b, 0x02, 0xd0, 0x94, 0x8d, 0x5e, 0xc0, 0x1a, 0x54, 0xe4, 0xd0, 0x3a, - 0xc1, 0x3a, 0x54, 0x07, 0xc2, 0x61, 0x82, 0x09, 0xbd, 0x88, 0x3b, 0x50, 0x1e, 0x32, 0x26, 0xf4, - 0x92, 0xf9, 0x03, 0x0e, 0x36, 0x2f, 0x1a, 0xdb, 0xb0, 0x1b, 0xa6, 0x41, 0x6e, 0x9f, 0x0d, 0xba, - 0x0e, 0xe3, 0x31, 0xd4, 0x32, 0x48, 0x2e, 0xb2, 0x41, 0xff, 0x03, 0xe6, 0x34, 0xed, 0x07, 0x11, - 0xca, 0x51, 0xbc, 0xeb, 0xd8, 0xa6, 0x42, 0xe5, 0x1b, 0x0f, 0x40, 0x0b, 0xd4, 0x3a, 0x94, 0x30, - 0x89, 0xcc, 0x77, 0x00, 0x4a, 0x25, 0x67, 0xaa, 0x43, 0xf5, 0xc1, 0xba, 0xb5, 0x06, 0xdf, 0x2c, - 0xbd, 0x80, 0x2f, 0xa0, 0x36, 0xba, 0xf9, 0x62, 0x5d, 0xde, 0x3f, 0xd0, 0x6b, 0x9d, 0x60, 0x15, - 0x4a, 0x77, 0xa3, 0xa1, 0x5e, 0x34, 0x7f, 0x27, 0xff, 0x4b, 0x59, 0x56, 0x89, 0xb3, 0xa3, 0x31, - 0xa0, 0xfa, 0xc8, 0x44, 0xc8, 0x7d, 0x2f, 0xa9, 0x9e, 0x86, 0xd8, 0x4d, 0xdb, 0x93, 0x0d, 0xd4, - 0x7b, 0x87, 0xf9, 0x7b, 0xca, 0x59, 0xd1, 0x74, 0x8a, 0x0b, 0x80, 0x1b, 0x87, 0x79, 0x11, 0x8f, - 0x38, 0x0b, 0x8d, 0x92, 0xfc, 0xd3, 0xee, 0xa7, 0xa2, 0xbb, 0xd1, 0x70, 0x28, 0xb8, 0x37, 0xe6, - 0x81, 0xed, 0xd2, 0x1c, 0xcf, 0xfc, 0x43, 0x60, 0x77, 0xcd, 0x11, 0x8f, 0x61, 0x47, 0xdd, 0xd1, - 0xd5, 0x52, 0x75, 0xd5, 0x2f, 0xd0, 0x0c, 0xc1, 0x0b, 0x28, 0x7f, 0x16, 0xfe, 0x3c, 0x69, 0xeb, - 0x64, 0x4b, 0x5b, 0x1d, 0x6b, 0xb0, 0x88, 0x06, 0x93, 0x7e, 0x81, 0x4a, 0x76, 0xf3, 0x16, 0x34, - 0x85, 0x60, 0x03, 0x88, 0x95, 0x0c, 0x4b, 0x2c, 0x3c, 0x87, 0x1d, 0x29, 0xe0, 0xd9, 0xa1, 0x6d, - 0x1d, 0x34, 0x23, 0x5e, 0x69, 0xea, 0x38, 0xae, 0xce, 0xbe, 0x9f, 0x4e, 0x79, 0x34, 0x5b, 0x3c, - 0xc5, 0x92, 0xee, 0x6c, 0x19, 0x30, 0xe1, 0x32, 0x67, 0xca, 0x44, 0x77, 0x62, 0x3f, 0x09, 0x3e, - 0xee, 0xca, 0x4f, 0x56, 0x98, 0x7c, 0xdb, 0x9e, 0x34, 0x19, 0x9e, 0xff, 0x0b, 0x00, 0x00, 0xff, - 0xff, 0x2d, 0x2a, 0xb3, 0xa6, 0x17, 0x05, 0x00, 0x00, +func init() { proto.RegisterFile("common/configuration.proto", fileDescriptor1) } + +var fileDescriptor1 = []byte{ + // 619 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x54, 0xdd, 0x6e, 0xda, 0x4c, + 0x10, 0x65, 0xf9, 0x31, 0x61, 0xe0, 0xfb, 0xe2, 0x4e, 0xd2, 0xc4, 0x45, 0x51, 0x8a, 0x7c, 0x85, + 0x94, 0x16, 0x54, 0x92, 0xde, 0xb6, 0x4a, 0xaa, 0xb4, 0x44, 0x69, 0x0c, 0x5a, 0x92, 0x54, 0xea, + 0x4d, 0xeb, 0xe0, 0x85, 0xac, 0xe4, 0x3f, 0xad, 0x4d, 0x25, 0x9e, 0xa0, 0xef, 0xd0, 0x47, 0xe9, + 0x55, 0x1f, 0xad, 0xf2, 0xae, 0xed, 0x1a, 0x02, 0x57, 0xec, 0x9c, 0x39, 0xe7, 0xcc, 0x8f, 0x18, + 0x43, 0x7b, 0x1a, 0x78, 0x5e, 0xe0, 0xf7, 0xa7, 0x81, 0x3f, 0xe3, 0xf3, 0x85, 0xb0, 0x63, 0x1e, + 0xf8, 0xbd, 0x50, 0x04, 0x71, 0x80, 0x9a, 0xca, 0xb5, 0xf7, 0x72, 0x4e, 0xf2, 0xa3, 0x92, 0xed, + 0x4c, 0xe8, 0x45, 0xe1, 0xb7, 0x50, 0x70, 0x7f, 0xca, 0x43, 0xdb, 0x55, 0x39, 0xd3, 0x82, 0xe7, + 0x1f, 0x8a, 0x7e, 0x97, 0xfe, 0x0f, 0xe6, 0x06, 0x21, 0xc3, 0xb7, 0x50, 0xbb, 0x8a, 0x99, 0x17, + 0x19, 0xa4, 0x53, 0xe9, 0x36, 0x07, 0x2f, 0x7b, 0xa9, 0xe5, 0x84, 0xcf, 0x7d, 0xe6, 0xac, 0x68, + 0x12, 0x1e, 0x55, 0x6c, 0x73, 0xb8, 0xe6, 0x77, 0xcb, 0xbc, 0xd0, 0xb5, 0x63, 0x86, 0xfd, 0x55, + 0xbf, 0x17, 0x99, 0xdf, 0x56, 0xa7, 0x9f, 0x04, 0x0e, 0xb7, 0x14, 0xc3, 0x57, 0xf0, 0xec, 0x09, + 0x68, 0x90, 0x0e, 0xe9, 0xb6, 0xe8, 0xd3, 0x04, 0xbe, 0x03, 0x48, 0x8c, 0xec, 0x78, 0x21, 0x58, + 0x64, 0x94, 0x65, 0xfd, 0xe3, 0x8d, 0xf5, 0x73, 0x1a, 0x2d, 0x28, 0xcc, 0x3f, 0xe5, 0x0d, 0xe5, + 0xf0, 0x04, 0xb4, 0x21, 0xb3, 0x1d, 0x26, 0x64, 0xe1, 0xe6, 0x60, 0x2f, 0x77, 0x7c, 0xb4, 0xb9, + 0xaf, 0x52, 0x34, 0xa5, 0xe0, 0x7b, 0xa8, 0xde, 0x2e, 0x43, 0x66, 0x94, 0x3b, 0xa4, 0xfb, 0xff, + 0xe0, 0x64, 0xeb, 0xf0, 0xab, 0x48, 0x22, 0xa1, 0x52, 0x88, 0x26, 0xb4, 0x3e, 0xdb, 0x51, 0x7c, + 0x13, 0x38, 0x7c, 0xc6, 0x99, 0x63, 0x54, 0x3a, 0xa4, 0x5b, 0xa5, 0x2b, 0x18, 0xf6, 0x00, 0xd5, + 0x7b, 0x2a, 0xd5, 0xe3, 0xc0, 0xe5, 0xd3, 0xa5, 0x51, 0xed, 0x90, 0x6e, 0x83, 0x6e, 0xc8, 0xa0, + 0x0e, 0x95, 0x6b, 0xb6, 0x34, 0x6a, 0x92, 0x90, 0x3c, 0x71, 0x1f, 0x6a, 0xf7, 0xb6, 0xbb, 0x60, + 0x86, 0x26, 0x77, 0xa9, 0x02, 0xf3, 0x7c, 0x6d, 0x7c, 0xd9, 0x10, 0x80, 0xa6, 0x6c, 0xf4, 0x12, + 0x36, 0xa0, 0x26, 0x87, 0xd6, 0x09, 0x36, 0xa1, 0x3e, 0x12, 0x0e, 0x13, 0x4c, 0xe8, 0x65, 0xdc, + 0x81, 0xea, 0x98, 0x31, 0xa1, 0x57, 0xcc, 0xef, 0x70, 0xb0, 0x79, 0xd1, 0xd8, 0x85, 0xdd, 0x28, + 0x0b, 0x0a, 0xfb, 0x6c, 0xd1, 0x75, 0x18, 0x8f, 0xa0, 0x91, 0x43, 0x72, 0x91, 0x2d, 0xfa, 0x0f, + 0x30, 0xe7, 0x59, 0x3f, 0x88, 0x50, 0x8d, 0x93, 0x5d, 0x27, 0x36, 0x35, 0x2a, 0xdf, 0x78, 0x00, + 0x5a, 0xa8, 0xd6, 0xa1, 0x84, 0x69, 0x64, 0xbe, 0x01, 0x50, 0x2a, 0x39, 0x53, 0x13, 0xea, 0x77, + 0xd6, 0xb5, 0x35, 0xfa, 0x62, 0xe9, 0x25, 0xfc, 0x0f, 0x1a, 0x93, 0xab, 0x4f, 0xd6, 0xf9, 0xed, + 0x1d, 0xbd, 0xd4, 0x09, 0xd6, 0xa1, 0x72, 0x33, 0x19, 0xeb, 0x65, 0xf3, 0x57, 0xfa, 0xbf, 0x94, + 0x65, 0x95, 0x38, 0x3f, 0x1a, 0x03, 0xea, 0xf7, 0x4c, 0x44, 0x3c, 0xf0, 0xd3, 0xea, 0x59, 0x88, + 0xfd, 0xac, 0x3d, 0xd9, 0x40, 0x73, 0x70, 0x58, 0xbc, 0xa7, 0x82, 0x15, 0xcd, 0xa6, 0x38, 0x03, + 0xb8, 0x72, 0x98, 0x1f, 0xf3, 0x98, 0xb3, 0xc8, 0xa8, 0xc8, 0x3f, 0xed, 0x7e, 0x26, 0xba, 0x99, + 0x8c, 0xc7, 0xd9, 0x21, 0xd3, 0x02, 0xcf, 0xfc, 0x4d, 0x60, 0x77, 0xcd, 0x11, 0x8f, 0x60, 0x47, + 0xdd, 0xd1, 0xc5, 0x52, 0x75, 0x35, 0x2c, 0xd1, 0x1c, 0xc1, 0x33, 0xa8, 0x7e, 0x14, 0x81, 0x97, + 0xb6, 0x75, 0xbc, 0xa5, 0xad, 0x9e, 0x35, 0x5a, 0xc4, 0xa3, 0xd9, 0xb0, 0x44, 0x25, 0xbb, 0x7d, + 0x0d, 0x9a, 0x42, 0xb0, 0x05, 0xc4, 0x4a, 0x87, 0x25, 0x16, 0x9e, 0xc2, 0x8e, 0x14, 0xf0, 0xfc, + 0xd0, 0xb6, 0x0e, 0x9a, 0x13, 0x2f, 0x34, 0x75, 0x1c, 0x17, 0xaf, 0xbf, 0x9e, 0xcc, 0x79, 0xfc, + 0xb8, 0x78, 0x48, 0x24, 0xfd, 0xc7, 0x65, 0xc8, 0x84, 0xcb, 0x9c, 0x39, 0x13, 0xfd, 0x99, 0xfd, + 0x20, 0xf8, 0xb4, 0x2f, 0x3f, 0x59, 0x51, 0xfa, 0x71, 0x7b, 0xd0, 0x64, 0x78, 0xfa, 0x37, 0x00, + 0x00, 0xff, 0xff, 0xaf, 0x80, 0xf0, 0x81, 0x18, 0x05, 0x00, 0x00, } diff --git a/protos/common/configuration.proto b/protos/common/configuration.proto index 679951bfda5..e966baba495 100644 --- a/protos/common/configuration.proto +++ b/protos/common/configuration.proto @@ -17,7 +17,7 @@ limitations under the License. syntax = "proto3"; import "common/common.proto"; -import "common/chain-config.proto"; +import "common/msp_principal.proto"; option go_package = "github.com/hyperledger/fabric/protos/common"; diff --git a/protos/common/chain-config.pb.go b/protos/common/msp_principal.pb.go similarity index 67% rename from protos/common/chain-config.pb.go rename to protos/common/msp_principal.pb.go index 12c820ded16..dad868dfe79 100644 --- a/protos/common/chain-config.pb.go +++ b/protos/common/msp_principal.pb.go @@ -1,40 +1,7 @@ // Code generated by protoc-gen-go. -// source: common/chain-config.proto +// source: common/msp_principal.proto // DO NOT EDIT! -/* -Package common is a generated protocol buffer package. - -It is generated from these files: - common/chain-config.proto - common/common.proto - common/configuration.proto - -It has these top-level messages: - MSPPrincipal - OrganizationUnit - MSPRole - LastConfiguration - Metadata - MetadataSignature - Header - ChainHeader - SignatureHeader - Payload - Envelope - Block - BlockHeader - BlockData - BlockMetadata - ConfigurationEnvelope - ConfigurationTemplate - SignedConfigurationItem - ConfigurationItem - ConfigurationSignature - Policy - SignaturePolicyEnvelope - SignaturePolicy -*/ package common import proto "github.com/golang/protobuf/proto" @@ -46,12 +13,6 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package - type MSPPrincipal_Classification int32 const ( @@ -80,7 +41,7 @@ func (x MSPPrincipal_Classification) String() string { return proto.EnumName(MSPPrincipal_Classification_name, int32(x)) } func (MSPPrincipal_Classification) EnumDescriptor() ([]byte, []int) { - return fileDescriptor0, []int{0, 0} + return fileDescriptor2, []int{0, 0} } type MSPRole_MSPRoleType int32 @@ -102,7 +63,7 @@ var MSPRole_MSPRoleType_value = map[string]int32{ func (x MSPRole_MSPRoleType) String() string { return proto.EnumName(MSPRole_MSPRoleType_name, int32(x)) } -func (MSPRole_MSPRoleType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} } +func (MSPRole_MSPRoleType) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{2, 0} } // MSPPrincipal aims to represent an MSP-centric set of identities. // In particular, this structure allows for definition of @@ -142,7 +103,7 @@ type MSPPrincipal struct { func (m *MSPPrincipal) Reset() { *m = MSPPrincipal{} } func (m *MSPPrincipal) String() string { return proto.CompactTextString(m) } func (*MSPPrincipal) ProtoMessage() {} -func (*MSPPrincipal) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (*MSPPrincipal) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } // OrganizationUnit governs the organization of the Principal // field of a policy principal when a specific organization unity members @@ -159,7 +120,7 @@ type OrganizationUnit struct { func (m *OrganizationUnit) Reset() { *m = OrganizationUnit{} } func (m *OrganizationUnit) String() string { return proto.CompactTextString(m) } func (*OrganizationUnit) ProtoMessage() {} -func (*OrganizationUnit) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } +func (*OrganizationUnit) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } // MSPRole governs the organization of the Principal // field of an MSPPrincipal when it aims to define one of the @@ -176,7 +137,7 @@ type MSPRole struct { func (m *MSPRole) Reset() { *m = MSPRole{} } func (m *MSPRole) String() string { return proto.CompactTextString(m) } func (*MSPRole) ProtoMessage() {} -func (*MSPRole) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +func (*MSPRole) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} } func init() { proto.RegisterType((*MSPPrincipal)(nil), "common.MSPPrincipal") @@ -186,29 +147,28 @@ func init() { proto.RegisterEnum("common.MSPRole_MSPRoleType", MSPRole_MSPRoleType_name, MSPRole_MSPRoleType_value) } -func init() { proto.RegisterFile("common/chain-config.proto", fileDescriptor0) } - -var fileDescriptor0 = []byte{ - // 321 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0x4f, 0x4b, 0xf3, 0x40, - 0x10, 0xc6, 0xbb, 0xe5, 0x7d, 0x2b, 0x19, 0xdb, 0x10, 0xf6, 0xa0, 0xf5, 0xcf, 0xa1, 0xc4, 0x1e, - 0x0a, 0xd2, 0x04, 0xea, 0x5d, 0x30, 0x1e, 0xc4, 0x43, 0x30, 0xa4, 0x7a, 0x11, 0x3c, 0x24, 0xe9, - 0x26, 0x1d, 0x48, 0x76, 0xc3, 0x76, 0x05, 0xd7, 0x0f, 0xe0, 0x27, 0xf4, 0x03, 0x49, 0x37, 0x5a, - 0xd3, 0x82, 0xe2, 0x69, 0x99, 0x67, 0x7e, 0xcf, 0x33, 0xbb, 0xcb, 0xc0, 0x51, 0x26, 0xaa, 0x4a, - 0x70, 0x3f, 0x5b, 0x26, 0xc8, 0xa7, 0x99, 0xe0, 0x39, 0x16, 0x5e, 0x2d, 0x85, 0x12, 0xb4, 0xd7, - 0xb4, 0xdc, 0x77, 0x02, 0xfd, 0x70, 0x1e, 0x45, 0x12, 0x79, 0x86, 0x75, 0x52, 0xd2, 0x27, 0x38, - 0xdc, 0x14, 0xd7, 0x65, 0xb2, 0x5a, 0x61, 0x8e, 0x59, 0xa2, 0x50, 0xf0, 0x21, 0x19, 0x91, 0x89, - 0x3d, 0x3b, 0xf3, 0x1a, 0xab, 0xd7, 0xb6, 0x79, 0xdb, 0x68, 0xfc, 0x53, 0x06, 0x3d, 0x05, 0x6b, - 0xd3, 0x1a, 0x76, 0x47, 0x64, 0xd2, 0x8f, 0xbf, 0x05, 0xf7, 0x06, 0xec, 0x1d, 0x7e, 0x00, 0x56, - 0xa0, 0xc3, 0x79, 0x14, 0x8b, 0x92, 0x39, 0x1d, 0x7a, 0x00, 0x34, 0xd0, 0x77, 0xb2, 0x48, 0x38, - 0xbe, 0x1a, 0xe0, 0x81, 0xa3, 0x72, 0x08, 0xb5, 0x01, 0x02, 0x7d, 0xbb, 0x60, 0x5c, 0xa1, 0xd2, - 0x4e, 0xd7, 0x7d, 0x01, 0x67, 0x97, 0xa2, 0x63, 0x18, 0x84, 0xf3, 0xa8, 0x81, 0x72, 0x64, 0xd2, - 0xbc, 0xc7, 0x8a, 0xb7, 0x45, 0x7a, 0x09, 0xc7, 0xbb, 0xce, 0x96, 0xa5, 0x6b, 0x2c, 0xbf, 0x10, - 0xee, 0x1b, 0x81, 0xbd, 0xcf, 0xfb, 0xfe, 0x71, 0xa2, 0x0f, 0xff, 0xd6, 0xb4, 0xc9, 0xb6, 0x67, - 0x27, 0xad, 0xef, 0x5d, 0xcb, 0x5f, 0xe7, 0xbd, 0xae, 0x59, 0x6c, 0x40, 0x77, 0x0c, 0xfb, 0x2d, - 0x91, 0x02, 0xf4, 0x42, 0x56, 0xa5, 0x4c, 0x3a, 0x1d, 0x6a, 0xc1, 0xff, 0xab, 0x45, 0x85, 0xdc, - 0x21, 0xc1, 0xf4, 0xf1, 0xbc, 0x40, 0xb5, 0x7c, 0x4e, 0xd7, 0x81, 0xfe, 0x52, 0xd7, 0x4c, 0x96, - 0x6c, 0x51, 0x30, 0xe9, 0xe7, 0x49, 0x2a, 0x31, 0xf3, 0xcd, 0x22, 0xac, 0xfc, 0x66, 0x5c, 0xda, - 0x33, 0xe5, 0xc5, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x19, 0xfd, 0x1d, 0x34, 0x02, 0x00, - 0x00, +func init() { proto.RegisterFile("common/msp_principal.proto", fileDescriptor2) } + +var fileDescriptor2 = []byte{ + // 316 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x4b, 0xc3, 0x30, + 0x14, 0xc6, 0x97, 0xa1, 0x93, 0x3e, 0xb7, 0x52, 0x72, 0xd0, 0x31, 0x3d, 0x8c, 0xba, 0xc3, 0x40, + 0x6c, 0x61, 0xde, 0x05, 0xeb, 0x41, 0x3c, 0x14, 0x4b, 0xa7, 0x17, 0x41, 0xa4, 0xed, 0xb2, 0xed, + 0x41, 0x9b, 0x86, 0x34, 0x82, 0xf1, 0x0f, 0xf0, 0x2f, 0xf4, 0x0f, 0x92, 0xa5, 0x6e, 0x76, 0x03, + 0xc5, 0x53, 0x79, 0xdf, 0xf7, 0xfb, 0xbe, 0xd7, 0x84, 0xc0, 0x20, 0x2b, 0x8b, 0xa2, 0xe4, 0x7e, + 0x51, 0x89, 0x17, 0x21, 0x91, 0x67, 0x28, 0x92, 0xdc, 0x13, 0xb2, 0x54, 0x25, 0xed, 0xd4, 0x9e, + 0xfb, 0x49, 0xa0, 0x1b, 0x4e, 0xa3, 0x68, 0x6d, 0xd3, 0x67, 0x38, 0xde, 0x0c, 0x37, 0x79, 0x52, + 0x55, 0x38, 0xc7, 0x2c, 0x51, 0x58, 0xf2, 0x3e, 0x19, 0x92, 0xb1, 0x3d, 0x39, 0xf3, 0xea, 0xa8, + 0xd7, 0x8c, 0x79, 0xdb, 0x68, 0xfc, 0x5b, 0x07, 0x3d, 0x05, 0x6b, 0x63, 0xf5, 0xdb, 0x43, 0x32, + 0xee, 0xc6, 0x3f, 0x82, 0x7b, 0x0b, 0xf6, 0x0e, 0xdf, 0x03, 0x2b, 0xd0, 0xe1, 0x34, 0x8a, 0xcb, + 0x9c, 0x39, 0x2d, 0x7a, 0x04, 0x34, 0xd0, 0xf7, 0x72, 0x91, 0x70, 0x7c, 0x37, 0xc0, 0x23, 0x47, + 0xe5, 0x10, 0x6a, 0x03, 0x04, 0xfa, 0x6e, 0xc6, 0xb8, 0x42, 0xa5, 0x9d, 0xb6, 0xfb, 0x06, 0xce, + 0x2e, 0x45, 0x47, 0xd0, 0x0b, 0xa7, 0x51, 0x0d, 0xcd, 0x91, 0x49, 0x73, 0x1e, 0x2b, 0xde, 0x16, + 0xe9, 0x15, 0x0c, 0x76, 0x93, 0x8d, 0x48, 0xdb, 0x44, 0xfe, 0x20, 0xdc, 0x0f, 0x02, 0x07, 0xdf, + 0xff, 0xfb, 0xcf, 0x8d, 0x3e, 0xec, 0xad, 0x68, 0xd3, 0x6d, 0x4f, 0x4e, 0x1a, 0xd7, 0xbb, 0x92, + 0xd7, 0xdf, 0x07, 0x2d, 0x58, 0x6c, 0x40, 0x77, 0x04, 0x87, 0x0d, 0x91, 0x02, 0x74, 0x42, 0x56, + 0xa4, 0x4c, 0x3a, 0x2d, 0x6a, 0xc1, 0xfe, 0xf5, 0xac, 0x40, 0xee, 0x90, 0xe0, 0xe2, 0xe9, 0x7c, + 0x81, 0x6a, 0xf9, 0x9a, 0xae, 0x0a, 0xfd, 0xa5, 0x16, 0x4c, 0xe6, 0x6c, 0xb6, 0x60, 0xd2, 0x9f, + 0x27, 0xa9, 0xc4, 0xcc, 0x37, 0x0f, 0xa1, 0xf2, 0xeb, 0x75, 0x69, 0xc7, 0x8c, 0x97, 0x5f, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x81, 0x8f, 0xfe, 0x6f, 0x35, 0x02, 0x00, 0x00, } diff --git a/protos/common/chain-config.proto b/protos/common/msp_principal.proto similarity index 82% rename from protos/common/chain-config.proto rename to protos/common/msp_principal.proto index 76b8887a045..2372aec6221 100644 --- a/protos/common/chain-config.proto +++ b/protos/common/msp_principal.proto @@ -22,26 +22,11 @@ option go_package = "github.com/hyperledger/fabric/protos/common"; package common; -// chain-config.proto contains proto messages defining the schema of -// a chain configuration structure. An example of how -// this could be -// -- VerifierMSPlist carries information associated to MSPs governing -// the chain -// -- MSPPrincipal carries the information needed to define policies -// for reading/writing or managing the chain -// -// An example of chain configuration could set the following parameters: -// -- an array of msp.MSPConfig items to denote the list of MSPs that govern -// the chain -// -- readers: a list of MSPPrincipal assuming that by default ANY entity -// being part of this list is able to read transactions of that chain -// -- writers: a list of MSPPrincipal assuming that by default ANY entity -// being part of this list is able to submit transactions to that chain -// -- admins: a list of MSPPrincipal assuming that by default ANY entity -// being part of this list is able to modify the configuraiton of that -// chain. - - +// msp_principal.proto contains proto messages defining the generalized +// MSP notion of identity called an MSPPrincipal. It is used as part of +// the chain configuration, in particular as the identity parameters to +// the configuration.proto file. This does not represent the MSP +// configuration for a chain, but is understood by MSPs // MSPPrincipal aims to represent an MSP-centric set of identities. // In particular, this structure allows for definition of