[FAB-14324] remove InitGossip...DeliveryFactory

- delegation target of InitGossipService
- only used in test
- appears unnecessary in tests
- removed bespoke mocks around the setup

Change-Id: I794a816c4fad278b7f65d504289f92e38d19190d
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

core/peer/peer_test.go

@@ -24,14 +24,11 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode/platforms"
 	"github.com/hyperledger/fabric/core/comm"
 	"github.com/hyperledger/fabric/core/committer/txvalidator/plugin"
-	"github.com/hyperledger/fabric/core/deliverservice"
-	"github.com/hyperledger/fabric/core/deliverservice/blocksprovider"
 	validation "github.com/hyperledger/fabric/core/handlers/validation/api"
 	"github.com/hyperledger/fabric/core/ledger"
 	"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/api"
 	"github.com/hyperledger/fabric/gossip/service"
 	peergossip "github.com/hyperledger/fabric/internal/peer/gossip"
 	"github.com/hyperledger/fabric/internal/peer/gossip/mocks"
@@ -42,36 +39,6 @@ import (
 	"google.golang.org/grpc"
 )
 
-type mockDeliveryClient struct {
-}
-
-func (ds *mockDeliveryClient) UpdateEndpoints(chainID string, endpoints []string) error {
-	return nil
-}
-
-// StartDeliverForChannel dynamically starts delivery of new blocks from ordering service
-// to channel peers.
-func (ds *mockDeliveryClient) StartDeliverForChannel(chainID string, ledgerInfo blocksprovider.LedgerInfo, f func()) error {
-	return nil
-}
-
-// StopDeliverForChannel dynamically stops delivery of new blocks from ordering service
-// to channel peers.
-func (ds *mockDeliveryClient) StopDeliverForChannel(chainID string) error {
-	return nil
-}
-
-// Stop terminates delivery service and closes the connection
-func (*mockDeliveryClient) Stop() {
-}
-
-type mockDeliveryClientFactory struct {
-}
-
-func (*mockDeliveryClientFactory) Service(g service.GossipService, endpoints []string, mcs api.MessageCryptoService) (deliverservice.DeliverService, error) {
-	return &mockDeliveryClient{}, nil
-}
-
 func TestMain(m *testing.M) {
 	// TODO: remove the transient store and peer setup once we've completed the
 	// transition to instances
@@ -203,18 +170,17 @@ func TestCreateChainFromBlock(t *testing.T) {
 		dialOpts = append(dialOpts, grpc.WithInsecure())
 		return dialOpts
 	}
-	err = service.InitGossipServiceCustomDeliveryFactory(
+
+	err = service.InitGossipService(
 		signer,
 		&disabled.Provider{},
 		socket.Addr().String(),
 		grpcServer,
 		nil,
-		&mockDeliveryClientFactory{},
 		messageCryptoService,
 		secAdv,
 		defaultSecureDialOpts,
 	)
-
 	assert.NoError(t, err)
 
 	go grpcServer.Serve(socket)

core/scc/cscc/configure_test.go

@@ -29,13 +29,10 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
-	"github.com/hyperledger/fabric/core/deliverservice"
-	"github.com/hyperledger/fabric/core/deliverservice/blocksprovider"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/core/policy"
 	policymocks "github.com/hyperledger/fabric/core/policy/mocks"
 	"github.com/hyperledger/fabric/core/transientstore"
-	"github.com/hyperledger/fabric/gossip/api"
 	"github.com/hyperledger/fabric/gossip/service"
 	"github.com/hyperledger/fabric/internal/configtxgen/configtxgentest"
 	"github.com/hyperledger/fabric/internal/configtxgen/encoder"
@@ -72,37 +69,6 @@ type configtxValidator interface {
 	configtx.Validator
 }
 
-type mockDeliveryClient struct {
-}
-
-func (ds *mockDeliveryClient) UpdateEndpoints(chainID string, endpoints []string) error {
-	return nil
-}
-
-// StartDeliverForChannel dynamically starts delivery of new blocks from ordering service
-// to channel peers.
-func (ds *mockDeliveryClient) StartDeliverForChannel(chainID string, ledgerInfo blocksprovider.LedgerInfo, f func()) error {
-	return nil
-}
-
-// StopDeliverForChannel dynamically stops delivery of new blocks from ordering service
-// to channel peers.
-func (ds *mockDeliveryClient) StopDeliverForChannel(chainID string) error {
-	return nil
-}
-
-// Stop terminates delivery service and closes the connection
-func (*mockDeliveryClient) Stop() {
-
-}
-
-type mockDeliveryClientFactory struct {
-}
-
-func (*mockDeliveryClientFactory) Service(g service.GossipService, endpoints []string, mcs api.MessageCryptoService) (deliverservice.DeliverService, error) {
-	return &mockDeliveryClient{}, nil
-}
-
 var mockAclProvider *aclmocks.MockACLProvider
 
 func TestMain(m *testing.M) {
@@ -280,13 +246,12 @@ func TestConfigerInvokeJoinChainCorrectParams(t *testing.T) {
 		return dialOpts
 	}
 
-	err = service.InitGossipServiceCustomDeliveryFactory(
+	err = service.InitGossipService(
 		signer,
 		&disabled.Provider{},
 		peerEndpoint,
 		grpcServer,
 		nil,
-		&mockDeliveryClientFactory{},
 		messageCryptoService,
 		secAdv,
 		defaultSecureDialOpts,

gossip/service/gossip_service.go

@@ -131,39 +131,12 @@ func (jcm *joinChannelMessage) AnchorPeersOf(org api.OrgIdentityType) []api.Anch
 var logger = util.GetLogger(util.ServiceLogger, "")
 
 // InitGossipService initialize gossip service
-func InitGossipService(peerIdentity identity.SignerSerializer, metricsProvider metrics.Provider, endpoint string, s *grpc.Server,
-	certs *gossipcommon.TLSCertificates, mcs api.MessageCryptoService, secAdv api.SecurityAdvisor,
-	secureDialOpts api.PeerSecureDialOpts, bootPeers ...string) error {
-	// TODO: Remove this.
-	// TODO: This is a temporary work-around to make the gossip leader election module load its logger at startup
-	// TODO: in order for the flogging package to register this logger in time so it can set the log levels as requested in the config
-	util.GetLogger(util.ElectionLogger, "")
-
-	return InitGossipServiceCustomDeliveryFactory(
-		peerIdentity,
-		metricsProvider,
-		endpoint,
-		s,
-		certs,
-		&deliveryFactoryImpl{
-			signer: peerIdentity,
-		},
-		mcs,
-		secAdv,
-		secureDialOpts,
-		bootPeers...,
-	)
-}
-
-// InitGossipServiceCustomDeliveryFactory initialize gossip service with customize delivery factory
-// implementation, might be useful for testing and mocking purposes
-func InitGossipServiceCustomDeliveryFactory(
+func InitGossipService(
 	peerIdentity identity.SignerSerializer,
 	metricsProvider metrics.Provider,
 	endpoint string,
 	s *grpc.Server,
 	certs *gossipcommon.TLSCertificates,
-	factory DeliveryServiceFactory,
 	mcs api.MessageCryptoService,
 	secAdv api.SecurityAdvisor,
 	secureDialOpts api.PeerSecureDialOpts,
@@ -175,29 +148,36 @@ func InitGossipServiceCustomDeliveryFactory(
 	if err != nil {
 		return err
 	}
-	once.Do(func() {
-		var gossipConfig *gossip.Config
 
+	once.Do(func() {
 		serviceConfig := GlobalConfig()
 		if serviceConfig.Endpoint != "" {
 			endpoint = serviceConfig.Endpoint
 		}
-		gossipConfig, err = gossip.GlobalConfig(endpoint, certs, bootPeers...)
 
 		logger.Info("Initialize gossip with endpoint", endpoint, "and bootstrap set", bootPeers)
 
-		gossipMetrics := gossipmetrics.NewGossipMetrics(metricsProvider)
-
-		gossipComponent = gossip.NewGossipService(gossipConfig, s, secAdv, mcs, serializedIdentity, secureDialOpts, gossipMetrics)
+		var gossipConfig *gossip.Config
+		gossipConfig, err = gossip.GlobalConfig(endpoint, certs, bootPeers...)
 
+		gossipMetrics := gossipmetrics.NewGossipMetrics(metricsProvider)
+		gossipComponent = gossip.NewGossipService(
+			gossipConfig,
+			s,
+			secAdv,
+			mcs,
+			serializedIdentity,
+			secureDialOpts,
+			gossipMetrics,
+		)
 		gossipServiceInstance = &gossipServiceImpl{
 			mcs:             mcs,
 			gossipSvc:       gossipComponent,
 			privateHandlers: make(map[string]privateHandler),
 			chains:          make(map[string]state.GossipStateProvider),
 			leaderElection:  make(map[string]election.LeaderElectionService),
 			deliveryService: make(map[string]deliverservice.DeliverService),
-			deliveryFactory: factory,
+			deliveryFactory: &deliveryFactoryImpl{signer: peerIdentity},
 			peerIdentity:    serializedIdentity,
 			secAdv:          secAdv,
 			metrics:         gossipMetrics,