[FAB-13056] Onboarding: systemchannel from boot block

This change set makes the system channel retrieval for onboarding be based
on the content of the bootstrap block, and not in the orderer.yaml.

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

Author: yacovm

orderer/common/cluster/replication.go

@@ -30,9 +30,9 @@ const (
 // PullerConfigFromTopLevelConfig creates a PullerConfig from a TopLevel config,
 // and from a signer and TLS key cert pair.
 // The PullerConfig's channel is initialized to be the system channel.
-func PullerConfigFromTopLevelConfig(conf *localconfig.TopLevel, tlsKey, tlsCert []byte, signer crypto.LocalSigner) PullerConfig {
+func PullerConfigFromTopLevelConfig(systemChannel string, conf *localconfig.TopLevel, tlsKey, tlsCert []byte, signer crypto.LocalSigner) PullerConfig {
 	return PullerConfig{
-		Channel:             conf.General.SystemChannel,
+		Channel:             systemChannel,
 		MaxTotalBufferBytes: conf.General.Cluster.ReplicationBufferSize,
 		Timeout:             conf.General.Cluster.RPCTimeout,
 		TLSKey:              tlsKey,

orderer/common/cluster/replication_test.go

@@ -214,15 +214,14 @@ func TestPullerConfigFromTopLevelConfig(t *testing.T) {
 
 	topLevelConfig := &localconfig.TopLevel{
 		General: localconfig.General{
-			SystemChannel: "system",
 			Cluster: localconfig.Cluster{
 				ReplicationBufferSize: 100,
 				RPCTimeout:            time.Hour,
 			},
 		},
 	}
 
-	config := cluster.PullerConfigFromTopLevelConfig(topLevelConfig, []byte{1, 2, 3}, []byte{3, 2, 1}, signer)
+	config := cluster.PullerConfigFromTopLevelConfig("system", topLevelConfig, []byte{1, 2, 3}, []byte{3, 2, 1}, signer)
 	assert.Equal(t, expected, config)
 }
 

orderer/common/server/onboarding.go

@@ -15,6 +15,7 @@ import (
 	"github.com/hyperledger/fabric/orderer/common/localconfig"
 	"github.com/hyperledger/fabric/orderer/consensus/etcdraft"
 	"github.com/hyperledger/fabric/protos/common"
+	"github.com/hyperledger/fabric/protos/utils"
 )
 
 type replicationInitiator struct {
@@ -33,8 +34,11 @@ func (ri *replicationInitiator) replicateIfNeeded() {
 	}
 
 	consenterCert := etcdraft.ConsenterCertificate(ri.secOpts.Certificate)
-
-	pullerConfig := cluster.PullerConfigFromTopLevelConfig(ri.conf, ri.secOpts.Key, ri.secOpts.Certificate, ri.signer)
+	systemChannelName, err := utils.GetChainIDFromBlock(ri.bootstrapBlock)
+	if err != nil {
+		ri.logger.Panicf("Failed extracting system channel name from bootstrap block: %v", err)
+	}
+	pullerConfig := cluster.PullerConfigFromTopLevelConfig(systemChannelName, ri.conf, ri.secOpts.Key, ri.secOpts.Certificate, ri.signer)
 	puller, err := cluster.BlockPullerFromConfigBlock(pullerConfig, ri.bootstrapBlock)
 	if err != nil {
 		ri.logger.Panicf("Failed creating puller config from bootstrap block: %v", err)
@@ -44,7 +48,7 @@ func (ri *replicationInitiator) replicateIfNeeded() {
 
 	replicator := &cluster.Replicator{
 		LedgerFactory:    ri.lf,
-		SystemChannel:    ri.conf.General.SystemChannel,
+		SystemChannel:    systemChannelName,
 		BootBlock:        ri.bootstrapBlock,
 		Logger:           pullerLogger,
 		AmIPartOfChannel: consenterCert.IsConsenterOfChannel,

orderer/common/server/onboarding_test.go

@@ -147,6 +147,13 @@ func TestReplicateIfNeeded(t *testing.T) {
 		return res
 	}
 
+	bootBlockWithCorruptedPayload := copyBlock(bootBlock, 100)
+	env := &common.Envelope{}
+	proto.Unmarshal(bootBlockWithCorruptedPayload.Data.Data[0], env)
+	payload := &common.Payload{}
+	proto.Unmarshal(env.Payload, payload)
+	payload.Data = []byte{1, 2, 3}
+
 	deliverServer.blockResponses <- &orderer.DeliverResponse{
 		Type: &orderer.DeliverResponse_Block{Block: bootBlock},
 	}
@@ -201,8 +208,16 @@ func TestReplicateIfNeeded(t *testing.T) {
 		{
 			name:               "Block puller initialization failure panics",
 			systemLedgerHeight: 10,
-			panicValue:         "Failed creating puller config from bootstrap block: block data is nil",
-			bootBlock:          &common.Block{Header: &common.BlockHeader{Number: 10}},
+			panicValue:         "Failed creating puller config from bootstrap block: unable to decode TLS certificate PEM: ",
+			bootBlock:          bootBlockWithCorruptedPayload,
+			conf:               &localconfig.TopLevel{},
+			secOpts:            &comm.SecureOptions{},
+		},
+		{
+			name:               "Extraction of sytem channel name fails",
+			systemLedgerHeight: 10,
+			panicValue:         "Failed extracting system channel name from bootstrap block: failed to retrieve channel id - block is empty",
+			bootBlock:          &common.Block{Header: &common.BlockHeader{Number: 100}},
 			conf:               &localconfig.TopLevel{},
 			secOpts:            &comm.SecureOptions{},
 		},
@@ -238,7 +253,7 @@ func TestReplicateIfNeeded(t *testing.T) {
 		{
 			name: "Replication is needed, but pulling fails",
 			panicValue: "Failed pulling system channel: " +
-				"failed obtaining the latest block for channel system",
+				"failed obtaining the latest block for channel testchainid",
 			shouldConnect:      true,
 			systemLedgerHeight: 10,
 			bootBlock:          bootBlock,