[FAB-14324] rename GossipServiceImpl GossipService

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

Author: sykesm

core/peer/peer.go

@@ -416,7 +416,7 @@ type Peer struct {
 	storesMutex   sync.RWMutex
 	stores        map[string]transientstore.Store
 
-	GossipService gossipservice.GossipService
+	GossipService *gossipservice.GossipService
 
 	// validationWorkersSemaphore is used to limit the number of concurrent validation
 	// go routines.

gossip/service/gossip_service.go

@@ -35,8 +35,6 @@ import (
 	"google.golang.org/grpc"
 )
 
-type gossipSvc Gossip
-
 // Gossip is the interface of the gossip component
 type Gossip interface {
 	// SelfMembershipInfo returns the peer's membership information
@@ -106,29 +104,14 @@ type Gossip interface {
 	Stop()
 }
 
-// GossipService encapsulates gossip and state capabilities into single interface
-type GossipService interface {
-	Gossip
-
-	// DistributePrivateData distributes private data to the peers in the collections
-	// according to policies induced by the PolicyStore and PolicyParser
-	DistributePrivateData(channelID string, txID string, privateData *transientstore.TxPvtReadWriteSetWithConfigInfo, blkHt uint64) error
-	// NewConfigEventer creates a ConfigProcessor which the channelconfig.BundleSource can ultimately route config updates to
-	NewConfigEventer() ConfigProcessor
-	// InitializeChannel allocates the state provider and should be invoked once per channel per execution
-	InitializeChannel(channelID string, endpoints []string, support Support)
-	// AddPayload appends message payload to for given chain
-	AddPayload(channelID string, payload *gproto.Payload) error
-}
-
 // GossipServiceAdapter serves to provide basic functionality
 // required from gossip service by delivery service
 type GossipServiceAdapter interface {
 	// PeersOfChannel returns slice with members of specified channel
 	PeersOfChannel(gossipcommon.ChannelID) []discovery.NetworkMember
 
 	// AddPayload adds payload to the local state sync buffer
-	AddPayload(chainID string, payload *gproto.Payload) error
+	AddPayload(channelID string, payload *gproto.Payload) error
 
 	// Gossip the message across the peers
 	Gossip(msg *gproto.GossipMessage)
@@ -168,7 +151,9 @@ func (p privateHandler) close() {
 	p.reconciler.Stop()
 }
 
-type GossipServiceImpl struct {
+type gossipSvc Gossip
+
+type GossipService struct {
 	gossipSvc
 	privateHandlers map[string]privateHandler
 	chains          map[string]state.GossipStateProvider
@@ -220,7 +205,7 @@ func New(
 	secAdv api.SecurityAdvisor,
 	secureDialOpts api.PeerSecureDialOpts,
 	bootPeers ...string,
-) (*GossipServiceImpl, error) {
+) (*GossipService, error) {
 	serializedIdentity, err := peerIdentity.Serialize()
 	if err != nil {
 		return nil, err
@@ -247,7 +232,7 @@ func New(
 		gossipMetrics,
 	)
 
-	return &GossipServiceImpl{
+	return &GossipService{
 		gossipSvc:       gossipComponent,
 		mcs:             mcs,
 		privateHandlers: make(map[string]privateHandler),
@@ -263,7 +248,7 @@ func New(
 }
 
 // DistributePrivateData distribute private read write set inside the channel based on the collections policies
-func (g *GossipServiceImpl) DistributePrivateData(channelID string, txID string, privData *transientstore.TxPvtReadWriteSetWithConfigInfo, blkHt uint64) error {
+func (g *GossipService) DistributePrivateData(channelID string, txID string, privData *transientstore.TxPvtReadWriteSetWithConfigInfo, blkHt uint64) error {
 	g.lock.RLock()
 	handler, exists := g.privateHandlers[channelID]
 	g.lock.RUnlock()
@@ -285,7 +270,7 @@ func (g *GossipServiceImpl) DistributePrivateData(channelID string, txID string,
 }
 
 // NewConfigEventer creates a ConfigProcessor which the channelconfig.BundleSource can ultimately route config updates to
-func (g *GossipServiceImpl) NewConfigEventer() ConfigProcessor {
+func (g *GossipService) NewConfigEventer() ConfigProcessor {
 	return newConfigEventer(g)
 }
 
@@ -307,7 +292,7 @@ type DataStoreSupport struct {
 }
 
 // InitializeChannel allocates the state provider and should be invoked once per channel per execution
-func (g *GossipServiceImpl) InitializeChannel(channelID string, endpoints []string, support Support) {
+func (g *GossipService) InitializeChannel(channelID string, endpoints []string, support Support) {
 	g.lock.Lock()
 	defer g.lock.Unlock()
 	// Initialize new state provider for given committer
@@ -401,7 +386,7 @@ func (g *GossipServiceImpl) InitializeChannel(channelID string, endpoints []stri
 	}
 }
 
-func (g *GossipServiceImpl) createSelfSignedData() protoutil.SignedData {
+func (g *GossipService) createSelfSignedData() protoutil.SignedData {
 	msg := make([]byte, 32)
 	sig, err := g.mcs.Sign(msg)
 	if err != nil {
@@ -415,7 +400,7 @@ func (g *GossipServiceImpl) createSelfSignedData() protoutil.SignedData {
 }
 
 // updateAnchors constructs a joinChannelMessage and sends it to the gossipSvc
-func (g *GossipServiceImpl) updateAnchors(config Config) {
+func (g *GossipService) updateAnchors(config Config) {
 	myOrg := string(g.secAdv.OrgByPeerIdentity(api.PeerIdentityType(g.peerIdentity)))
 	if !g.amIinChannel(myOrg, config) {
 		logger.Error("Tried joining channel", config.ChainID(), "but our org(", myOrg, "), isn't "+
@@ -440,7 +425,7 @@ func (g *GossipServiceImpl) updateAnchors(config Config) {
 	g.JoinChan(jcm, gossipcommon.ChannelID(config.ChainID()))
 }
 
-func (g *GossipServiceImpl) updateEndpoints(channelID string, endpoints []string) {
+func (g *GossipService) updateEndpoints(channelID string, endpoints []string) {
 	if ds, ok := g.deliveryService[channelID]; ok {
 		logger.Debugf("Updating endpoints for channelID %s", channelID)
 		if err := ds.UpdateEndpoints(channelID, endpoints); err != nil {
@@ -452,14 +437,14 @@ func (g *GossipServiceImpl) updateEndpoints(channelID string, endpoints []string
 }
 
 // AddPayload appends message payload to for given chain
-func (g *GossipServiceImpl) AddPayload(channelID string, payload *gproto.Payload) error {
+func (g *GossipService) AddPayload(channelID string, payload *gproto.Payload) error {
 	g.lock.RLock()
 	defer g.lock.RUnlock()
 	return g.chains[channelID].AddPayload(payload)
 }
 
 // Stop stops the gossip component
-func (g *GossipServiceImpl) Stop() {
+func (g *GossipService) Stop() {
 	g.lock.Lock()
 	defer g.lock.Unlock()
 
@@ -479,7 +464,7 @@ func (g *GossipServiceImpl) Stop() {
 	g.gossipSvc.Stop()
 }
 
-func (g *GossipServiceImpl) newLeaderElectionComponent(channelID string, callback func(bool),
+func (g *GossipService) newLeaderElectionComponent(channelID string, callback func(bool),
 	electionMetrics *gossipmetrics.ElectionMetrics) election.LeaderElectionService {
 	PKIid := g.mcs.GetPKIidOfCert(g.peerIdentity)
 	adapter := election.NewAdapter(g, PKIid, gossipcommon.ChannelID(channelID), electionMetrics)
@@ -492,7 +477,7 @@ func (g *GossipServiceImpl) newLeaderElectionComponent(channelID string, callbac
 	return election.NewLeaderElectionService(adapter, string(PKIid), callback, config)
 }
 
-func (g *GossipServiceImpl) amIinChannel(myOrg string, config Config) bool {
+func (g *GossipService) amIinChannel(myOrg string, config Config) bool {
 	for _, orgName := range orgListFromConfig(config) {
 		if orgName == myOrg {
 			return true
@@ -501,7 +486,7 @@ func (g *GossipServiceImpl) amIinChannel(myOrg string, config Config) bool {
 	return false
 }
 
-func (g *GossipServiceImpl) onStatusChangeFactory(channelID string, committer blocksprovider.LedgerInfo) func(bool) {
+func (g *GossipService) onStatusChangeFactory(channelID string, committer blocksprovider.LedgerInfo) func(bool) {
 	return func(isLeader bool) {
 		if isLeader {
 			yield := func() {

gossip/service/gossip_service_test.go

@@ -646,10 +646,10 @@ func stopPeers(peers []*gossipGRPC) {
 	stoppingWg := sync.WaitGroup{}
 	stoppingWg.Add(len(peers))
 	for i, pI := range peers {
-		go func(i int, p_i *GossipServiceImpl) {
+		go func(i int, p_i *GossipService) {
 			defer stoppingWg.Done()
 			p_i.Stop()
-		}(i, pI.GossipServiceImpl)
+		}(i, pI.GossipService)
 	}
 	stoppingWg.Wait()
 	time.Sleep(time.Second * time.Duration(2))
@@ -750,7 +750,7 @@ func newGossipInstance(serviceConfig *ServiceConfig, port int, id int, gRPCServe
 	)
 	go gRPCServer.Start()
 
-	gossipService := &GossipServiceImpl{
+	gossipService := &GossipService{
 		mcs:             cryptoService,
 		gossipSvc:       gossip,
 		chains:          make(map[string]state.GossipStateProvider),
@@ -763,16 +763,16 @@ func newGossipInstance(serviceConfig *ServiceConfig, port int, id int, gRPCServe
 		serviceConfig:   serviceConfig,
 	}
 
-	return &gossipGRPC{GossipServiceImpl: gossipService, grpc: gRPCServer}
+	return &gossipGRPC{GossipService: gossipService, grpc: gRPCServer}
 }
 
 type gossipGRPC struct {
-	*GossipServiceImpl
+	*GossipService
 	grpc *comm.GRPCServer
 }
 
 func (g *gossipGRPC) Stop() {
-	g.GossipServiceImpl.Stop()
+	g.GossipService.Stop()
 	g.grpc.Stop()
 }
 

gossip/service/integration_test.go

@@ -137,8 +137,8 @@ func TestLeaderYield(t *testing.T) {
 	socket.Close()
 
 	// Helper function that creates a gossipService instance
-	newGossipService := func(i int) *GossipServiceImpl {
-		gs := gossips[i].GossipServiceImpl
+	newGossipService := func(i int) *GossipService {
+		gs := gossips[i].GossipService
 		gs.deliveryFactory = &embeddingDeliveryServiceFactory{&deliveryFactoryImpl{}}
 		gs.InitializeChannel(channelName, []string{endpoint}, Support{
 			Committer: &mockLedgerInfo{1},

gossip/service/join_test.go

@@ -163,7 +163,7 @@ func TestJoinChannelConfig(t *testing.T) {
 	g1SvcMock.On("JoinChan", mock.Anything, mock.Anything).Run(func(_ mock.Arguments) {
 		failChan <- struct{}{}
 	})
-	g1 := &GossipServiceImpl{secAdv: &secAdvMock{}, peerIdentity: api.PeerIdentityType("OrgMSP0"), gossipSvc: g1SvcMock}
+	g1 := &GossipService{secAdv: &secAdvMock{}, peerIdentity: api.PeerIdentityType("OrgMSP0"), gossipSvc: g1SvcMock}
 	g1.updateAnchors(&configMock{
 		orgs2AppOrgs: map[string]channelconfig.ApplicationOrg{
 			"Org0": &appOrgMock{id: "Org0"},
@@ -180,7 +180,7 @@ func TestJoinChannelConfig(t *testing.T) {
 	g2SvcMock.On("JoinChan", mock.Anything, mock.Anything).Run(func(_ mock.Arguments) {
 		succChan <- struct{}{}
 	})
-	g2 := &GossipServiceImpl{secAdv: &secAdvMock{}, peerIdentity: api.PeerIdentityType("Org0"), gossipSvc: g2SvcMock}
+	g2 := &GossipService{secAdv: &secAdvMock{}, peerIdentity: api.PeerIdentityType("Org0"), gossipSvc: g2SvcMock}
 	g2.updateAnchors(&configMock{
 		orgs2AppOrgs: map[string]channelconfig.ApplicationOrg{
 			"Org0": &appOrgMock{id: "Org0"},
@@ -212,7 +212,7 @@ func TestJoinChannelNoAnchorPeers(t *testing.T) {
 		assert.Equal(t, "A", string(channel))
 	})
 
-	g := &GossipServiceImpl{secAdv: &secAdvMock{}, peerIdentity: api.PeerIdentityType("Org0"), gossipSvc: gMock}
+	g := &GossipService{secAdv: &secAdvMock{}, peerIdentity: api.PeerIdentityType("Org0"), gossipSvc: gMock}
 
 	appOrg0 := &appOrgMock{id: "Org0"}
 	appOrg1 := &appOrgMock{id: "Org1"}

internal/peer/node/start.go

@@ -725,7 +725,7 @@ func registerDiscoveryService(
 	peerServer *comm.GRPCServer,
 	polMgr policies.ChannelPolicyManagerGetter,
 	metadataProvider *lifecycle.MetadataProvider,
-	gossipService gossipservice.GossipService,
+	gossipService *gossipservice.GossipService,
 ) {
 	mspID := coreConfig.LocalMSPID
 	localAccessPolicy := localPolicy(cauthdsl.SignedByAnyAdmin([]string{mspID}))
@@ -949,7 +949,7 @@ func initGossipService(
 	peerServer *comm.GRPCServer,
 	signer msp.SigningIdentity,
 	peerAddr string,
-) (gossipservice.GossipService, error) {
+) (*gossipservice.GossipService, error) {
 
 	var certs *gossipcommon.TLSCertificates
 	if peerServer.TLSEnabled() {