From b3e343292d7de6d491e1be983bd8a46b539c9225 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Sun, 18 Jan 2015 01:00:25 -0800
Subject: [PATCH] dht: kick off all the queries wit every node in our rt

s/kademlia calls for makign sure to query all peers we
have in our routing table, not just those closest. this
helps ensure most queries resolve properly.
---
 routing/dht/routing.go | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/routing/dht/routing.go b/routing/dht/routing.go
index 35d8046509d6..63c9ca667034 100644
--- a/routing/dht/routing.go
+++ b/routing/dht/routing.go
@@ -88,9 +88,7 @@ func (dht *IpfsDHT) GetValue(ctx context.Context, key u.Key) ([]byte, error) {
 	// get closest peers in the routing table
 	rtp := dht.routingTable.ListPeers()
 	log.Debugf("peers in rt: %s", len(rtp), rtp)
-
-	closest := dht.routingTable.NearestPeers(kb.ConvertKey(key), PoolSize)
-	if closest == nil || len(closest) == 0 {
+	if len(rtp) == 0 {
 		log.Warning("No peers from routing table!")
 		return nil, errors.Wrap(kb.ErrLookupFailure)
 	}
@@ -111,7 +109,7 @@ func (dht *IpfsDHT) GetValue(ctx context.Context, key u.Key) ([]byte, error) {
 	})
 
 	// run it!
-	result, err := query.Run(ctx, closest)
+	result, err := query.Run(ctx, rtp)
 	if err != nil {
 		return nil, err
 	}
@@ -170,7 +168,7 @@ func (dht *IpfsDHT) FindProviders(ctx context.Context, key u.Key) ([]peer.PeerIn
 // to the given key
 func (dht *IpfsDHT) getClosestPeers(ctx context.Context, key u.Key) (<-chan peer.ID, error) {
 	e := log.EventBegin(ctx, "getClosestPeers", &key)
-	tablepeers := dht.routingTable.NearestPeers(kb.ConvertKey(key), AlphaValue)
+	tablepeers := dht.routingTable.ListPeers()
 	if len(tablepeers) == 0 {
 		return nil, errors.Wrap(kb.ErrLookupFailure)
 	}
@@ -313,7 +311,7 @@ func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, co
 		return &dhtQueryResult{closerPeers: clpeers}, nil
 	})
 
-	peers := dht.routingTable.NearestPeers(kb.ConvertKey(key), AlphaValue)
+	peers := dht.routingTable.ListPeers()
 	_, err := query.Run(ctx, peers)
 	if err != nil {
 		log.Errorf("Query error: %s", err)
@@ -329,13 +327,13 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, er
 		return pi, nil
 	}
 
-	closest := dht.routingTable.NearestPeers(kb.ConvertPeerID(id), AlphaValue)
-	if closest == nil || len(closest) == 0 {
+	peers := dht.routingTable.ListPeers()
+	if len(peers) == 0 {
 		return peer.PeerInfo{}, errors.Wrap(kb.ErrLookupFailure)
 	}
 
 	// Sanity...
-	for _, p := range closest {
+	for _, p := range peers {
 		if p == id {
 			log.Error("Found target peer in list of closest peers...")
 			return dht.peerstore.PeerInfo(p), nil
@@ -367,7 +365,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, er
 	})
 
 	// run it!
-	result, err := query.Run(ctx, closest)
+	result, err := query.Run(ctx, peers)
 	if err != nil {
 		return peer.PeerInfo{}, err
 	}
@@ -386,8 +384,8 @@ func (dht *IpfsDHT) FindPeersConnectedToPeer(ctx context.Context, id peer.ID) (<
 	peerchan := make(chan peer.PeerInfo, asyncQueryBuffer)
 	peersSeen := peer.Set{}
 
-	closest := dht.routingTable.NearestPeers(kb.ConvertPeerID(id), AlphaValue)
-	if closest == nil || len(closest) == 0 {
+	peers := dht.routingTable.ListPeers()
+	if len(peers) == 0 {
 		return nil, errors.Wrap(kb.ErrLookupFailure)
 	}
 
@@ -432,7 +430,7 @@ func (dht *IpfsDHT) FindPeersConnectedToPeer(ctx context.Context, id peer.ID) (<
 	// run it! run it asynchronously to gen peers as results are found.
 	// this does no error checking
 	go func() {
-		if _, err := query.Run(ctx, closest); err != nil {
+		if _, err := query.Run(ctx, peers); err != nil {
 			log.Error(err)
 		}