Count only connected peers in /net_info n_peers

sei-tendermint/internal/rpc/core/net.go

@@ -11,7 +11,8 @@ import (
 	"github.com/sei-protocol/sei-chain/sei-tendermint/types"
 )
 
-// NetInfo returns network info.
+// NetInfo returns network info. NPeers counts connected peers, the same set as
+// PeerConnections; Peers lists every known address, including those learned via PEX.
 // More: https://docs.tendermint.com/master/rpc/#/Info/net_info
 func (env *Environment) NetInfo(ctx context.Context) (*coretypes.ResultNetInfo, error) {
 	peers := map[types.NodeID]coretypes.Peer{}
@@ -36,7 +37,7 @@ func (env *Environment) NetInfo(ctx context.Context) (*coretypes.ResultNetInfo,
 	return &coretypes.ResultNetInfo{
 		Listening:       env.IsListening,
 		Listeners:       env.Listeners,
-		NPeers:          len(peers),
+		NPeers:          len(peerConnections),
 		Peers:           slices.Collect(maps.Values(peers)),
 		PeerConnections: slices.Collect(maps.Values(peerConnections)),
 	}, nil

sei-tendermint/internal/rpc/core/net_test.go

@@ -0,0 +1,51 @@
+package core
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/sei-protocol/sei-chain/sei-tendermint/internal/p2p"
+	"github.com/sei-protocol/sei-chain/sei-tendermint/libs/utils"
+	"github.com/sei-protocol/sei-chain/sei-tendermint/rpc/coretypes"
+)
+
+func TestNetInfo_NPeersCountsConnectedPeers(t *testing.T) {
+	ctx := t.Context()
+	network := p2p.MakeTestNetwork(t, p2p.TestNetworkOptions{})
+	hub := network.MakeNode(t, p2p.TestNodeOptions{})
+	a := network.MakeNode(t, p2p.TestNodeOptions{SelfAddress: true})
+	b := network.MakeNode(t, p2p.TestNodeOptions{})
+
+	require.NoError(t, a.Connect(ctx, hub))
+	require.NoError(t, b.Connect(ctx, hub))
+
+	env := &Environment{Router: hub.Router}
+	res, err := env.NetInfo(ctx)
+	require.NoError(t, err)
+	require.Equal(t, 2, res.NPeers)
+	require.Equal(t, []coretypes.Peer{{ID: a.NodeID, URL: a.NodeAddress.String()}}, res.Peers)
+	require.ElementsMatch(t, []coretypes.PeerConnection{
+		{ID: a.NodeID, State: "ready,connected", Score: 100},
+		{ID: b.NodeID, State: "ready,connected", Score: 100},
+	}, res.PeerConnections)
+}
+
+func TestNetInfo_PeersIncludesPexAddresses(t *testing.T) {
+	ctx := t.Context()
+	network := p2p.MakeTestNetwork(t, p2p.TestNetworkOptions{})
+	opts := p2p.TestNodeOptions{PexOnHandshake: true, SelfAddress: true}
+	hub := network.MakeNode(t, opts)
+	a := network.MakeNode(t, opts)
+	opts.MaxConnected = utils.Some(1)
+	b := network.MakeNode(t, opts)
+	require.NoError(t, a.Connect(ctx, hub))
+	require.NoError(t, b.Connect(ctx, hub))
+
+	env := &Environment{Router: b.Router}
+	require.Eventually(t, func() bool {
+		res, err := env.NetInfo(ctx)
+		return err == nil && res.NPeers == 1 && len(res.PeerConnections) == 1 && len(res.Peers) == 2
+	}, 10*time.Second, 10*time.Millisecond)
+}