[FAB-5811] Move configtxlator to new channelconfig

Just like with the orderer, the dependencies on the old mutable channel
config mechanism must be removed.

This CR moves the configtxlator code from using the older mutable model
to the new immutable one.

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

Author: Jason Yellick

common/channelconfig/bundle.go

@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
 package channelconfig
 
 import (
+	"fmt"
+
 	"github.com/hyperledger/fabric/common/cauthdsl"
 	"github.com/hyperledger/fabric/common/config"
 	oldchannelconfig "github.com/hyperledger/fabric/common/config/channel"
@@ -147,6 +149,14 @@ func (np noopProposer) PolicyManager() policies.Manager {
 
 // NewBundle creates a new immutable bundle of configuration
 func NewBundle(channelID string, config *cb.Config) (*Bundle, error) {
+	if config == nil {
+		return nil, fmt.Errorf("config cannot be nil")
+	}
+
+	if config.ChannelGroup == nil {
+		return nil, fmt.Errorf("config must contain a channel group")
+	}
+
 	mspConfigHandler := oldmspconfig.NewMSPConfigHandler()
 	rootConfig := oldchannelconfig.NewRoot(mspConfigHandler)
 

common/tools/configtxlator/sanitycheck/sanitycheck.go

@@ -19,10 +19,9 @@ package sanitycheck
 import (
 	"fmt"
 
-	channelconfig "github.com/hyperledger/fabric/common/config/channel"
+	newchannelconfig "github.com/hyperledger/fabric/common/channelconfig"
 	cb "github.com/hyperledger/fabric/protos/common"
 	mspprotos "github.com/hyperledger/fabric/protos/msp"
-	"github.com/hyperledger/fabric/protos/utils"
 
 	"github.com/golang/protobuf/proto"
 )
@@ -39,14 +38,9 @@ type ElementMessage struct {
 }
 
 func Check(config *cb.Config) (*Messages, error) {
-	envConfig, err := utils.CreateSignedEnvelope(cb.HeaderType_CONFIG, "sanitycheck", nil, &cb.ConfigEnvelope{Config: config}, 0, 0)
-	if err != nil {
-		return nil, err
-	}
-
 	result := &Messages{}
 
-	cm, err := channelconfig.New(envConfig, nil)
+	bundle, err := newchannelconfig.NewBundle("sanitycheck", config)
 	if err != nil {
 		result.GeneralErrors = []string{err.Error()}
 		return result, nil
@@ -57,13 +51,13 @@ func Check(config *cb.Config) (*Messages, error) {
 	// we collect this manually.
 	mspMap := make(map[string]struct{})
 
-	if ac, ok := cm.ApplicationConfig(); ok {
+	if ac, ok := bundle.ApplicationConfig(); ok {
 		for _, org := range ac.Organizations() {
 			mspMap[org.MSPID()] = struct{}{}
 		}
 	}
 
-	if oc, ok := cm.OrdererConfig(); ok {
+	if oc, ok := bundle.OrdererConfig(); ok {
 		for _, org := range oc.Organizations() {
 			mspMap[org.MSPID()] = struct{}{}
 		}