feat: plumb peerstore contexts changes through

libp2p · Nov 10, 2021 · 902ef56 · 902ef56
1 parent 6983a7e
commit 902ef56
Show file tree

Hide file tree

Showing 5 changed files with 652 additions and 125 deletions.
diff --git a/backoffcache_test.go b/backoffcache_test.go
@@ -67,8 +67,10 @@ func TestBackoffDiscoverySingleBackoff(t *testing.T) {
 
 	discServer := newDiscoveryServer()
 
-	h1 := bhost.NewBlankHost(swarmt.GenSwarm(t, ctx))
-	h2 := bhost.NewBlankHost(swarmt.GenSwarm(t, ctx))
+	h1 := bhost.NewBlankHost(swarmt.GenSwarm(t))
+	defer h1.Close()
+	h2 := bhost.NewBlankHost(swarmt.GenSwarm(t))
+	defer h2.Close()
 	d1 := &mockDiscoveryClient{h1, discServer}
 	d2 := &mockDiscoveryClient{h2, discServer}
 
@@ -100,8 +102,10 @@ func TestBackoffDiscoveryMultipleBackoff(t *testing.T) {
 
 	discServer := newDiscoveryServer()
 
-	h1 := bhost.NewBlankHost(swarmt.GenSwarm(t, ctx))
-	h2 := bhost.NewBlankHost(swarmt.GenSwarm(t, ctx))
+	h1 := bhost.NewBlankHost(swarmt.GenSwarm(t))
+	defer h1.Close()
+	h2 := bhost.NewBlankHost(swarmt.GenSwarm(t))
+	defer h2.Close()
 	d1 := &mockDiscoveryClient{h1, discServer}
 	d2 := &mockDiscoveryClient{h2, discServer}
 
@@ -152,7 +156,8 @@ func TestBackoffDiscoverySimultaneousQuery(t *testing.T) {
 	advertisers := make([]discovery.Discovery, n)
 
 	for i := 0; i < n; i++ {
-		h := bhost.NewBlankHost(swarmt.GenSwarm(t, ctx))
+		h := bhost.NewBlankHost(swarmt.GenSwarm(t))
+		defer h.Close()
 		advertisers[i] = &mockDiscoveryClient{h, discServer}
 	}
 
@@ -210,11 +215,12 @@ func TestBackoffDiscoveryCacheCapacity(t *testing.T) {
 	advertisers := make([]discovery.Discovery, n)
 
 	for i := 0; i < n; i++ {
-		h := bhost.NewBlankHost(swarmt.GenSwarm(t, ctx))
+		h := bhost.NewBlankHost(swarmt.GenSwarm(t))
+		defer h.Close()
 		advertisers[i] = &mockDiscoveryClient{h, discServer}
 	}
 
-	h1 := bhost.NewBlankHost(swarmt.GenSwarm(t, ctx))
+	h1 := bhost.NewBlankHost(swarmt.GenSwarm(t))
 	d1 := &mockDiscoveryClient{h1, discServer}
 
 	const discoveryInterval = time.Millisecond * 100

diff --git a/backoffconnector_test.go b/backoffconnector_test.go
@@ -37,11 +37,19 @@ func (h *maxDialHost) Connect(ctx context.Context, ai peer.AddrInfo) error {
 	return h.Host.Connect(ctx, ai)
 }
 
-func getNetHosts(t *testing.T, ctx context.Context, n int) []host.Host {
+type hosts []host.Host
+
+func (h hosts) Close() {
+	for _, s := range h {
+		s.Close()
+	}
+}
+
+func getNetHosts(t *testing.T, ctx context.Context, n int) hosts {
 	var out []host.Host
 
 	for i := 0; i < n; i++ {
-		netw := swarmt.GenSwarm(t, ctx)
+		netw := swarmt.GenSwarm(t)
 		h := bhost.NewBlankHost(netw)
 		out = append(out, h)
 	}
@@ -63,6 +71,7 @@ func TestBackoffConnector(t *testing.T) {
 	defer cancel()
 
 	hosts := getNetHosts(t, ctx, 5)
+	defer hosts.Close()
 	primary := &maxDialHost{
 		Host:        hosts[0],
 		mux:         sync.Mutex{},

diff --git a/go.mod b/go.mod
@@ -2,14 +2,14 @@ module github.com/libp2p/go-libp2p-discovery
 
 require (
 	github.com/hashicorp/golang-lru v0.5.4
-	github.com/ipfs/go-cid v0.0.6
-	github.com/ipfs/go-log v1.0.4
+	github.com/ipfs/go-cid v0.0.7
+	github.com/ipfs/go-log v1.0.5
 	github.com/libp2p/go-libp2p-blankhost v0.2.0
-	github.com/libp2p/go-libp2p-core v0.6.0
-	github.com/libp2p/go-libp2p-peerstore v0.2.6
-	github.com/libp2p/go-libp2p-swarm v0.2.8
-	github.com/multiformats/go-multihash v0.0.13
-	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
+	github.com/libp2p/go-libp2p-core v0.11.0
+	github.com/libp2p/go-libp2p-peerstore v0.4.0
+	github.com/libp2p/go-libp2p-swarm v0.8.0
+	github.com/multiformats/go-multihash v0.0.15
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 )
 
 go 1.15