[FAB-6143] Cleanup dead code

Now that almost all references the config templating code is gone, it
should be removed entirely from the codebase.

This final CR in the channel config generation cleanup series shows a
net decrease of over 400 lines, with an even larger shift of lines of
code from the orderer/peer production binaries and into the configtxgen
binary.

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

Author: Jason Yellick

common/channelconfig/application_util.go

@@ -12,6 +12,12 @@ import (
 	"github.com/pkg/errors"
 )
 
+const (
+	// ChannelCreationPolicyKey is the key used in the consortium config to denote the policy
+	// to be used in evaluating whether a channel creation request is authorized
+	ChannelCreationPolicyKey = "ChannelCreationPolicy"
+)
+
 // ConsortiumProtos holds the config protos for the consortium config
 type ConsortiumProtos struct {
 	ChannelCreationPolicy *cb.Policy

common/channelconfig/channel_util.go

@@ -10,12 +10,9 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric/common/capabilities"
-	"github.com/hyperledger/fabric/common/cauthdsl"
 	"github.com/hyperledger/fabric/core/config"
 	"github.com/hyperledger/fabric/msp"
-	cb "github.com/hyperledger/fabric/protos/common"
 	mspprotos "github.com/hyperledger/fabric/protos/msp"
-	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -58,33 +55,3 @@ func TestMSPConfigFailure(t *testing.T) {
 		assert.Error(t, err)
 	})
 }
-
-func TestTemplates(t *testing.T) {
-	mspDir, err := config.GetDevMspDir()
-	assert.NoError(t, err)
-	mspConf, err := msp.GetLocalMspConfig(mspDir, nil, "DEFAULT")
-	assert.NoError(t, err)
-
-	expectedMSPValue := &cb.ConfigValue{
-		Value: utils.MarshalOrPanic(mspConf),
-	}
-	configGroup := TemplateGroupMSP([]string{"TestPath"}, mspConf)
-	testGroup, ok := configGroup.Groups["TestPath"]
-	assert.Equal(t, true, ok, "Failed to find group key")
-	assert.Equal(t, expectedMSPValue, testGroup.Values[MSPKey], "MSPKey did not match expected value")
-
-	configGroup = TemplateGroupMSPWithAdminRolePrincipal([]string{"TestPath"}, mspConf, false)
-	expectedPolicyValue := utils.MarshalOrPanic(cauthdsl.SignedByMspMember("DEFAULT"))
-	actualPolicyValue := configGroup.Groups["TestPath"].Policies[AdminsPolicyKey].Policy.Value
-	assert.Equal(t, expectedPolicyValue, actualPolicyValue, "Expected SignedByMspMemberPolicy")
-
-	mspConf = &mspprotos.MSPConfig{}
-	assert.Panics(t, func() {
-		configGroup = TemplateGroupMSPWithAdminRolePrincipal([]string{"TestPath"}, mspConf, false)
-	}, "Expected panic with bad msp config")
-	mspConf.Type = int32(10)
-	assert.Panics(t, func() {
-		configGroup = TemplateGroupMSPWithAdminRolePrincipal([]string{"TestPath"}, mspConf, false)
-	}, "Expected panic with bad msp config")
-
-}

common/channelconfig/consortium.go

@@ -16,6 +16,11 @@ import (
 	"github.com/pkg/errors"
 )
 
+const (
+	// MSPKey is the key for the MSP definition in orderer groups
+	MSPKey = "MSP"
+)
+
 // OrganizationProtos are used to deserialize the organization config
 type OrganizationProtos struct {
 	MSP *mspprotos.MSPConfig