[FAB-16327] Discovery config query with org endpoints

This change set makes discovery config parsing honor configs
that have the old endpoint location removed from config entirely.

Change-Id: Ic93fd6e49764a03056f88abf23af56ad530979cc
Signed-off-by: yacovm <yacovm@il.ibm.com>

Author: yacovm

discovery/support/config/support.go

@@ -264,8 +264,5 @@ func ValidateConfigEnvelope(ce *common.ConfigEnvelope) error {
 	if ce.Config.ChannelGroup.Values == nil {
 		return fmt.Errorf("field Config.ChannelGroup.Values is nil")
 	}
-	if _, exists := ce.Config.ChannelGroup.Values[channelconfig.OrdererAddressesKey]; !exists {
-		return fmt.Errorf("field Config.ChannelGroup.Values is empty")
-	}
 	return nil
 }

discovery/support/config/support_test.go

@@ -291,25 +291,6 @@ func TestValidateConfigEnvelope(t *testing.T) {
 			},
 			containsError: "field Config.ChannelGroup.Values is nil",
 		},
-		{
-			name: "no OrdererAddressesKey in ChannelGroup Values",
-			ce: &common.ConfigEnvelope{
-				Config: &common.Config{
-					ChannelGroup: &common.ConfigGroup{
-						Values: map[string]*common.ConfigValue{},
-						Groups: map[string]*common.ConfigGroup{
-							channelconfig.ApplicationGroupKey: {
-								Groups: map[string]*common.ConfigGroup{},
-							},
-							channelconfig.OrdererGroupKey: {
-								Groups: map[string]*common.ConfigGroup{},
-							},
-						},
-					},
-				},
-			},
-			containsError: "field Config.ChannelGroup.Values is empty",
-		},
 	}
 
 	for _, test := range tests {
@@ -341,7 +322,7 @@ func TestOrdererEndpoints(t *testing.T) {
 		}, res.Orderers)
 	})
 
-	t.Run("Per org endpoints", func(t *testing.T) {
+	t.Run("Per org endpoints alongside global endpoints", func(t *testing.T) {
 		block, err := test.MakeGenesisBlock("mychannel")
 		assert.NoError(t, err)
 
@@ -361,6 +342,42 @@ func TestOrdererEndpoints(t *testing.T) {
 			"aBadOrg":    {},
 		}, res.Orderers)
 	})
+
+	t.Run("Per org endpoints without global endpoints", func(t *testing.T) {
+		block, err := test.MakeGenesisBlock("mychannel")
+		assert.NoError(t, err)
+
+		fakeBlockGetter := &mocks.ConfigBlockGetter{}
+		cs := config.NewDiscoverySupport(fakeBlockGetter)
+
+		fakeBlockGetter.GetCurrConfigBlockReturnsOnCall(0, block)
+
+		removeGlobalEndpoints(t, block)
+		injectAdditionalEndpointPair(t, block, "perOrgEndpoint:7050", "SampleOrg")
+		injectAdditionalEndpointPair(t, block, "endpointWithoutAPortName", "aBadOrg")
+
+		res, err := cs.Config("test")
+		assert.NoError(t, err)
+		assert.Equal(t, map[string]*discovery.Endpoints{
+			"SampleOrg": {Endpoint: []*discovery.Endpoint{{Host: "perOrgEndpoint", Port: 7050}}},
+			"aBadOrg":   {},
+		}, res.Orderers)
+	})
+}
+
+func removeGlobalEndpoints(t *testing.T, block *common.Block) {
+	// Unwrap the layers until we reach the orderer addresses
+	env, err := protoutil.ExtractEnvelope(block, 0)
+	assert.NoError(t, err)
+	payload := protoutil.UnmarshalPayloadOrPanic(env.Payload)
+	confEnv, err := configtx.UnmarshalConfigEnvelope(payload.Data)
+	assert.NoError(t, err)
+	// Remove the orderer addresses
+	delete(confEnv.Config.ChannelGroup.Values, channelconfig.OrdererAddressesKey)
+	// And put it back into the block
+	payload.Data = protoutil.MarshalOrPanic(confEnv)
+	env.Payload = protoutil.MarshalOrPanic(payload)
+	block.Data.Data[0] = protoutil.MarshalOrPanic(env)
 }
 
 func injectGlobalOrdererEndpoint(t *testing.T, block *common.Block, endpoint string) {