From 1ddbf1ca3bbfbc27ce5e107a675fd8948a97d841 Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Wed, 7 Jun 2017 13:51:12 +0800 Subject: [PATCH] [FAB-4440] Fix Consortium in configtxgen code [FAB-4355] uses the Consortium section, as suggested by jason and david, this patchset update it to Consortium value. Change-Id: I855d7a698b9c1ca32f79f9f8839a2fe7ac9912e0 Signed-off-by: Baohua Yang --- common/configtx/tool/configtxgen/main.go | 2 +- common/configtx/tool/configtxgen/main_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/configtx/tool/configtxgen/main.go b/common/configtx/tool/configtxgen/main.go index a1f329e1148..9e99508c07f 100644 --- a/common/configtx/tool/configtxgen/main.go +++ b/common/configtx/tool/configtxgen/main.go @@ -72,7 +72,7 @@ func doOutputChannelCreateTx(conf *genesisconfig.Profile, channelID string, outp } if conf.Consortium == "" { - return fmt.Errorf("Cannot define a new channel with no Consortium section") + return fmt.Errorf("Cannot define a new channel with no Consortium value") } // XXX we ignore the non-application org names here, once the tool supports configuration updates diff --git a/common/configtx/tool/configtxgen/main_test.go b/common/configtx/tool/configtxgen/main_test.go index 65fe75e8c14..24aafc4929d 100644 --- a/common/configtx/tool/configtxgen/main_test.go +++ b/common/configtx/tool/configtxgen/main_test.go @@ -62,14 +62,14 @@ func TestMissingOrdererSection(t *testing.T) { assert.Error(t, doOutputBlock(config, "foo", blockDest), "Missing orderer section") } -func TestMissingConsortiumSection(t *testing.T) { +func TestMissingConsortiumValue(t *testing.T) { configTxDest := tmpDir + string(os.PathSeparator) + "configtx" factory.InitFactories(nil) config := genesisconfig.Load(genesisconfig.SampleSingleMSPChannelProfile) config.Consortium = "" - assert.Error(t, doOutputChannelCreateTx(config, "foo", configTxDest), "Missing Consortium section in Application Profile definition") + assert.Error(t, doOutputChannelCreateTx(config, "foo", configTxDest), "Missing Consortium value in Application Profile definition") } func TestInspectConfigTx(t *testing.T) {