[FAB-12649] Address minor cosmetic issues in orderer

This change set addresses minor cosmetic issues pointed out
in code review to the orderer cluster commit chain.

Change-Id: I1e27f69e251d9946d21f4eb5a4d890de214b7378
Signed-off-by: yacovm <yacovm@il.ibm.com>

Author: yacovm

orderer/common/cluster/replication.go

@@ -105,34 +105,34 @@ type ChainInspector struct {
 
 // Channels returns the list of channels
 // that exist in the chain
-func (cw *ChainInspector) Channels() []string {
+func (ci *ChainInspector) Channels() []string {
 	channels := make(map[string]struct{})
-	lastConfigBlockNum := cw.LastConfigBlock.Header.Number
+	lastConfigBlockNum := ci.LastConfigBlock.Header.Number
 	var block *common.Block
 	for seq := uint64(1); seq < lastConfigBlockNum; seq++ {
-		block = cw.Puller.PullBlock(seq)
+		block = ci.Puller.PullBlock(seq)
 		channel, err := IsNewChannelBlock(block)
 		if err != nil {
 			// If we failed to classify a block, something is wrong in the system chain
 			// we're trying to pull, so abort.
-			cw.Logger.Panic("Failed classifying block", seq, ":", err)
+			ci.Logger.Panic("Failed classifying block", seq, ":", err)
 			continue
 		}
 		if channel == "" {
-			cw.Logger.Info("Block", seq, "doesn't contain a new channel")
+			ci.Logger.Info("Block", seq, "doesn't contain a new channel")
 			continue
 		}
-		cw.Logger.Info("Block", seq, "contains channel", channel)
+		ci.Logger.Info("Block", seq, "contains channel", channel)
 		channels[channel] = struct{}{}
 	}
 	// At this point, block holds reference to the last block pulled.
 	// We ensure that the hash of the last block pulled, is the previous hash
 	// of the LastConfigBlock we were initialized with.
 	// We don't need to verify the entire chain of all blocks we pulled,
 	// because the block puller calls VerifyBlockHash on all blocks it pulls.
-	last2Blocks := []*common.Block{block, cw.LastConfigBlock}
+	last2Blocks := []*common.Block{block, ci.LastConfigBlock}
 	if err := VerifyBlockHash(1, last2Blocks); err != nil {
-		cw.Logger.Panic("System channel pulled doesn't match the boot last config block:", err)
+		ci.Logger.Panic("System channel pulled doesn't match the boot last config block:", err)
 	}
 
 	return flattenChannelMap(channels)

orderer/common/multichannel/chainsupprt_test.go renamed to orderer/common/multichannel/chainsupport_test.go

@@ -88,7 +88,7 @@ type ConsenterSupport interface {
 	// Note that either WriteBlock or WriteConfigBlock must be called before invoking this method a second time.
 	CreateNextBlock(messages []*cb.Envelope) *cb.Block
 
-	// Block returns a block with the following number,
+	// Block returns a block with the given number,
 	// or nil if such a block doesn't exist.
 	Block(number uint64) *cb.Block
 

orderer/consensus/consensus.go

@@ -3635,7 +3635,6 @@ type mockConsenterSupport struct {
 }
 
 func (c *mockConsenterSupport) Block(seq uint64) *cb.Block {
-	// TODO: implement this
 	return nil
 }
 

orderer/consensus/kafka/chain_test.go

@@ -69,6 +69,7 @@ General:
           - tls/ca.crt
         # ReplicationBuffersSize is the maximum number of bytes that can be allocated
         # for each in-memory buffer used for block replication from other cluster nodes.
+        # Each channel has its own memory buffer.
         ReplicationBufferSize: 20971520 # 20MB
         # PullTimeout is the maximum duration the ordering node will wait for a block
         # to be received before it aborts.