fix: address review feedback on PR #113

- Check ok from OrdererConfig() and return error when false
  ('no orderer section in config block')
- Remove V3_0 capability gating: reject global orderer endpoints
  unconditionally in NewOrdererGroup
- Remove V3_0 capability gating: require org endpoints unconditionally
  in NewOrdererOrgGroup
- Keep channelCapabilities parameter for future reuse
- Update tests for new unconditional validation behavior

Signed-off-by: Senthilnathan <cendhu@gmail.com>

Author: cendhu

common/channelconfig/realconfig_test.go

@@ -61,7 +61,9 @@ func TestOrgSpecificOrdererEndpoints(t *testing.T) {
 
 		cg, err := configtxgen.NewChannelGroup(conf)
 		require.Nil(t, cg)
-		require.EqualError(t, err, "could not create orderer group: failed to create orderer org: orderer endpoints for organization SampleOrg are missing and must be configured when capability V3_0 is enabled")
+		require.EqualError(t, err, "could not create orderer group: "+
+			"failed to create orderer org: "+
+			"orderer endpoints for organization SampleOrg are missing and must be configured")
 
 		conf.Orderer.Organizations[0].OrdererEndpoints = []*types.OrdererEndpoint{{Host: "127.0.0.1", Port: 7050}}
 		cg, err = configtxgen.NewChannelGroup(conf)
@@ -102,6 +104,7 @@ func TestOrgSpecificOrdererEndpoints(t *testing.T) {
 		require.NotEmpty(t, conf.Orderer.Addresses)
 
 		_, err := configtxgen.NewChannelGroup(conf)
-		require.EqualError(t, err, "could not create orderer group: global orderer endpoints exist, but can not be used with V3_0 capability: [globalAddress]")
+		require.EqualError(t, err, "could not create orderer group: "+
+			"global orderer endpoints exist, but are not supported: [globalAddress]")
 	})
 }

common/deliverclient/verifier_assembler.go

@@ -43,7 +43,12 @@ func (bva *BlockVerifierAssembler) VerifierFromConfig(configuration *common.Conf
 	}
 
 	cfg, ok := bundle.OrdererConfig()
-	bftEnabled := ok && (cfg.ConsensusType() == "BFT" || cfg.ConsensusType() == "arma")
+	if !ok {
+		err := errors.New("no orderer section in config block")
+		return createErrorFunc(err), err
+	}
+
+	bftEnabled := cfg.ConsensusType() == "BFT" || cfg.ConsensusType() == "arma"
 
 	var consenters []*common.Consenter
 	if bftEnabled {

tools/configtxgen/encoder.go

@@ -185,8 +185,8 @@ func NewChannelGroup(conf *Profile) (*cb.ConfigGroup, error) {
 //
 //nolint:gocognit // cognitive complexity 23.
 func NewOrdererGroup(conf *Orderer, channelCapabilities map[string]bool) (*cb.ConfigGroup, error) {
-	if len(conf.Addresses) > 0 && channelCapabilities["V3_0"] {
-		return nil, errors.Errorf("global orderer endpoints exist, but can not be used with V3_0 capability: %v", conf.Addresses)
+	if len(conf.Addresses) > 0 {
+		return nil, errors.Errorf("global orderer endpoints exist, but are not supported: %v", conf.Addresses)
 	}
 
 	ordererGroup := protoutil.NewConfigGroup()
@@ -330,7 +330,6 @@ func NewConsortiumOrgGroup(conf *Organization) (*cb.ConfigGroup, error) {
 
 // NewOrdererOrgGroup returns an orderer org component of the channel configuration.  It defines the crypto material for the
 // organization (its MSP).  It sets the mod_policy of all elements to "Admins".
-// channelCapabilities map[string]bool
 func NewOrdererOrgGroup(conf *Organization, channelCapabilities map[string]bool) (*cb.ConfigGroup, error) {
 	ordererOrgGroup := protoutil.NewConfigGroup()
 	ordererOrgGroup.ModPolicy = channelconfig.AdminsPolicyKey
@@ -356,8 +355,8 @@ func NewOrdererOrgGroup(conf *Organization, channelCapabilities map[string]bool)
 			endpoints[i] = e.String()
 		}
 		addValue(ordererOrgGroup, channelconfig.EndpointsValue(endpoints), channelconfig.AdminsPolicyKey)
-	} else if channelCapabilities["V3_0"] {
-		return nil, errors.Errorf("orderer endpoints for organization %s are missing and must be configured when capability V3_0 is enabled", conf.Name)
+	} else {
+		return nil, errors.Errorf("orderer endpoints for organization %s are missing and must be configured", conf.Name)
 	}
 
 	return ordererOrgGroup, nil

tools/configtxgen/encoder_test.go

@@ -521,14 +521,7 @@ var _ = ginkgo.Describe("Encoder", func() {
 			ginkgo.It("wraps and returns the error", func() {
 				_, err := NewOrdererGroup(conf, channelCapabilities)
 				gomega.Expect(err).To(gomega.MatchError("global orderer endpoints exist, " +
-					"but can not be used with V3_0 capability: [addr1 addr2]"))
-			})
-
-			ginkgo.It("is permitted when V3_0 is false", func() {
-				delete(channelCapabilities, "V3_0")
-				channelCapabilities["V2_0"] = true
-				_, err := NewOrdererGroup(conf, channelCapabilities)
-				gomega.Expect(err).ToNot(gomega.HaveOccurred())
+					"but are not supported: [addr1 addr2]"))
 			})
 		})
 	})
@@ -727,17 +720,11 @@ var _ = ginkgo.Describe("Encoder", func() {
 				conf.OrdererEndpoints = []*types.OrdererEndpoint{}
 			})
 
-			ginkgo.It("does not include the endpoints in the config group with v2_0", func() {
-				channelCapabilities := map[string]bool{"V2_0": true}
-				cg, err := NewOrdererOrgGroup(conf, channelCapabilities)
-				gomega.Expect(err).NotTo(gomega.HaveOccurred())
-				gomega.Expect(cg.Values["Endpoints"]).To(gomega.BeNil())
-			})
-
-			ginkgo.It("emits an error with v3_0", func() {
-				channelCapabilities := map[string]bool{"V3_0": true}
-				cg, err := NewOrdererOrgGroup(conf, channelCapabilities)
+			ginkgo.It("emits an error when endpoints are missing", func() {
+				cg, err := NewOrdererOrgGroup(conf, nil)
 				gomega.Expect(err).To(gomega.HaveOccurred())
+				gomega.Expect(err).To(gomega.MatchError("orderer endpoints for organization SampleOrg " +
+					"are missing and must be configured"))
 				gomega.Expect(cg).To(gomega.BeNil())
 			})
 		})