Merge "Minor cleanup for orderer without a system channel"

hyperledger · Nov 20, 2019 · 3adcab3 · 3adcab3
2 parents 8aca8e7 + cc39bc7
commit 3adcab3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/integration/e2e/e2e_test.go b/integration/e2e/e2e_test.go
@@ -316,8 +316,6 @@ var _ = Describe("EndToEnd", func() {
 		var ordererProcess ifrit.Process
 		BeforeEach(func() {
 			soloConfig := nwo.BasicSolo()
-			soloConfig.RemovePeer("Org1", "peer1")
-			soloConfig.RemovePeer("Org2", "peer1")
 			network = nwo.New(soloConfig, testDir, client, StartPort(), components)
 			network.GenerateConfigTree()
 
@@ -330,7 +328,7 @@ var _ = Describe("EndToEnd", func() {
 			ordererRunner := network.OrdererRunner(orderer)
 			ordererProcess = ifrit.Invoke(ordererRunner)
 			Eventually(ordererProcess.Ready, network.EventuallyTimeout).Should(BeClosed())
-			Eventually(ordererRunner.Err(), network.EventuallyTimeout).Should(gbytes.Say("registrar initializing with no system channel"))
+			Eventually(ordererRunner.Err(), network.EventuallyTimeout).Should(gbytes.Say("registrar initializing without a system channel"))
 		})
 
 		AfterEach(func() {

diff --git a/orderer/common/multichannel/registrar.go b/orderer/common/multichannel/registrar.go
@@ -223,7 +223,7 @@ func (r *Registrar) Initialize(consenters map[string]consensus.Consenter) {
 	}
 
 	if r.systemChannelID == "" {
-		logger.Info("registrar initializing with no system channel")
+		logger.Warning("registrar initializing without a system channel")
 	}
 }
 

diff --git a/orderer/common/server/main_test.go b/orderer/common/server/main_test.go
@@ -383,7 +383,7 @@ func TestInitializeMultichannelRegistrar(t *testing.T) {
 
 	signer := &server_mocks.SignerSerializer{}
 
-	t.Run("registrar with system channel", func(t *testing.T) {
+	t.Run("registrar with a system channel", func(t *testing.T) {
 		lf, _, err := createLedgerFactory(conf, &disabled.Provider{})
 		assert.NoError(t, err)
 		bootBlock := file.New(genesisFile).GenesisBlock()
@@ -405,7 +405,7 @@ func TestInitializeMultichannelRegistrar(t *testing.T) {
 		assert.Equal(t, "testchannelid", registrar.SystemChannelID())
 	})
 
-	t.Run("registrar with no system channel", func(t *testing.T) {
+	t.Run("registrar without a system channel", func(t *testing.T) {
 		conf.General.GenesisMethod = "none"
 		conf.General.GenesisFile = ""
 		lf, _, err := createLedgerFactory(conf, &disabled.Provider{})