refactor in router, prepare for dynamic reconfig

Signed-off-by: Dor.Katzelnick <Dor.Katzelnick@ibm.com>

Author: DorKatzelnick

node/router/config_submitter.go

@@ -21,6 +21,7 @@ import (
 	"github.com/hyperledger/fabric-x-orderer/common/types"
 	"github.com/hyperledger/fabric-x-orderer/config/verify"
 	"github.com/hyperledger/fabric-x-orderer/node/comm"
+	nodeconfig "github.com/hyperledger/fabric-x-orderer/node/config"
 	protos "github.com/hyperledger/fabric-x-orderer/node/protos/comm"
 	"google.golang.org/grpc"
 )
@@ -48,6 +49,15 @@ type configSubmitter struct {
 	configRulesVerifier   verify.OrdererRules
 }
 
+func CreateConfigSubmitter(conf *nodeconfig.RouterNodeConfig, logger types.Logger, verifier *requestfilter.RulesVerifier, signer identity.SignerSerializer, configUpdateProposer policy.ConfigUpdateProposer, configRulesVerifier verify.OrdererRules) *configSubmitter {
+	var tlsCAsOfConsenter [][]byte
+	for _, rawTLSCA := range conf.Consenter.TLSCACerts {
+		tlsCAsOfConsenter = append(tlsCAsOfConsenter, rawTLSCA)
+	}
+
+	return NewConfigSubmitter(conf.Consenter.Endpoint, tlsCAsOfConsenter, conf.TLSCertificateFile, conf.TLSPrivateKeyFile, logger, conf.Bundle, verifier, signer, configUpdateProposer, configRulesVerifier)
+}
+
 func NewConfigSubmitter(consensusEndpoint string, consensusRootCAs [][]byte, tlsCert []byte, tlsKey []byte, logger types.Logger, bundle channelconfig.Resources, verifier *requestfilter.RulesVerifier, signer identity.SignerSerializer, configUpdateProposer policy.ConfigUpdateProposer, configRulesVerifier verify.OrdererRules) *configSubmitter {
 	cs := &configSubmitter{
 		consensusEndpoint:     consensusEndpoint,

node/router/router.go

@@ -63,9 +63,11 @@ type Router struct {
 	feedbackWG       sync.WaitGroup
 	configSeq        uint32
 	wal              *wal.WriteAheadLogFile
+	signer           identity.SignerSerializer
+	configuration    *config.Configuration
 }
 
-func NewRouter(config *nodeconfig.RouterNodeConfig, logger types.Logger, signer identity.SignerSerializer, configUpdateProposer policy.ConfigUpdateProposer, configRulesVerifier verify.OrdererRules) *Router {
+func NewRouter(config *nodeconfig.RouterNodeConfig, configuration *config.Configuration, logger types.Logger, signer identity.SignerSerializer, configUpdateProposer policy.ConfigUpdateProposer, configRulesVerifier verify.OrdererRules) *Router {
 	// shardIDs is an array of all shard ids
 	var shardIDs []types.ShardID
 	// batcherEndpoints are the endpoints of all batchers from the router's party by shard id
@@ -91,11 +93,6 @@ func NewRouter(config *nodeconfig.RouterNodeConfig, logger types.Logger, signer
 		return int(shardIDs[i]) < int(shardIDs[j])
 	})
 
-	var tlsCAsOfConsenter [][]byte
-	for _, rawTLSCA := range config.Consenter.TLSCACerts {
-		tlsCAsOfConsenter = append(tlsCAsOfConsenter, rawTLSCA)
-	}
-
 	configStore, err := configstore.NewStore(config.FileStorePath)
 	if err != nil {
 		logger.Panicf("Failed creating router config store: %s", err)
@@ -113,12 +110,14 @@ func NewRouter(config *nodeconfig.RouterNodeConfig, logger types.Logger, signer
 	decisionPuller := CreateConsensusDecisionReplicator(config, seekInfo, logger)
 
 	verifier := createVerifier(config)
-	configSubmitter := NewConfigSubmitter(config.Consenter.Endpoint, tlsCAsOfConsenter,
-		config.TLSCertificateFile, config.TLSPrivateKeyFile, logger, config.Bundle, verifier, signer, configUpdateProposer, configRulesVerifier)
+
+	configSubmitter := CreateConfigSubmitter(config, logger, verifier, signer, configUpdateProposer, configRulesVerifier)
 
 	metrics := NewRouterMetrics(config, logger)
 
 	r := createRouter(shardIDs, batcherEndpoints, tlsCAsOfBatchers, metrics, config, logger, verifier, configStore, configSubmitter, decisionPuller, routerWAL)
+	r.signer = signer
+	r.configuration = configuration
 	r.init()
 	r.metrics.Start()
 	return r

node/router/router_test.go

@@ -989,7 +989,7 @@ func createAndStartRouter(t *testing.T, partyID types.PartyID, ca tlsgen.CA, bat
 	configRulesVerifier.ValidateNewConfigReturns(nil)
 	configRulesVerifier.ValidateTransitionReturns(nil)
 
-	r := router.NewRouter(conf, logger, fakeSigner, configUpdateProposer, configRulesVerifier)
+	r := router.NewRouter(conf, nil, logger, fakeSigner, configUpdateProposer, configRulesVerifier)
 	r.StartRouterService()
 
 	return r, conf

node/server/arma.go

@@ -242,7 +242,7 @@ func launchRouter(stop chan struct{}) func(configFile *os.File) {
 		} else {
 			routerLogger = flogging.MustGetLogger(fmt.Sprintf("Router%d", routerConf.PartyID))
 		}
-		r := router.NewRouter(routerConf, routerLogger, signer, &policy.DefaultConfigUpdateProposer{}, &verify.DefaultOrdererRules{})
+		r := router.NewRouter(routerConf, conf, routerLogger, signer, &policy.DefaultConfigUpdateProposer{}, &verify.DefaultOrdererRules{})
 		ch := r.StartRouterService()
 
 		go func() {

test/utils_test.go

@@ -155,7 +155,7 @@ func createRouters(t *testing.T, num int, batcherInfos []node_config.BatcherInfo
 		configRulesVerifier.ValidateNewConfigReturns(nil)
 		configRulesVerifier.ValidateTransitionReturns(nil)
 
-		router := router.NewRouter(config, l, fakeSigner, configUpdateProposer, configRulesVerifier)
+		router := router.NewRouter(config, nil, l, fakeSigner, configUpdateProposer, configRulesVerifier)
 		routers = append(routers, router)
 	}
 
@@ -544,7 +544,7 @@ func recoverRouter(conf *node_config.RouterNodeConfig, logger *zap.SugaredLogger
 	configRulesVerifier.ValidateNewConfigReturns(nil)
 	configRulesVerifier.ValidateTransitionReturns(nil)
 
-	router := router.NewRouter(conf, logger, fakeSigner, configUpdateProposer, configRulesVerifier)
+	router := router.NewRouter(conf, nil, logger, fakeSigner, configUpdateProposer, configRulesVerifier)
 	router.StartRouterService()
 
 	return router