[FAB-15488] Refactor gossip_service.go init func

Refactor InitGossipService function in ./fabric/gossip/service
gossip_service.go. Passing in both obtain both gossipConfig
and serviceConfig in peer/node/start and passing into gossip
via function parameters.

All unit tests changed accordinly.

Change-Id: If99a1b364f0f7d2be69c8081a6bab7ed4a7de940
Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>

Author: DereckLuo

core/peer/peer_test.go

@@ -28,7 +28,9 @@ import (
 	"github.com/hyperledger/fabric/core/ledger/mock"
 	ledgermocks "github.com/hyperledger/fabric/core/ledger/mock"
 	"github.com/hyperledger/fabric/core/transientstore"
+	"github.com/hyperledger/fabric/gossip/gossip"
 	gossipmetrics "github.com/hyperledger/fabric/gossip/metrics"
+	"github.com/hyperledger/fabric/gossip/service"
 	gossipservice "github.com/hyperledger/fabric/gossip/service"
 	peergossip "github.com/hyperledger/fabric/internal/peer/gossip"
 	"github.com/hyperledger/fabric/internal/peer/gossip/mocks"
@@ -66,18 +68,20 @@ func NewTestPeer(t *testing.T) (*Peer, func()) {
 		defaultDeliverClientDialOpts,
 		comm.ClientKeepaliveOptions(comm.DefaultKeepaliveOptions)...,
 	)
+	gossipConfig, err := gossip.GlobalConfig("localhost:0", nil)
 
 	gossipService, err := gossipservice.New(
 		signer,
 		gossipmetrics.NewGossipMetrics(&disabled.Provider{}),
 		"localhost:0",
 		grpc.NewServer(),
-		nil,
 		messageCryptoService,
 		secAdv,
 		defaultSecureDialOpts,
 		nil,
 		defaultDeliverClientDialOpts,
+		gossipConfig,
+		&service.ServiceConfig{},
 	)
 	require.NoError(t, err, "failed to create gossip service")
 

core/scc/cscc/configure_test.go

@@ -28,6 +28,7 @@ import (
 	"github.com/hyperledger/fabric/core/policy"
 	"github.com/hyperledger/fabric/core/scc/cscc/mocks"
 	"github.com/hyperledger/fabric/core/transientstore"
+	"github.com/hyperledger/fabric/gossip/gossip"
 	gossipmetrics "github.com/hyperledger/fabric/gossip/metrics"
 	"github.com/hyperledger/fabric/gossip/service"
 	"github.com/hyperledger/fabric/internal/configtxgen/configtxgentest"
@@ -224,18 +225,21 @@ func TestConfigerInvokeJoinChainCorrectParams(t *testing.T) {
 		defaultDeliverClientDialOpts,
 		comm.ClientKeepaliveOptions(comm.DefaultKeepaliveOptions)...,
 	)
+	gossipConfig, err := gossip.GlobalConfig(peerEndpoint, nil)
+	assert.NoError(t, err)
 
 	gossipService, err := service.New(
 		signer,
 		gossipmetrics.NewGossipMetrics(&disabled.Provider{}),
 		peerEndpoint,
 		grpcServer,
-		nil,
 		messageCryptoService,
 		secAdv,
 		defaultSecureDialOpts,
 		nil,
 		defaultDeliverClientDialOpts,
+		gossipConfig,
+		&service.ServiceConfig{},
 	)
 	assert.NoError(t, err)
 

gossip/service/gossip_service.go

@@ -209,30 +209,20 @@ func New(
 	gossipMetrics *gossipmetrics.GossipMetrics,
 	endpoint string,
 	s *grpc.Server,
-	certs *gossipcommon.TLSCertificates,
 	mcs api.MessageCryptoService,
 	secAdv api.SecurityAdvisor,
 	secureDialOpts api.PeerSecureDialOpts,
 	credSupport *corecomm.CredentialSupport,
 	deliverClientDialOpts []grpc.DialOption,
-	bootPeers ...string,
+	gossipConfig *gossip.Config,
+	serviceConfig *ServiceConfig,
 ) (*GossipService, error) {
 	serializedIdentity, err := peerIdentity.Serialize()
 	if err != nil {
 		return nil, err
 	}
 
-	serviceConfig := GlobalConfig()
-	if serviceConfig.Endpoint != "" {
-		endpoint = serviceConfig.Endpoint
-	}
-
-	gossipConfig, err := gossip.GlobalConfig(endpoint, certs, bootPeers...)
-	if err != nil {
-		return nil, err
-	}
-
-	logger.Infof("Initialize gossip with endpoint %s and bootstrap set %v", endpoint, bootPeers)
+	logger.Infof("Initialize gossip with endpoint %s", endpoint)
 
 	gossipComponent := gossip.New(
 		gossipConfig,

gossip/service/gossip_service_test.go

@@ -88,18 +88,21 @@ func TestInitGossipService(t *testing.T) {
 	messageCryptoService := peergossip.NewMCS(&mocks.ChannelPolicyManagerGetter{}, signer, mgmt.NewDeserializersManager())
 	secAdv := peergossip.NewSecurityAdvisor(mgmt.NewDeserializersManager())
 	dialOpts := defaultDeliverClientDialOpts()
+	gossipConfig, err := gossip.GlobalConfig(endpoint, nil)
+	assert.NoError(t, err)
 
 	gossipService, err := New(
 		signer,
 		gossipmetrics.NewGossipMetrics(&disabled.Provider{}),
 		endpoint,
 		grpcServer,
-		nil,
 		messageCryptoService,
 		secAdv,
 		nil,
 		comm.NewCredentialSupport(),
 		dialOpts,
+		gossipConfig,
+		&ServiceConfig{},
 	)
 	assert.NoError(t, err)
 
@@ -867,18 +870,21 @@ func TestInvalidInitialization(t *testing.T) {
 	mockSignerSerializer.SerializeReturns(api.PeerIdentityType("peer-identity"), nil)
 	secAdv := peergossip.NewSecurityAdvisor(mgmt.NewDeserializersManager())
 	dialOpts := defaultDeliverClientDialOpts()
+	gossipConfig, err := gossip.GlobalConfig(endpoint, nil)
+	assert.NoError(t, err)
 
 	gossipService, err := New(
 		mockSignerSerializer,
 		gossipmetrics.NewGossipMetrics(&disabled.Provider{}),
 		endpoint,
 		grpcServer,
-		nil,
 		&naiveCryptoService{},
 		secAdv,
 		nil,
 		comm.NewCredentialSupport(),
 		dialOpts,
+		gossipConfig,
+		&ServiceConfig{},
 	)
 	assert.NoError(t, err)
 	gService := gossipService
@@ -908,18 +914,21 @@ func TestChannelConfig(t *testing.T) {
 	mockSignerSerializer.SerializeReturns(api.PeerIdentityType("peer-identity"), nil)
 	secAdv := peergossip.NewSecurityAdvisor(mgmt.NewDeserializersManager())
 	dialOpts := defaultDeliverClientDialOpts()
+	gossipConfig, err := gossip.GlobalConfig(endpoint, nil)
+	assert.NoError(t, err)
 
 	gossipService, err := New(
 		mockSignerSerializer,
 		gossipmetrics.NewGossipMetrics(&disabled.Provider{}),
 		endpoint,
 		grpcServer,
-		nil,
 		&naiveCryptoService{},
 		secAdv,
 		nil,
 		nil,
 		dialOpts,
+		gossipConfig,
+		&ServiceConfig{},
 	)
 	assert.NoError(t, err)
 	gService := gossipService

internal/peer/node/start.go

@@ -75,7 +75,9 @@ import (
 	"github.com/hyperledger/fabric/discovery/support/config"
 	"github.com/hyperledger/fabric/discovery/support/gossip"
 	gossipcommon "github.com/hyperledger/fabric/gossip/common"
+	gossipgossip "github.com/hyperledger/fabric/gossip/gossip"
 	gossipmetrics "github.com/hyperledger/fabric/gossip/metrics"
+	"github.com/hyperledger/fabric/gossip/service"
 	gossipservice "github.com/hyperledger/fabric/gossip/service"
 	peergossip "github.com/hyperledger/fabric/internal/peer/gossip"
 	"github.com/hyperledger/fabric/internal/peer/version"
@@ -1013,7 +1015,7 @@ func initGossipService(
 	peerServer *comm.GRPCServer,
 	signer msp.SigningIdentity,
 	credSupport *comm.CredentialSupport,
-	peerAddr string,
+	peerAddress string,
 	deliverClientDialOpts []grpc.DialOption,
 ) (*gossipservice.GossipService, error) {
 
@@ -1037,18 +1039,27 @@ func initGossipService(
 	secAdv := peergossip.NewSecurityAdvisor(mgmt.NewDeserializersManager())
 	bootstrap := viper.GetStringSlice("peer.gossip.bootstrap")
 
+	serviceConfig := service.GlobalConfig()
+	if serviceConfig.Endpoint != "" {
+		peerAddress = serviceConfig.Endpoint
+	}
+	gossipConfig, err := gossipgossip.GlobalConfig(peerAddress, certs, bootstrap...)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed obtaining gossip config")
+	}
+
 	return gossipservice.New(
 		signer,
 		gossipmetrics.NewGossipMetrics(metricsProvider),
-		peerAddr,
+		peerAddress,
 		peerServer.Server(),
-		certs,
 		messageCryptoService,
 		secAdv,
 		secureDialOpts(credSupport),
 		credSupport,
 		deliverClientDialOpts,
-		bootstrap...,
+		gossipConfig,
+		serviceConfig,
 	)
 }