Merge "FAB-16399 Correct capabilities error message" into release-1.4

hyperledger · Aug 23, 2019 · 4b34ac6 · 4b34ac6
2 parents 11de776 + 607de4d
commit 4b34ac6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/common/channelconfig/orderer.go b/common/channelconfig/orderer.go
@@ -87,7 +87,7 @@ func NewOrdererOrgConfig(orgName string, orgGroup *cb.ConfigGroup, mspConfigHand
 
 	if !channelCapabilities.OrgSpecificOrdererEndpoints() {
 		if _, ok := orgGroup.Values[EndpointsKey]; ok {
-			return nil, errors.Errorf("Orderer Org %s cannot contain endpoints value until V2_0+ capabilities have been enabled", orgName)
+			return nil, errors.Errorf("Orderer Org %s cannot contain endpoints value until V1_4_2+ capabilities have been enabled", orgName)
 		}
 	}
 

diff --git a/common/channelconfig/realconfig_test.go b/common/channelconfig/realconfig_test.go
@@ -49,7 +49,7 @@ func TestOrgSpecificOrdererEndpoints(t *testing.T) {
 		assert.NoError(t, err)
 
 		_, err = channelconfig.NewChannelConfig(cg)
-		assert.EqualError(t, err, "could not create channel Orderer sub-group config: Orderer Org SampleOrg cannot contain endpoints value until V2_0+ capabilities have been enabled")
+		assert.EqualError(t, err, "could not create channel Orderer sub-group config: Orderer Org SampleOrg cannot contain endpoints value until V1_4_2+ capabilities have been enabled")
 	})
 
 	t.Run("Without_Capability_NoOSNs", func(t *testing.T) {