use query for getClosestPeers

routing/dht/routing.go

@@ -159,50 +159,46 @@ func (dht *IpfsDHT) getClosestPeers(ctx context.Context, key u.Key, count int) (
 	peerset := pset.NewLimited(count)
 
 	for _, p := range tablepeers {
-		out <- p
+		select {
+		case out <- p:
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		}
 		peerset.Add(p)
 	}
 
-	wg := sync.WaitGroup{}
-	for _, p := range tablepeers {
-		wg.Add(1)
-		go func(p peer.ID) {
-			dht.getClosestPeersRecurse(ctx, key, p, peerset, out)
-			wg.Done()
-		}(p)
-	}
-
-	go func() {
-		wg.Wait()
-		close(out)
-	}()
-
-	return out, nil
-}
-
-func (dht *IpfsDHT) getClosestPeersRecurse(ctx context.Context, key u.Key, p peer.ID, peers *pset.PeerSet, peerOut chan<- peer.ID) {
+	query := newQuery(key, dht.network, func(ctx context.Context, p peer.ID) (*dhtQueryResult, error) {
 		closer, err := dht.closerPeersSingle(ctx, key, p)
 		if err != nil {
 			log.Errorf("error getting closer peers: %s", err)
-		return
+			return nil, err
 		}
 
-	wg := sync.WaitGroup{}
+		var filtered []peer.PeerInfo
 		for _, p := range closer {
-		if kb.Closer(p, dht.self, key) && peers.TryAdd(p) {
+			if kb.Closer(p, dht.self, key) && peerset.TryAdd(p) {
 				select {
-			case peerOut <- p:
+				case out <- p:
 				case <-ctx.Done():
-				return
+					return nil, ctx.Err()
 				}
-			wg.Add(1)
-			go func(p peer.ID) {
-				dht.getClosestPeersRecurse(ctx, key, p, peers, peerOut)
-				wg.Done()
-			}(p)
+				filtered = append(filtered, dht.peerstore.PeerInfo(p))
 			}
 		}
-	wg.Wait()
+
+		return &dhtQueryResult{closerPeers: filtered}, nil
+	})
+
+	go func() {
+		defer close(out)
+		// run it!
+		_, err := query.Run(ctx, tablepeers)
+		if err != nil {
+			log.Errorf("closestPeers query run error: %s", err)
+		}
+	}()
+
+	return out, nil
 }
 
 func (dht *IpfsDHT) closerPeersSingle(ctx context.Context, key u.Key, p peer.ID) ([]peer.ID, error) {