[FAB-18054] Remove default value for top level orderer addresses if (#…

…1550) unset in config * Top level orderer addresses are deprecated in 2.2 so this commit removes the default value for consumers that pass a config with no orderer addresses value Signed-off-by: Danny Cao <dcao@us.ibm.com> (cherry picked from commit ff39bf9)
hyperledger · Jul 8, 2020 · 9c3c599 · 9c3c599
1 parent ff00d9b
commit 9c3c599
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/common/channelconfig/realconfig_test.go b/common/channelconfig/realconfig_test.go
@@ -33,6 +33,7 @@ func TestWithRealConfigtx(t *testing.T) {
 func TestOrgSpecificOrdererEndpoints(t *testing.T) {
 	t.Run("Without_Capability", func(t *testing.T) {
 		conf := genesisconfig.Load(genesisconfig.SampleDevModeSoloProfile, configtest.GetDevConfigDir())
+		conf.Orderer.Addresses = []string{"127.0.0.1:7050"}
 		conf.Capabilities = map[string]bool{"V1_3": true}
 
 		cg, err := encoder.NewChannelGroup(conf)

diff --git a/discovery/support/config/support_test.go b/discovery/support/config/support_test.go
@@ -391,7 +391,10 @@ func injectGlobalOrdererEndpoint(t *testing.T, block *common.Block, endpoint str
 	confEnv, err := configtx.UnmarshalConfigEnvelope(payload.Data)
 	assert.NoError(t, err)
 	// Replace the orderer addresses
-	confEnv.Config.ChannelGroup.Values[ordererAddresses.Key()].Value = protoutil.MarshalOrPanic(ordererAddresses.Value())
+	confEnv.Config.ChannelGroup.Values[ordererAddresses.Key()] = &common.ConfigValue{
+		Value:     protoutil.MarshalOrPanic(ordererAddresses.Value()),
+		ModPolicy: "/Channel/Orderer/Admins",
+	}
 	// Remove the per org addresses, if applicable
 	ordererGrps := confEnv.Config.ChannelGroup.Groups[channelconfig.OrdererGroupKey].Groups
 	for _, grp := range ordererGrps {

diff --git a/internal/configtxgen/genesisconfig/config.go b/internal/configtxgen/genesisconfig/config.go
@@ -170,7 +170,6 @@ type Kafka struct {
 var genesisDefaults = TopLevel{
 	Orderer: &Orderer{
 		OrdererType:  "solo",
-		Addresses:    []string{"127.0.0.1:7050"},
 		BatchTimeout: 2 * time.Second,
 		BatchSize: BatchSize{
 			MaxMessageCount:   500,
@@ -315,9 +314,6 @@ loop:
 		case ord.OrdererType == "":
 			logger.Infof("Orderer.OrdererType unset, setting to %v", genesisDefaults.Orderer.OrdererType)
 			ord.OrdererType = genesisDefaults.Orderer.OrdererType
-		case ord.Addresses == nil:
-			logger.Infof("Orderer.Addresses unset, setting to %s", genesisDefaults.Orderer.Addresses)
-			ord.Addresses = genesisDefaults.Orderer.Addresses
 		case ord.BatchTimeout == 0:
 			logger.Infof("Orderer.BatchTimeout unset, setting to %s", genesisDefaults.Orderer.BatchTimeout)
 			ord.BatchTimeout = genesisDefaults.Orderer.BatchTimeout

diff --git a/internal/peer/chaincode/common_test.go b/internal/peer/chaincode/common_test.go
@@ -175,8 +175,7 @@ func TestGetOrdererEndpointFromConfigTx(t *testing.T) {
 	ordererEndpoints, err := common.GetOrdererEndpointOfChain(mockchain, signer, mockEndorserClient, cryptoProvider)
 	assert.NoError(t, err, "GetOrdererEndpointOfChain from genesis block")
 
-	assert.Equal(t, len(ordererEndpoints), 1)
-	assert.Equal(t, ordererEndpoints[0], "127.0.0.1:7050")
+	assert.Equal(t, len(ordererEndpoints), 0)
 }
 
 func TestGetOrdererEndpointFail(t *testing.T) {

diff --git a/orderer/common/cluster/replication_test.go b/orderer/common/cluster/replication_test.go
@@ -1086,7 +1086,10 @@ func injectGlobalOrdererEndpoint(t *testing.T, block *common.Block, endpoint str
 	confEnv, err := configtx.UnmarshalConfigEnvelope(payload.Data)
 	assert.NoError(t, err)
 	// Replace the orderer addresses
-	confEnv.Config.ChannelGroup.Values[ordererAddresses.Key()].Value = protoutil.MarshalOrPanic(ordererAddresses.Value())
+	confEnv.Config.ChannelGroup.Values[ordererAddresses.Key()] = &common.ConfigValue{
+		Value:     protoutil.MarshalOrPanic(ordererAddresses.Value()),
+		ModPolicy: "/Channel/Orderer/Admins",
+	}
 	// Remove the per org addresses, if applicable
 	ordererGrps := confEnv.Config.ChannelGroup.Groups[channelconfig.OrdererGroupKey].Groups
 	for _, grp := range ordererGrps {