remove Neighbors()

chainservice/builder.go

@@ -421,7 +421,7 @@ func (builder *Builder) buildBlockSyncer() error {
 			consens.Calibrate(blk.Height())
 			return nil
 		},
-		p2pAgent.Neighbors,
+		p2pAgent.ConnectedPeers,
 		p2pAgent.UnicastOutbound,
 		p2pAgent.BlockPeer,
 	)

p2p/agent.go

@@ -107,8 +107,6 @@ type (
 		Info() (peer.AddrInfo, error)
 		// Self returns the self network address
 		Self() ([]multiaddr.Multiaddr, error)
-		// Neighbors returns the neighbors' peer info
-		Neighbors(ctx context.Context) ([]peer.AddrInfo, error)
 		// ConnectedPeers returns the connected peers' info
 		ConnectedPeers(ctx context.Context) ([]peer.AddrInfo, error)
 		// BlockPeer blocks the peer in p2p layer
@@ -175,10 +173,6 @@ func (*dummyAgent) Self() ([]multiaddr.Multiaddr, error) {
 	return nil, nil
 }
 
-func (*dummyAgent) Neighbors(ctx context.Context) ([]peer.AddrInfo, error) {
-	return nil, nil
-}
-
 func (*dummyAgent) ConnectedPeers(ctx context.Context) ([]peer.AddrInfo, error) {
 	return nil, nil
 }
@@ -475,28 +469,6 @@ func (p *agent) Self() ([]multiaddr.Multiaddr, error) {
 	return p.host.Addresses(), nil
 }
 
-func (p *agent) Neighbors(ctx context.Context) ([]peer.AddrInfo, error) {
-	if p.host == nil {
-		return nil, ErrAgentNotStarted
-	}
-
-	// filter out bootnodes
-	var nb []peer.AddrInfo
-	for _, peer := range p.host.Neighbors(ctx) {
-		isValid := true
-		for _, bootNode := range p.bootNodeAddr {
-			if strings.Contains(bootNode.String(), peer.ID.Pretty()) {
-				isValid = false
-				break
-			}
-		}
-		if isValid {
-			nb = append(nb, peer)
-		}
-	}
-	return nb, nil
-}
-
 func (p *agent) ConnectedPeers(ctx context.Context) ([]peer.AddrInfo, error) {
 	if p.host == nil {
 		return nil, ErrAgentNotStarted

p2p/agent_test.go

@@ -37,7 +37,7 @@ func TestDummyAgent(t *testing.T) {
 	addrs, err := a.Self()
 	require.Nil(addrs)
 	require.NoError(err)
-	neighbors, err := a.Neighbors(nil)
+	neighbors, err := a.ConnectedPeers(nil)
 	require.Nil(neighbors)
 	require.NoError(err)
 }
@@ -147,7 +147,7 @@ func TestUnicast(t *testing.T) {
 	}
 
 	for i := 0; i < n; i++ {
-		neighbors, err := agents[i].Neighbors(ctx)
+		neighbors, err := agents[i].ConnectedPeers(ctx)
 		r.NoError(err)
 		r.True(len(neighbors) >= n/3)
 		for _, neighbor := range neighbors {

server/itx/heartbeat.go

@@ -91,27 +91,19 @@ func (h *HeartbeatHandler) Log() {
 		return
 	}
 
-	ctx := context.Background()
-	peers, err := p2pAgent.Neighbors(ctx)
-	if err != nil {
-		h.l.Debug("error when get neighbors.", zap.Error(err))
-		peers = nil
-	}
-
-	connectedPeers, err := p2pAgent.ConnectedPeers(ctx)
+	peers, err := p2pAgent.ConnectedPeers(context.Background())
 	if err != nil {
 		h.l.Debug("error when get connectedPeers.", zap.Error(err))
 		peers = nil
 	}
 
 	numPeers := len(peers)
 	h.l.Debug("Node status.",
-		zap.Int("numPeers", numPeers),
+		zap.Int("numConnectedPeers", numPeers),
 		zap.String("pendingDispatcherEvents", "{"+strings.Join(events, ", ")+"}"),
 		zap.String("pendingDispatcherEventsAudit", string(dpEvtsAudit)))
 
-	_heartbeatMtc.WithLabelValues("numPeers", "node").Set(float64(numPeers))
-	_heartbeatMtc.WithLabelValues("numConnectedPeers", "node").Set(float64(len(connectedPeers)))
+	_heartbeatMtc.WithLabelValues("numConnectedPeers", "node").Set(float64(numPeers))
 	_heartbeatMtc.WithLabelValues("pendingDispatcherEvents", "node").Set(float64(totalDPEventNumber))
 	// chain service
 	for _, c := range h.s.chainservices {