extract router config collect all (#270)

* extract router config collect all

Signed-off-by: May.Buzaglo <[email protected]>

* fix error message

Signed-off-by: May.Buzaglo <[email protected]>

---------

Signed-off-by: May.Buzaglo <[email protected]>

Author: MayRosenbaum

common/requestfilter/sigfilter_test.go

@@ -9,15 +9,14 @@ package requestfilter_test
 import (
 	"testing"
 
-	"github.com/pkg/errors"
-
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-x-common/common/policies"
 	policyMock "github.com/hyperledger/fabric-x-orderer/common/policy/mocks"
 	"github.com/hyperledger/fabric-x-orderer/common/requestfilter"
 	"github.com/hyperledger/fabric-x-orderer/common/requestfilter/mocks"
 	"github.com/hyperledger/fabric-x-orderer/node/protos/comm"
 	"github.com/hyperledger/fabric-x-orderer/testutil/tx"
+	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 )

config/config.go

@@ -17,10 +17,11 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/hyperledger/fabric-x-common/protoutil"
-
 	smartbft_types "github.com/hyperledger-labs/SmartBFT/pkg/types"
+	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
+	"github.com/hyperledger/fabric-x-common/protoutil"
+	"github.com/hyperledger/fabric-x-orderer/common/policy"
 	"github.com/hyperledger/fabric-x-orderer/common/types"
 	"github.com/hyperledger/fabric-x-orderer/common/utils"
 	"github.com/hyperledger/fabric-x-orderer/config/protos"
@@ -144,7 +145,25 @@ func (config *Configuration) GetBFTConfig(partyID types.PartyID) (smartbft_types
 	return BFTConfig, nil
 }
 
-func (config *Configuration) ExtractRouterConfig() *nodeconfig.RouterNodeConfig {
+func (config *Configuration) ExtractRouterConfig(configBlock *common.Block) *nodeconfig.RouterNodeConfig {
+	channelID, err := ReadChannelIdFromConfigBlock(configBlock)
+	if err != nil {
+		panic(fmt.Sprintf("failed to read channelID from config block: %s", err))
+	}
+
+	bccsp, err := (&factory.SWFactory{}).Get(config.LocalConfig.NodeLocalConfig.GeneralConfig.BCCSP)
+	if err != nil {
+		bccsp = factory.GetDefault()
+	}
+	env, err := protoutil.GetEnvelopeFromBlock(configBlock.Data.Data[0])
+	if err != nil {
+		panic(fmt.Sprintf("failed to get envelope from config block: %s", err))
+	}
+	bundle, err := policy.BuildBundleFromBlock(env, bccsp)
+	if err != nil {
+		panic(fmt.Sprintf("failed to build bundle from config block: %s", err))
+	}
+
 	routerConfig := &nodeconfig.RouterNodeConfig{
 		PartyID:                             config.LocalConfig.NodeLocalConfig.PartyID,
 		TLSCertificateFile:                  config.LocalConfig.TLSConfig.Certificate,
@@ -157,6 +176,8 @@ func (config *Configuration) ExtractRouterConfig() *nodeconfig.RouterNodeConfig
 		ClientAuthRequired:                  config.LocalConfig.TLSConfig.ClientAuthRequired,
 		RequestMaxBytes:                     config.SharedConfig.BatchingConfig.RequestMaxBytes,
 		ClientSignatureVerificationRequired: config.LocalConfig.NodeLocalConfig.RouterParams.ClientSignatureVerificationRequired,
+		ChannelID:                           channelID,
+		PolicyManager:                       bundle.PolicyManager(),
 	}
 	return routerConfig
 }

node/server/arma.go

@@ -13,13 +13,10 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
 	"github.com/hyperledger/fabric-lib-go/common/flogging"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-protos-go-apiv2/orderer"
-	"github.com/hyperledger/fabric-x-common/protoutil"
 	"github.com/hyperledger/fabric-x-orderer/common/msp"
-	"github.com/hyperledger/fabric-x-orderer/common/policy"
 	"github.com/hyperledger/fabric-x-orderer/config"
 	"github.com/hyperledger/fabric-x-orderer/node"
 	"github.com/hyperledger/fabric-x-orderer/node/assembler"
@@ -203,27 +200,7 @@ func launchRouter(stop chan struct{}) func(configFile *os.File) {
 			panic(fmt.Sprintf("error launching router, err: %s", err))
 		}
 
-		routerConf := conf.ExtractRouterConfig()
-
-		channelID, err := config.ReadChannelIdFromConfigBlock(genesisBlock)
-		if err != nil {
-			panic(fmt.Sprintf("failed to read channelID from genesis block: %s", err))
-		}
-		routerConf.ChannelID = channelID
-
-		bccsp, err := (&factory.SWFactory{}).Get(conf.LocalConfig.NodeLocalConfig.GeneralConfig.BCCSP)
-		if err != nil {
-			bccsp = factory.GetDefault()
-		}
-		env, err := protoutil.GetEnvelopeFromBlock(genesisBlock.Data.Data[0])
-		if err != nil {
-			panic(fmt.Sprintf("failed to get envelope from genesis block: %s", err))
-		}
-		bundle, err := policy.BuildBundleFromBlock(env, bccsp)
-		if err != nil {
-			panic(fmt.Sprintf("failed to build bundle from genesis block: %s", err))
-		}
-		routerConf.PolicyManager = bundle.PolicyManager()
+		routerConf := conf.ExtractRouterConfig(genesisBlock)
 
 		var routerLogger *flogging.FabricLogger
 		if testLogger != nil {