Skip to content

Commit 455235e

Browse files
seidroid[bot]masihalexander-sei
authored
Backport release/v6.7: Count only connected peers in /net_info n_peers (#4515)
Backport of #4500 to `release/v6.7`. Co-authored-by: Masih H. Derkani <m@derkani.org> Co-authored-by: alexander-sei <alexanderh@seinetwork.io>
1 parent 206d3ce commit 455235e

2 files changed

Lines changed: 54 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import (
1111
"github.com/sei-protocol/sei-chain/sei-tendermint/types"
1212
)
1313

14-
// NetInfo returns network info.
14+
// NetInfo returns network info. NPeers counts connected peers, the same set as
15+
// PeerConnections; Peers lists every known address, including those learned via PEX.
1516
// More: https://docs.tendermint.com/master/rpc/#/Info/net_info
1617
func (env *Environment) NetInfo(ctx context.Context) (*coretypes.ResultNetInfo, error) {
1718
peers := map[types.NodeID]coretypes.Peer{}
@@ -36,7 +37,7 @@ func (env *Environment) NetInfo(ctx context.Context) (*coretypes.ResultNetInfo,
3637
return &coretypes.ResultNetInfo{
3738
Listening: env.IsListening,
3839
Listeners: env.Listeners,
39-
NPeers: len(peers),
40+
NPeers: len(peerConnections),
4041
Peers: slices.Collect(maps.Values(peers)),
4142
PeerConnections: slices.Collect(maps.Values(peerConnections)),
4243
}, nil
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package core
2+
3+
import (
4+
"testing"
5+
"time"
6+
7+
"github.com/stretchr/testify/require"
8+
9+
"github.com/sei-protocol/sei-chain/sei-tendermint/internal/p2p"
10+
"github.com/sei-protocol/sei-chain/sei-tendermint/libs/utils"
11+
"github.com/sei-protocol/sei-chain/sei-tendermint/rpc/coretypes"
12+
)
13+
14+
func TestNetInfo_NPeersCountsConnectedPeers(t *testing.T) {
15+
ctx := t.Context()
16+
network := p2p.MakeTestNetwork(t, p2p.TestNetworkOptions{})
17+
hub := network.MakeNode(t, p2p.TestNodeOptions{})
18+
a := network.MakeNode(t, p2p.TestNodeOptions{SelfAddress: true})
19+
b := network.MakeNode(t, p2p.TestNodeOptions{})
20+
21+
require.NoError(t, a.Connect(ctx, hub))
22+
require.NoError(t, b.Connect(ctx, hub))
23+
24+
env := &Environment{Router: hub.Router}
25+
res, err := env.NetInfo(ctx)
26+
require.NoError(t, err)
27+
require.Equal(t, 2, res.NPeers)
28+
require.Equal(t, []coretypes.Peer{{ID: a.NodeID, URL: a.NodeAddress.String()}}, res.Peers)
29+
require.ElementsMatch(t, []coretypes.PeerConnection{
30+
{ID: a.NodeID, State: "ready,connected", Score: 100},
31+
{ID: b.NodeID, State: "ready,connected", Score: 100},
32+
}, res.PeerConnections)
33+
}
34+
35+
func TestNetInfo_PeersIncludesPexAddresses(t *testing.T) {
36+
ctx := t.Context()
37+
network := p2p.MakeTestNetwork(t, p2p.TestNetworkOptions{})
38+
opts := p2p.TestNodeOptions{PexOnHandshake: true, SelfAddress: true}
39+
hub := network.MakeNode(t, opts)
40+
a := network.MakeNode(t, opts)
41+
opts.MaxConnected = utils.Some(1)
42+
b := network.MakeNode(t, opts)
43+
require.NoError(t, a.Connect(ctx, hub))
44+
require.NoError(t, b.Connect(ctx, hub))
45+
46+
env := &Environment{Router: b.Router}
47+
require.Eventually(t, func() bool {
48+
res, err := env.NetInfo(ctx)
49+
return err == nil && res.NPeers == 1 && len(res.PeerConnections) == 1 && len(res.Peers) == 2
50+
}, 10*time.Second, 10*time.Millisecond)
51+
}

0 commit comments

Comments
 (0)