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.

Sign up for GitHub

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

Jump to bottom

fix: Unexport hasValidConnectedness to make a patch release #982

Merged
merged 1 commit into from
Aug 21, 2024
Merged

fix: Unexport hasValidConnectedness to make a patch release #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dht.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ func (dht *IpfsDHT) FindLocal(ctx context.Context, id peer.ID) peer.AddrInfo {
_, span := internal.StartSpan(ctx, "IpfsDHT.FindLocal", trace.WithAttributes(attribute.Stringer("PeerID", id)))
defer span.End()

if HasValidConnectedness(dht.host, id) {
if hasValidConnectedness(dht.host, id) {
return dht.peerstore.PeerInfo(id)
}
return peer.AddrInfo{}
Expand Down Expand Up @@ -926,7 +926,7 @@ func (dht *IpfsDHT) newContextWithLocalTags(ctx context.Context, extraTags ...ta

func (dht *IpfsDHT) maybeAddAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Duration) {
// Don't add addresses for self or our connected peers. We have better ones.
if p == dht.self || HasValidConnectedness(dht.host, p) {
if p == dht.self || hasValidConnectedness(dht.host, p) {
return
}
dht.peerstore.AddAddrs(p, dht.filterAddrs(addrs), ttl)
Expand Down
2 changes: 1 addition & 1 deletion dht_filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func inAddrRange(ip net.IP, ipnets []*net.IPNet) bool {
return false
}

func HasValidConnectedness(host host.Host, id peer.ID) bool {
func hasValidConnectedness(host host.Host, id peer.ID) bool {
connectedness := host.Network().Connectedness(id)
return connectedness == network.Connected || connectedness == network.Limited
}
11 changes: 8 additions & 3 deletions fullrt/dht.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@

// Return peer information if we tried to dial the peer during the query or we are (or recently were) connected
// to the peer.
if kaddht.HasValidConnectedness(dht.h, id) {
if hasValidConnectedness(dht.h, id) {

Check warning on line 1462 in fullrt/dht.go

View check run for this annotation

Codecov / codecov/patch

fullrt/dht.go#L1462 

Added line #L1462 was not covered by tests
return dht.h.Peerstore().PeerInfo(id), nil
}

Expand Down Expand Up @@ -1537,16 +1537,21 @@

// FindLocal looks for a peer with a given ID connected to this dht and returns the peer and the table it was found in.
func (dht *FullRT) FindLocal(id peer.ID) peer.AddrInfo {
if kaddht.HasValidConnectedness(dht.h, id) {
if hasValidConnectedness(dht.h, id) {

Check warning on line 1540 in fullrt/dht.go

View check run for this annotation

Codecov / codecov/patch

fullrt/dht.go#L1540 

Added line #L1540 was not covered by tests
return dht.h.Peerstore().PeerInfo(id)
}
return peer.AddrInfo{}
}

func (dht *FullRT) maybeAddAddrs(p peer.ID, addrs []multiaddr.Multiaddr, ttl time.Duration) {
// Don't add addresses for self or our connected peers. We have better ones.
if p == dht.h.ID() || kaddht.HasValidConnectedness(dht.h, p) {
if p == dht.h.ID() || hasValidConnectedness(dht.h, p) {

Check warning on line 1548 in fullrt/dht.go

View check run for this annotation

Codecov / codecov/patch

fullrt/dht.go#L1548 

Added line #L1548 was not covered by tests
return
}
dht.h.Peerstore().AddAddrs(p, addrs, ttl)
}

func hasValidConnectedness(host host.Host, id peer.ID) bool {
connectedness := host.Network().Connectedness(id)
return connectedness == network.Connected || connectedness == network.Limited

Check warning on line 1556 in fullrt/dht.go

View check run for this annotation

Codecov / codecov/patch

fullrt/dht.go#L1554-L1556 

Added lines #L1554 - L1556 were not covered by tests
}
4 changes: 2 additions & 2 deletions routing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (pi peer.AddrInfo,
return peers, err
},
func(*qpeerset.QueryPeerset) bool {
return HasValidConnectedness(dht.host, id)
return hasValidConnectedness(dht.host, id)
},
)

Expand All @@ -684,7 +684,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (pi peer.AddrInfo,

// Return peer information if we tried to dial the peer during the query or we are (or recently were) connected
// to the peer.
if dialedPeerDuringQuery || HasValidConnectedness(dht.host, id) {
if dialedPeerDuringQuery || hasValidConnectedness(dht.host, id) {
return dht.peerstore.PeerInfo(id), nil
}

Expand Down