[FAB-2152] Migrate app config to ConfigGroup

https://jira.hyperledger.org/browse/FAB-2152 The ConfigItem proto is deprecated, pending removal. This CR migrates the application config to the newer ConfigGroup mechanism. Change-Id: Ic48125dd4930afccae42cffda02211718559311e Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
hyperledger · Feb 12, 2017 · f5ab160 · f5ab160
1 parent 63e54d1
commit f5ab160
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 40 deletions.
diff --git a/common/configtx/handlers/application/sharedconfig.go b/common/configtx/handlers/application/sharedconfig.go
@@ -57,7 +57,7 @@ var Schema = &cb.ConfigGroupSchema{
 
 // Peer config keys
 const (
-	// AnchorPeersKey is the cb.ConfigItem type key name for the AnchorPeers message
+	// AnchorPeersKey is the key name for the AnchorPeers ConfigValue
 	AnchorPeersKey = "AnchorPeers"
 )
 

diff --git a/common/configtx/handlers/application/sharedconfig_test.go b/common/configtx/handlers/application/sharedconfig_test.go
@@ -37,8 +37,11 @@ func makeInvalidConfigValue() *cb.ConfigValue {
 	}
 }
 
-func itemToValue(configItem *cb.ConfigItem) (string, *cb.ConfigValue) {
-	return configItem.Key, &cb.ConfigValue{Value: configItem.Value}
+func groupToKeyValue(configGroup *cb.ConfigGroup) (string, *cb.ConfigValue) {
+	for key, value := range configGroup.Groups[GroupKey].Values {
+		return key, value
+	}
+	panic("No value encoded")
 }
 
 func TestInterface(t *testing.T) {
@@ -92,7 +95,7 @@ func TestAnchorPeers(t *testing.T) {
 		t.Fatalf("Should have failed on invalid message")
 	}
 
-	err = m.ProposeConfig(itemToValue(validMessage))
+	err = m.ProposeConfig(groupToKeyValue(validMessage))
 	if err != nil {
 		t.Fatalf("Error applying valid config: %s", err)
 	}

diff --git a/common/configtx/handlers/application/sharedconfig_util.go b/common/configtx/handlers/application/sharedconfig_util.go
@@ -24,16 +24,21 @@ import (
 
 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,
-		Key:   AnchorPeersKey,
-		Value: utils.MarshalOrPanic(&pb.AnchorPeers{AnchorPeers: anchorPeers}),
+func configGroup(key string, value []byte) *cb.ConfigGroup {
+	result := cb.NewConfigGroup()
+	result.Groups[GroupKey] = cb.NewConfigGroup()
+	result.Groups[GroupKey].Values[key] = &cb.ConfigValue{
+		Value: value,
 	}
+	return result
+}
+
+// TemplateAnchorPeers creates a headerless config item representing the anchor peers
+func TemplateAnchorPeers(anchorPeers []*pb.AnchorPeer) *cb.ConfigGroup {
+	return configGroup(AnchorPeersKey, utils.MarshalOrPanic(&pb.AnchorPeers{AnchorPeers: anchorPeers}))
 }
 
 // DefaultAnchorPeers creates a headerless config item for the default orderer addresses
-func DefaultAnchorPeers() *cb.ConfigItem {
+func DefaultAnchorPeers() *cb.ConfigGroup {
 	return TemplateAnchorPeers(defaultAnchorPeers)
 }
diff --git a/common/configtx/handlers/application/template_test.go b/common/configtx/handlers/application/template_test.go
diff --git a/peer/channel/create.go b/peer/channel/create.go
@@ -55,7 +55,7 @@ func sendCreateChainTransaction(cf *ChannelCmdFactory) error {
 	//TODO this is a temporary hack until `orderer.template` and 'msp.template' is supplied from the CLI
 	oTemplate := configtxtest.OrdererTemplate()
 	mspTemplate := configtxtest.MSPTemplate()
-	gossTemplate := configtx.NewSimpleTemplate(configtxapplication.TemplateAnchorPeers(anchorPeers))
+	gossTemplate := configtx.NewSimpleTemplateNext(configtxapplication.TemplateAnchorPeers(anchorPeers))
 	chCrtTemp := configtx.NewCompositeTemplate(oTemplate, mspTemplate, gossTemplate)
 
 	signer, err := mspmgmt.GetLocalMSP().GetDefaultSigningIdentity()