Merge "[FAB-4440] Fix Consortium in configtxgen code"

hyperledger · Jun 10, 2017 · 4eb5815 · 4eb5815
2 parents b21b6d4 + 1ddbf1c
commit 4eb5815
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common/configtx/tool/configtxgen/main.go b/common/configtx/tool/configtxgen/main.go
@@ -70,7 +70,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
@@ -66,14 +66,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 TestInspectMissingConfigTx(t *testing.T) {