if bucket doesnt have enough peers, grab more elsewhere

whyrusleeping · whyrusleeping · commit 06bc12491899 · 2015-11-19T11:15:57.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/routing/kbucket/sorting.go b/routing/kbucket/sorting.go
@@ -32,10 +32,6 @@ func copyPeersFromList(target ID, peerArr peerSorterArr, peerList *list.List) pe
 			distance: xor(target, pID),
 		}
 		peerArr = append(peerArr, &pd)
-		if e == nil {
-			log.Debug("list element was nil")
-			return peerArr
-		}
 	}
 	return peerArr
 }
diff --git a/routing/kbucket/table.go b/routing/kbucket/table.go
@@ -155,9 +155,10 @@ func (rt *RoutingTable) NearestPeers(id ID, count int) []peer.ID {
 	bucket = rt.Buckets[cpl]
 
 	var peerArr peerSorterArr
-	if bucket.Len() == 0 {
-		// In the case of an unusual split, one bucket may be empty.
-		// if this happens, search both surrounding buckets for nearest peer
+	peerArr = copyPeersFromList(id, peerArr, bucket.list)
+	if len(peerArr) < count {
+		// In the case of an unusual split, one bucket may be short or empty.
+		// if this happens, search both surrounding buckets for nearby peers
 		if cpl > 0 {
 			plist := rt.Buckets[cpl-1].list
 			peerArr = copyPeersFromList(id, peerArr, plist)
@@ -167,8 +168,6 @@ func (rt *RoutingTable) NearestPeers(id ID, count int) []peer.ID {
 			plist := rt.Buckets[cpl+1].list
 			peerArr = copyPeersFromList(id, peerArr, plist)
 		}
-	} else {
-		peerArr = copyPeersFromList(id, peerArr, bucket.list)
 	}
 
 	// Sort by distance to local peer

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,6 @@ func copyPeersFromList(target ID, peerArr peerSorterArr, peerList *list.List) pe`
`32`	`32`	`distance: xor(target, pID),`
`33`	`33`	`}`
`34`	`34`	`peerArr = append(peerArr, &pd)`
`35`		`- if e == nil {`
`36`		`- log.Debug("list element was nil")`
`37`		`- return peerArr`
`38`		`- }`
`39`	`35`	`}`
`40`	`36`	`return peerArr`
`41`	`37`	`}`