Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

only count connections with pubsub streams in ip colocation factor #312

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions score.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"time"

"github.com/libp2p/go-libp2p-core/host"
"github.com/libp2p/go-libp2p-core/network"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/libp2p/go-libp2p-core/protocol"

Expand Down Expand Up @@ -765,6 +766,10 @@ func (ps *peerScore) getIPs(p peer.ID) []string {
conns := ps.host.Network().ConnsToPeer(p)
res := make([]string, 0, 1)
for _, c := range conns {
if !ps.hasPubsubStream(c) {
continue
}

remote := c.RemoteMultiaddr()
ip, err := manet.ToIP(remote)
if err != nil {
Expand Down Expand Up @@ -793,6 +798,21 @@ func (ps *peerScore) getIPs(p peer.ID) []string {
return res
}

func (ps *peerScore) hasPubsubStream(c network.Conn) bool {
for _, s := range c.GetStreams() {
switch s.Protocol() {
case FloodSubID:
fallthrough
case GossipSubID_v10:
fallthrough
case GossipSubID_v11:
return true
}
}

return false
}

// setIPs adds tracking for the new IPs in the list, and removes tracking from
// the obsolete IPs.
func (ps *peerScore) setIPs(p peer.ID, newips, oldips []string) {
Expand Down
67 changes: 67 additions & 0 deletions score_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import (
"testing"
"time"

"github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/network"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/libp2p/go-libp2p-core/protocol"

ma "github.com/multiformats/go-multiaddr"
)

func TestScoreTimeInMesh(t *testing.T) {
Expand Down Expand Up @@ -777,3 +782,65 @@ func setIPsForPeer(t *testing.T, ps *peerScore, p peer.ID, ips ...string) {
}
pstats.ips = ips
}

func TestScoreHasPubsubStream(t *testing.T) {
params := &PeerScoreParams{
AppSpecificScore: func(peer.ID) float64 { return 0 },
AppSpecificWeight: 0,
}

ps := newPeerScore(params)

c1 := &phonyConn{FloodSubID}
c2 := &phonyConn{GossipSubID_v10}
c3 := &phonyConn{GossipSubID_v11}
c4 := &phonyConn{"/bogus/1.0.0"}

if !ps.hasPubsubStream(c1) {
t.Fatal("expected pubsub stream")
}
if !ps.hasPubsubStream(c2) {
t.Fatal("expected pubsub stream")
}
if !ps.hasPubsubStream(c3) {
t.Fatal("expected pubsub stream")
}
if ps.hasPubsubStream(c4) {
t.Fatal("expected no pubsub stream")
}
}

type phonyConn struct {
proto protocol.ID
}

func (pc *phonyConn) Close() error { return nil }
func (pc *phonyConn) LocalPeer() peer.ID { return "" }
func (pc *phonyConn) LocalPrivateKey() crypto.PrivKey { return nil }
func (pc *phonyConn) RemotePeer() peer.ID { return "" }
func (pc *phonyConn) RemotePublicKey() crypto.PubKey { return nil }
func (pc *phonyConn) LocalMultiaddr() ma.Multiaddr { return nil }
func (pc *phonyConn) RemoteMultiaddr() ma.Multiaddr { return nil }
func (pc *phonyConn) NewStream() (network.Stream, error) { return nil, nil }
func (pc *phonyConn) Stat() network.Stat { return network.Stat{} }

func (pc *phonyConn) GetStreams() []network.Stream {
return []network.Stream{&phonyStream{pc.proto}}
}

type phonyStream struct {
proto protocol.ID
}

func (ps *phonyStream) Read([]byte) (int, error) { return 0, nil }
func (ps *phonyStream) Write([]byte) (int, error) { return 0, nil }
func (ps *phonyStream) Close() error { return nil }
func (ps *phonyStream) Reset() error { return nil }
func (ps *phonyStream) SetDeadline(time.Time) error { return nil }
func (ps *phonyStream) SetReadDeadline(time.Time) error { return nil }
func (ps *phonyStream) SetWriteDeadline(time.Time) error { return nil }
func (ps *phonyStream) SetProtocol(protocol.ID) {}
func (ps *phonyStream) Stat() network.Stat { return network.Stat{} }
func (ps *phonyStream) Conn() network.Conn { return nil }

func (ps *phonyStream) Protocol() protocol.ID { return ps.proto }