[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

common/channelconfig/consortiums_util.go

@@ -7,6 +7,9 @@ SPDX-License-Identifier: Apache-2.0
 package channelconfig
 
 import (
+	"math"
+
+	"github.com/hyperledger/fabric/bccsp"
 	cb "github.com/hyperledger/fabric/protos/common"
 	mspprotos "github.com/hyperledger/fabric/protos/msp"
 	ab "github.com/hyperledger/fabric/protos/orderer"
@@ -15,6 +18,21 @@ import (
 	"github.com/golang/protobuf/proto"
 )
 
+const (
+	// ReadersPolicyKey is the key used for the read policy
+	ReadersPolicyKey = "Readers"
+
+	// WritersPolicyKey is the key used for the read policy
+	WritersPolicyKey = "Writers"
+
+	// AdminsPolicyKey is the key used for the read policy
+	AdminsPolicyKey = "Admins"
+
+	defaultHashingAlgorithm = bccsp.SHA256
+
+	defaultBlockDataHashingStructureWidth = math.MaxUint32
+)
+
 // ConfigValue defines a common representation for different *cb.ConfigValue values.
 type ConfigValue interface {
 	// Key is the key this value should be stored in the *cb.ConfigGroup.Values map.

common/channelconfig/msp_test.go

@@ -11,7 +11,6 @@ import (
 
 	cb "github.com/hyperledger/fabric/protos/common"
 	mspprotos "github.com/hyperledger/fabric/protos/msp"
-	ab "github.com/hyperledger/fabric/protos/orderer"
 	pb "github.com/hyperledger/fabric/protos/peer"
 
 	"github.com/stretchr/testify/assert"
@@ -23,31 +22,6 @@ import (
 // in the test, which also provides no value.  But, not including these produces an artificially
 // low code coverage count, so here they are.
 
-func TestChannelUtils(t *testing.T) {
-	assert.NotNil(t, TemplateConsortium("test"))
-	assert.NotNil(t, DefaultHashingAlgorithm())
-	assert.NotNil(t, DefaultBlockDataHashingStructure())
-	assert.NotNil(t, DefaultOrdererAddresses())
-
-}
-
-func TestOrdererUtils(t *testing.T) {
-	assert.NotNil(t, TemplateConsensusType("foo"))
-	assert.NotNil(t, TemplateBatchSize(&ab.BatchSize{}))
-	assert.NotNil(t, TemplateBatchTimeout("3s"))
-	assert.NotNil(t, TemplateChannelRestrictions(0))
-	assert.NotNil(t, TemplateKafkaBrokers([]string{"foo"}))
-}
-
-func TestApplicationUtils(t *testing.T) {
-	assert.NotNil(t, TemplateAnchorPeers("foo", nil))
-}
-
-func TestConsortiumsUtils(t *testing.T) {
-	assert.NotNil(t, TemplateConsortiumsGroup())
-	assert.NotNil(t, TemplateConsortiumChannelCreationPolicy("foo", &cb.Policy{}))
-}
-
 func basicTest(t *testing.T, sv *StandardConfigValue) {
 	assert.NotNil(t, sv)
 	assert.NotEmpty(t, sv.Key())

common/channelconfig/msp_util.go

@@ -121,28 +121,6 @@ func TestNegativeChannelCreateConfigUpdate(t *testing.T) {
 	})
 }
 
-// This is a temporary test to make sure that the newly implement channel creation method properly replicates
-// the old behavior
-func TestCompatability(t *testing.T) {
-	config := genesisconfig.Load(genesisconfig.SampleDevModeSoloProfile)
-	group, err := NewChannelGroup(config)
-	assert.NoError(t, err)
-	assert.NotNil(t, group)
-
-	channelID := "channel.id"
-	orgs := []string{genesisconfig.SampleOrgName}
-	configUpdate, err := NewChannelCreateConfigUpdate(channelID, genesisconfig.SampleConsortiumName, orgs, group)
-	assert.NoError(t, err)
-	assert.NotNil(t, configUpdate)
-
-	template := channelconfig.NewChainCreationTemplate(genesisconfig.SampleConsortiumName, orgs)
-	configEnv, err := template.Envelope(channelID)
-	assert.NoError(t, err)
-	oldUpdate := configtx.UnmarshalConfigUpdateOrPanic(configEnv.ConfigUpdate)
-	oldUpdate.IsolatedData = nil
-	assert.True(t, proto.Equal(oldUpdate, configUpdate))
-}
-
 func TestMakeChannelCreationTransactionWithSigner(t *testing.T) {
 	channelID := "foo"
 

common/channelconfig/orderer_util.go

@@ -108,11 +108,9 @@ func doOutputAnchorPeersUpdate(conf *genesisconfig.Profile, channelID string, ou
 		}
 	}
 
-	configGroup := channelconfig.TemplateAnchorPeers(org.Name, anchorPeers)
-	configGroup.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name].Values[channelconfig.AnchorPeersKey].ModPolicy = channelconfig.AdminsPolicyKey
 	configUpdate := &cb.ConfigUpdate{
 		ChannelId: channelID,
-		WriteSet:  configGroup,
+		WriteSet:  cb.NewConfigGroup(),
 		ReadSet:   cb.NewConfigGroup(),
 	}
 
@@ -127,14 +125,20 @@ func doOutputAnchorPeersUpdate(conf *genesisconfig.Profile, channelID string, ou
 	configUpdate.ReadSet.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name].Policies[channelconfig.AdminsPolicyKey] = &cb.ConfigPolicy{}
 
 	// Add all the existing at the same versions to the writeset
+	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey] = cb.NewConfigGroup()
 	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].Version = 1
 	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].ModPolicy = channelconfig.AdminsPolicyKey
+	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name] = cb.NewConfigGroup()
 	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name].Version = 1
 	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name].ModPolicy = channelconfig.AdminsPolicyKey
 	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name].Values[channelconfig.MSPKey] = &cb.ConfigValue{}
 	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name].Policies[channelconfig.ReadersPolicyKey] = &cb.ConfigPolicy{}
 	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name].Policies[channelconfig.WritersPolicyKey] = &cb.ConfigPolicy{}
 	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name].Policies[channelconfig.AdminsPolicyKey] = &cb.ConfigPolicy{}
+	configUpdate.WriteSet.Groups[channelconfig.ApplicationGroupKey].Groups[org.Name].Values[channelconfig.AnchorPeersKey] = &cb.ConfigValue{
+		Value:     utils.MarshalOrPanic(channelconfig.AnchorPeersValue(anchorPeers).Value()),
+		ModPolicy: channelconfig.AdminsPolicyKey,
+	}
 
 	configUpdateEnvelope := &cb.ConfigUpdateEnvelope{
 		ConfigUpdate: utils.MarshalOrPanic(configUpdate),

common/channelconfig/organization.go

@@ -316,7 +316,10 @@ func (dt *DefaultTemplator) NewChannelConfig(envConfigUpdate *cb.Envelope) (chan
 	// Set the new config orderer group to the system channel orderer group and the application group to the new application group
 	channelGroup.Groups[channelconfig.OrdererGroupKey] = systemChannelGroup.Groups[channelconfig.OrdererGroupKey]
 	channelGroup.Groups[channelconfig.ApplicationGroupKey] = applicationGroup
-	channelGroup.Values[channelconfig.ConsortiumKey] = channelconfig.TemplateConsortium(consortium.Name).Values[channelconfig.ConsortiumKey]
+	channelGroup.Values[channelconfig.ConsortiumKey] = &cb.ConfigValue{
+		Value:     utils.MarshalOrPanic(channelconfig.ConsortiumValue(consortium.Name).Value()),
+		ModPolicy: channelconfig.AdminsPolicyKey,
+	}
 
 	// Non-backwards compatible bugfix introduced in v1.1
 	// The capability check should be removed once v1.0 is deprecated

common/channelconfig/template.go

@@ -109,12 +109,11 @@ func makeConfigTx(chainID string, i int) *cb.Envelope {
 	group.Groups[channelconfig.OrdererGroupKey].Values[fmt.Sprintf("%d", i)] = &cb.ConfigValue{
 		Value: []byte(fmt.Sprintf("%d", i)),
 	}
-	configTemplate := configtx.NewSimpleTemplate(group)
-	configEnv, err := configTemplate.Envelope(chainID)
-	if err != nil {
-		panic(err)
-	}
-	return makeConfigTxFromConfigUpdateEnvelope(chainID, configEnv)
+	return makeConfigTxFromConfigUpdateEnvelope(chainID, &cb.ConfigUpdateEnvelope{
+		ConfigUpdate: utils.MarshalOrPanic(&cb.ConfigUpdate{
+			WriteSet: group,
+		}),
+	})
 }
 
 func wrapConfigTx(env *cb.Envelope) *cb.Envelope {