From 607de4dd91f5ba302e6a93309f6cabe574586c73 Mon Sep 17 00:00:00 2001 From: Jason Yellick Date: Fri, 23 Aug 2019 10:08:05 -0400 Subject: [PATCH] FAB-16399 Correct capabilities error message The error message for attempting to enable orderer endpoints erroneously says first V2_0 capabilities must be enabled, when in fact this was backported to the V1_4_2 capabilities. Change-Id: I64f1ee6d1ed77938df5e00f52163c8a7763a4615 Signed-off-by: Jason Yellick --- common/channelconfig/orderer.go | 2 +- common/channelconfig/realconfig_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/channelconfig/orderer.go b/common/channelconfig/orderer.go index be51dae00b6..1076573916f 100644 --- 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 index 56bfd9b56fe..9f438d09380 100644 --- 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) {