[FAB-2029] Fix proto enum style

https://jira.hyperledger.org/browse/FAB-2029

Per the official proto style guide, enums should be UPPER_CASE but the
current code has a mixture of UPPER_CASE and CamelCase.  This is
internal inconsistency is a problem, and this CR fixes the fabric protos
to adhere to the official proto style.

Change-Id: I95af90f29f9e8fa8a6eecbb528516cccc3187979
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

common/cauthdsl/cauthdsl_builder.go

@@ -55,7 +55,7 @@ func init() {
 func Envelope(policy *cb.SignaturePolicy, identities [][]byte) *cb.SignaturePolicyEnvelope {
 	ids := make([]*cb.MSPPrincipal, len(identities))
 	for i, _ := range ids {
-		ids[i] = &cb.MSPPrincipal{PrincipalClassification: cb.MSPPrincipal_ByIdentity, Principal: identities[i]}
+		ids[i] = &cb.MSPPrincipal{PrincipalClassification: cb.MSPPrincipal_IDENTITY, Principal: identities[i]}
 	}
 
 	return &cb.SignaturePolicyEnvelope{
@@ -79,8 +79,8 @@ func SignedBy(index int32) *cb.SignaturePolicy {
 func SignedByMspMember(mspId string) *cb.SignaturePolicyEnvelope {
 	// specify the principal: it's a member of the msp we just found
 	principal := &cb.MSPPrincipal{
-		PrincipalClassification: cb.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&cb.MSPRole{Role: cb.MSPRole_Member, MSPIdentifier: mspId})}
+		PrincipalClassification: cb.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&cb.MSPRole{Role: cb.MSPRole_MEMBER, MSPIdentifier: mspId})}
 
 	// create the policy: it requires exactly 1 signature from the first (and only) principal
 	p := &cb.SignaturePolicyEnvelope{

common/cauthdsl/policy_test.go

@@ -60,7 +60,7 @@ func makePolicySource(policyResult bool) []byte {
 func addPolicy(manager *policies.ManagerImpl, id string, policy []byte) {
 	manager.BeginConfig()
 	err := manager.ProposeConfig(&cb.ConfigItem{
-		Type:  cb.ConfigItem_Policy,
+		Type:  cb.ConfigItem_POLICY,
 		Key:   id,
 		Value: policy,
 	})

common/cauthdsl/policy_util.go

@@ -24,7 +24,7 @@ import (
 // TemplatePolicy creates a headerless configuration item representing a policy for a given key
 func TemplatePolicy(key string, sigPolicyEnv *cb.SignaturePolicyEnvelope) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type: cb.ConfigItem_Policy,
+		Type: cb.ConfigItem_POLICY,
 		Key:  key,
 		Value: utils.MarshalOrPanic(&cb.Policy{
 			Type:   int32(cb.Policy_SIGNATURE),

common/cauthdsl/policyparser.go

@@ -140,14 +140,14 @@ func secondPass(args ...interface{}) (interface{}, error) {
 			/* get the right role */
 			var r common.MSPRole_MSPRoleType
 			if subm[0][3] == "member" {
-				r = common.MSPRole_Member
+				r = common.MSPRole_MEMBER
 			} else {
-				r = common.MSPRole_Admin
+				r = common.MSPRole_ADMIN
 			}
 
 			/* build the principal we've been told */
 			p := &common.MSPPrincipal{
-				PrincipalClassification: common.MSPPrincipal_ByMSPRole,
+				PrincipalClassification: common.MSPPrincipal_ROLE,
 				Principal:               utils.MarshalOrPanic(&common.MSPRole{MSPIdentifier: subm[0][1], Role: r})}
 			ctx.principals = append(ctx.principals, p)
 

common/cauthdsl/policyparser_test.go

@@ -32,12 +32,12 @@ func TestAnd(t *testing.T) {
 	principals := make([]*common.MSPPrincipal, 0)
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "A"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "A"})})
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "B"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "B"})})
 
 	p2 := &common.SignaturePolicyEnvelope{
 		Version:    0,
@@ -55,12 +55,12 @@ func TestOr(t *testing.T) {
 	principals := make([]*common.MSPPrincipal, 0)
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "A"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "A"})})
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "B"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "B"})})
 
 	p2 := &common.SignaturePolicyEnvelope{
 		Version:    0,
@@ -78,16 +78,16 @@ func TestComplex1(t *testing.T) {
 	principals := make([]*common.MSPPrincipal, 0)
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "B"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "B"})})
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "C"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "C"})})
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "A"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "A"})})
 
 	p2 := &common.SignaturePolicyEnvelope{
 		Version:    0,
@@ -105,20 +105,20 @@ func TestComplex2(t *testing.T) {
 	principals := make([]*common.MSPPrincipal, 0)
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "A"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "A"})})
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "B"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "B"})})
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Admin, MSPIdentifier: "C"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_ADMIN, MSPIdentifier: "C"})})
 
 	principals = append(principals, &common.MSPPrincipal{
-		PrincipalClassification: common.MSPPrincipal_ByMSPRole,
-		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_Member, MSPIdentifier: "D"})})
+		PrincipalClassification: common.MSPPrincipal_ROLE,
+		Principal:               utils.MarshalOrPanic(&common.MSPRole{Role: common.MSPRole_MEMBER, MSPIdentifier: "D"})})
 
 	p2 := &common.SignaturePolicyEnvelope{
 		Version:    0,

common/chainconfig/chainconfig.go

@@ -123,7 +123,7 @@ func (pm *DescriptorImpl) CommitConfig() {
 
 // ProposeConfig is used to add new config to the config proposal
 func (pm *DescriptorImpl) ProposeConfig(configItem *cb.ConfigItem) error {
-	if configItem.Type != cb.ConfigItem_Chain {
+	if configItem.Type != cb.ConfigItem_CHAIN {
 		return fmt.Errorf("Expected type of ConfigItem_Chain, got %v", configItem.Type)
 	}
 

common/chainconfig/chainconfig_test.go

@@ -31,7 +31,7 @@ func init() {
 
 func makeInvalidConfigItem(key string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Chain,
+		Type:  cb.ConfigItem_CHAIN,
 		Key:   key,
 		Value: []byte("Garbage Data"),
 	}

common/chainconfig/chainconfig_util.go

@@ -28,7 +28,7 @@ const defaultHashingAlgorithm = SHA3Shake256
 // TemplateHashingAlgorithm creates a headerless config item representing the hashing algorithm
 func TemplateHashingAlgorithm(name string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Chain,
+		Type:  cb.ConfigItem_CHAIN,
 		Key:   HashingAlgorithmKey,
 		Value: utils.MarshalOrPanic(&cb.HashingAlgorithm{Name: name}),
 	}
@@ -45,7 +45,7 @@ const defaultBlockDataHashingStructureWidth = math.MaxUint32
 // TemplateBlockDataHashingStructure creates a headerless config item representing the block data hashing structure
 func TemplateBlockDataHashingStructure(width uint32) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Chain,
+		Type:  cb.ConfigItem_CHAIN,
 		Key:   BlockDataHashingStructureKey,
 		Value: utils.MarshalOrPanic(&cb.BlockDataHashingStructure{Width: width}),
 	}
@@ -61,7 +61,7 @@ var defaultOrdererAddresses = []string{"127.0.0.1:7050"}
 // TemplateOrdererAddressess creates a headerless config item representing the orderer addresses
 func TemplateOrdererAddresses(addresses []string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Chain,
+		Type:  cb.ConfigItem_CHAIN,
 		Key:   OrdererAddressesKey,
 		Value: utils.MarshalOrPanic(&cb.OrdererAddresses{Addresses: addresses}),
 	}

common/configtx/handlers/application/sharedconfig.go

@@ -84,7 +84,7 @@ func (di *SharedConfigImpl) CommitConfig() {
 
 // ProposeConfig is used to add new config to the config proposal
 func (di *SharedConfigImpl) ProposeConfig(configItem *cb.ConfigItem) error {
-	if configItem.Type != cb.ConfigItem_Peer {
+	if configItem.Type != cb.ConfigItem_PEER {
 		return fmt.Errorf("Expected type of ConfigItem_Peer, got %v", configItem.Type)
 	}
 

common/configtx/handlers/application/sharedconfig_test.go

@@ -33,7 +33,7 @@ func init() {
 
 func makeInvalidConfigItem(key string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Peer,
+		Type:  cb.ConfigItem_PEER,
 		Key:   key,
 		Value: []byte("Garbage Data"),
 	}

common/configtx/handlers/application/sharedconfig_util.go

@@ -27,7 +27,7 @@ var defaultAnchorPeers = []*pb.AnchorPeer{}
 // TemplateAnchorPeers creates a headerless config item representing the anchor peers
 func TemplateAnchorPeers(anchorPeers []*pb.AnchorPeer) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Peer,
+		Type:  cb.ConfigItem_PEER,
 		Key:   AnchorPeersKey,
 		Value: utils.MarshalOrPanic(&pb.AnchorPeers{AnchorPeers: anchorPeers}),
 	}

common/configtx/handlers/orderer/sharedconfig.go

@@ -143,7 +143,7 @@ func (pm *ManagerImpl) CommitConfig() {
 
 // ProposeConfig is used to add new config to the config proposal
 func (pm *ManagerImpl) ProposeConfig(configItem *cb.ConfigItem) error {
-	if configItem.Type != cb.ConfigItem_Orderer {
+	if configItem.Type != cb.ConfigItem_ORDERER {
 		return fmt.Errorf("Expected type of ConfigItem_Orderer, got %v", configItem.Type)
 	}
 

common/configtx/handlers/orderer/sharedconfig_test.go

@@ -37,7 +37,7 @@ func init() {
 
 func invalidMessage(key string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Orderer,
+		Type:  cb.ConfigItem_ORDERER,
 		Key:   key,
 		Value: []byte("Garbage Data"),
 	}

common/configtx/handlers/orderer/sharedconfig_util.go

@@ -25,7 +25,7 @@ import (
 // TemplateConsensusType creates a headerless config item representing the consensus type
 func TemplateConsensusType(typeValue string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Orderer,
+		Type:  cb.ConfigItem_ORDERER,
 		Key:   ConsensusTypeKey,
 		Value: utils.MarshalOrPanic(&ab.ConsensusType{Type: typeValue}),
 	}
@@ -34,7 +34,7 @@ func TemplateConsensusType(typeValue string) *cb.ConfigItem {
 // TemplateBatchSize creates a headerless config item representing the batch size
 func TemplateBatchSize(batchSize *ab.BatchSize) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Orderer,
+		Type:  cb.ConfigItem_ORDERER,
 		Key:   BatchSizeKey,
 		Value: utils.MarshalOrPanic(batchSize),
 	}
@@ -43,7 +43,7 @@ func TemplateBatchSize(batchSize *ab.BatchSize) *cb.ConfigItem {
 // TemplateBatchTimeout creates a headerless config item representing the batch timeout
 func TemplateBatchTimeout(batchTimeout string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Orderer,
+		Type:  cb.ConfigItem_ORDERER,
 		Key:   BatchTimeoutKey,
 		Value: utils.MarshalOrPanic(&ab.BatchTimeout{Timeout: batchTimeout}),
 	}
@@ -52,7 +52,7 @@ func TemplateBatchTimeout(batchTimeout string) *cb.ConfigItem {
 // TemplateChainCreationPolicyNames creates a headerless configuraiton item representing the chain creation policy names
 func TemplateChainCreationPolicyNames(names []string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Orderer,
+		Type:  cb.ConfigItem_ORDERER,
 		Key:   ChainCreationPolicyNamesKey,
 		Value: utils.MarshalOrPanic(&ab.ChainCreationPolicyNames{Names: names}),
 	}
@@ -61,7 +61,7 @@ func TemplateChainCreationPolicyNames(names []string) *cb.ConfigItem {
 // TemplateIngressPolicyNames creates a headerless config item representing the ingress policy names
 func TemplateIngressPolicyNames(names []string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Orderer,
+		Type:  cb.ConfigItem_ORDERER,
 		Key:   IngressPolicyNamesKey,
 		Value: utils.MarshalOrPanic(&ab.IngressPolicyNames{Names: names}),
 	}
@@ -70,7 +70,7 @@ func TemplateIngressPolicyNames(names []string) *cb.ConfigItem {
 // TemplateEgressPolicyNames creates a headerless config item representing the egress policy names
 func TemplateEgressPolicyNames(names []string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Orderer,
+		Type:  cb.ConfigItem_ORDERER,
 		Key:   EgressPolicyNamesKey,
 		Value: utils.MarshalOrPanic(&ab.EgressPolicyNames{Names: names}),
 	}
@@ -79,7 +79,7 @@ func TemplateEgressPolicyNames(names []string) *cb.ConfigItem {
 // TemplateKafkaBrokers creates a headerless config item representing the kafka brokers
 func TemplateKafkaBrokers(brokers []string) *cb.ConfigItem {
 	return &cb.ConfigItem{
-		Type:  cb.ConfigItem_Orderer,
+		Type:  cb.ConfigItem_ORDERER,
 		Key:   KafkaBrokersKey,
 		Value: utils.MarshalOrPanic(&ab.KafkaBrokers{Brokers: brokers}),
 	}

common/configtx/inspector/orderer_types.go

@@ -147,5 +147,5 @@ func viewableBatchSize(name string, batchSize *ab.BatchSize) Viewable {
 }
 
 func init() {
-	typeMap[cb.ConfigItem_Orderer] = ordererTypes{}
+	typeMap[cb.ConfigItem_ORDERER] = ordererTypes{}
 }

common/configtx/inspector/policy_types.go

@@ -59,5 +59,5 @@ func viewableSignaturePolicyEnvelope(name string, signaturePolicyEnvelope *cb.Si
 }
 
 func init() {
-	typeMap[cb.ConfigItem_Policy] = policyTypes{}
+	typeMap[cb.ConfigItem_POLICY] = policyTypes{}
 }

common/configtx/resources.go

@@ -76,9 +76,9 @@ func NewInitializer() api.Initializer {
 	for ctype := range cb.ConfigItem_ConfigType_name {
 		rtype := cb.ConfigItem_ConfigType(ctype)
 		switch rtype {
-		case cb.ConfigItem_Chain:
+		case cb.ConfigItem_CHAIN:
 			handlers[rtype] = chainConfig
-		case cb.ConfigItem_Policy:
+		case cb.ConfigItem_POLICY:
 			handlers[rtype] = policyManager
 		case cb.ConfigItem_MSP:
 			handlers[rtype] = mspConfigHandler

common/configtx/template.go

@@ -63,13 +63,13 @@ func (st *simpleTemplate) Envelope(chainID string) (*cb.ConfigEnvelope, error) {
 	for _, item := range st.items {
 		var values map[string]*cb.ConfigValue
 		switch item.Type {
-		case cb.ConfigItem_Peer:
+		case cb.ConfigItem_PEER:
 			values = channel.Groups[ApplicationGroup].Values
-		case cb.ConfigItem_Orderer:
+		case cb.ConfigItem_ORDERER:
 			values = channel.Groups[OrdererGroup].Values
-		case cb.ConfigItem_Chain:
+		case cb.ConfigItem_CHAIN:
 			values = channel.Values
-		case cb.ConfigItem_Policy:
+		case cb.ConfigItem_POLICY:
 			logger.Debugf("Templating about policy %s", item.Key)
 			policy := &cb.Policy{}
 			err := proto.Unmarshal(item.Value, policy)
@@ -190,7 +190,7 @@ func (ct *compositeTemplate) Envelope(chainID string) (*cb.ConfigEnvelope, error
 // a CompositeTemplate will invalidate the CreationPolicy
 func NewChainCreationTemplate(creationPolicy string, template Template) Template {
 	creationPolicyTemplate := NewSimpleTemplate(&cb.ConfigItem{
-		Type: cb.ConfigItem_Orderer,
+		Type: cb.ConfigItem_ORDERER,
 		Key:  CreationPolicyKey,
 		Value: utils.MarshalOrPanic(&ab.CreationPolicy{
 			Policy: creationPolicy,

common/configtx/template_test.go

@@ -57,20 +57,20 @@ func verifyItemsResult(t *testing.T, template Template, count int) {
 
 func TestSimpleTemplate(t *testing.T) {
 	simple := NewSimpleTemplate(
-		&cb.ConfigItem{Type: cb.ConfigItem_Orderer, Key: "0"},
-		&cb.ConfigItem{Type: cb.ConfigItem_Orderer, Key: "1"},
+		&cb.ConfigItem{Type: cb.ConfigItem_ORDERER, Key: "0"},
+		&cb.ConfigItem{Type: cb.ConfigItem_ORDERER, Key: "1"},
 	)
 	verifyItemsResult(t, simple, 2)
 }
 
 func TestCompositeTemplate(t *testing.T) {
 	composite := NewCompositeTemplate(
 		NewSimpleTemplate(
-			&cb.ConfigItem{Type: cb.ConfigItem_Orderer, Key: "0"},
-			&cb.ConfigItem{Type: cb.ConfigItem_Orderer, Key: "1"},
+			&cb.ConfigItem{Type: cb.ConfigItem_ORDERER, Key: "0"},
+			&cb.ConfigItem{Type: cb.ConfigItem_ORDERER, Key: "1"},
 		),
 		NewSimpleTemplate(
-			&cb.ConfigItem{Type: cb.ConfigItem_Orderer, Key: "2"},
+			&cb.ConfigItem{Type: cb.ConfigItem_ORDERER, Key: "2"},
 		),
 	)
 
@@ -79,8 +79,8 @@ func TestCompositeTemplate(t *testing.T) {
 
 func TestNewChainTemplate(t *testing.T) {
 	simple := NewSimpleTemplate(
-		&cb.ConfigItem{Type: cb.ConfigItem_Orderer, Key: "0"},
-		&cb.ConfigItem{Type: cb.ConfigItem_Orderer, Key: "1"},
+		&cb.ConfigItem{Type: cb.ConfigItem_ORDERER, Key: "0"},
+		&cb.ConfigItem{Type: cb.ConfigItem_ORDERER, Key: "1"},
 	)
 
 	creationPolicy := "Test"