chore: update kbucket

Stebalien · Stebalien · commit 7035c59cf9ae · 2020-04-05T21:26:05.000-07:00
diff --git a/dht_bootstrap.go b/dht_bootstrap.go
@@ -204,15 +204,15 @@ func (dht *IpfsDHT) refreshCpls(ctx context.Context) error {
 	trackedCpls := dht.routingTable.GetTrackedCplsForRefresh()
 
 	var merr error
-	for _, tcpl := range trackedCpls {
-		if time.Since(tcpl.LastRefreshAt) <= dht.rtRefreshInterval {
+	for cpl, lastRefreshedAt := range trackedCpls {
+		if time.Since(lastRefreshedAt) <= dht.rtRefreshInterval {
 			continue
 		}
 
 		// gen rand peer with the cpl
-		randPeer, err := dht.routingTable.GenRandPeerID(tcpl.Cpl)
+		randPeer, err := dht.routingTable.GenRandPeerID(uint(cpl))
 		if err != nil {
-			logger.Errorf("failed to generate peerID for cpl %d, err: %s", tcpl.Cpl, err)
+			logger.Errorw("failed to generate peer ID", "cpl", cpl, "error", err)
 			continue
 		}
 
@@ -222,10 +222,10 @@ func (dht *IpfsDHT) refreshCpls(ctx context.Context) error {
 			return err
 		}
 
-		if err := doQuery(tcpl.Cpl, randPeer.String(), walkFnc); err != nil {
+		if err := doQuery(uint(cpl), randPeer.String(), walkFnc); err != nil {
 			merr = multierror.Append(
 				merr,
-				fmt.Errorf("failed to do a random walk for cpl %d: %s", tcpl.Cpl, err),
+				fmt.Errorf("failed to do a random walk for cpl %d: %w", cpl, err),
 			)
 		}
 	}
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/libp2p/go-eventbus v0.1.0
 	github.com/libp2p/go-libp2p v0.7.4
 	github.com/libp2p/go-libp2p-core v0.5.1
-	github.com/libp2p/go-libp2p-kbucket v0.3.2
+	github.com/libp2p/go-libp2p-kbucket v0.3.3
 	github.com/libp2p/go-libp2p-peerstore v0.2.2
 	github.com/libp2p/go-libp2p-record v0.1.2
 	github.com/libp2p/go-libp2p-swarm v0.2.3
diff --git a/go.sum b/go.sum
@@ -224,8 +224,8 @@ github.com/libp2p/go-libp2p-discovery v0.2.0 h1:1p3YSOq7VsgaL+xVHPi8XAmtGyas6D2J
 github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod h1:s4VGaxYMbw4+4+tsoQTqh7wfxg97AEdo4GYBt6BadWg=
 github.com/libp2p/go-libp2p-discovery v0.3.0 h1:+JnYBRLzZQtRq0mK3xhyjBwHytLmJXMTZkQfbw+UrGA=
 github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod h1:o03drFnz9BVAZdzC/QUQ+NeQOu38Fu7LJGEOK2gQltw=
-github.com/libp2p/go-libp2p-kbucket v0.3.2 h1:OUMsOOSFDR+LeG9Suh8VfmhEpKeaaESNYueJUZPxVTE=
-github.com/libp2p/go-libp2p-kbucket v0.3.2/go.mod h1:dDq/QC8Rm5hceMYzuGF2+OpLj09VHy+UBvRVjavIlKQ=
+github.com/libp2p/go-libp2p-kbucket v0.3.3 h1:V2Zwv6QnCK6Who0iiJW2eUKwdlTYGJ2HnLViaolDOcs=
+github.com/libp2p/go-libp2p-kbucket v0.3.3/go.mod h1:IWFdYRBOYzaLEHnvrfzEkr+UcuveCXIoeO8QeFZSI6A=
 github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
 github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
 github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo=

Original file line number	Diff line number	Diff line change
`@@ -204,15 +204,15 @@ func (dht *IpfsDHT) refreshCpls(ctx context.Context) error {`
`204`	`204`	`trackedCpls := dht.routingTable.GetTrackedCplsForRefresh()`
`205`	`205`
`206`	`206`	`var merr error`
`207`		`- for _, tcpl := range trackedCpls {`
`208`		`- if time.Since(tcpl.LastRefreshAt) <= dht.rtRefreshInterval {`
	`207`	`+ for cpl, lastRefreshedAt := range trackedCpls {`
	`208`	`+ if time.Since(lastRefreshedAt) <= dht.rtRefreshInterval {`
`209`	`209`	`continue`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`// gen rand peer with the cpl`
`213`		`- randPeer, err := dht.routingTable.GenRandPeerID(tcpl.Cpl)`
	`213`	`+ randPeer, err := dht.routingTable.GenRandPeerID(uint(cpl))`
`214`	`214`	`if err != nil {`
`215`		`- logger.Errorf("failed to generate peerID for cpl %d, err: %s", tcpl.Cpl, err)`
	`215`	`+ logger.Errorw("failed to generate peer ID", "cpl", cpl, "error", err)`
`216`	`216`	`continue`
`217`	`217`	`}`
`218`	`218`
`@@ -222,10 +222,10 @@ func (dht *IpfsDHT) refreshCpls(ctx context.Context) error {`
`222`	`222`	`return err`
`223`	`223`	`}`
`224`	`224`
`225`		`- if err := doQuery(tcpl.Cpl, randPeer.String(), walkFnc); err != nil {`
	`225`	`+ if err := doQuery(uint(cpl), randPeer.String(), walkFnc); err != nil {`
`226`	`226`	`merr = multierror.Append(`
`227`	`227`	`merr,`
`228`		`- fmt.Errorf("failed to do a random walk for cpl %d: %s", tcpl.Cpl, err),`
	`228`	`+ fmt.Errorf("failed to do a random walk for cpl %d: %w", cpl, err),`
`229`	`229`	`)`
`230`	`230`	`}`
`231`	`231`	`}`