Another new TODO item: better DHT lookups for multiple values per key.

diff --git a/TODO b/TODO
index 787520369ac76e9eb250affe7a4e712d7082f4d3..4677cdbb5dfa46b16ffb022f30368c36dd4693df 100644 (file)
--- a/TODO
+++ b/TODO
@@ -78,6 +78,15 @@ downloads to peers. Pieces should be downloaded from the best peers
 first (i.e. piece 0 from the absolute best peer).
 
 
 first (i.e. piece 0 from the absolute best peer).
 
 

+When Looking Up Values, DHT Should Return Nodes and Values
+
+When a key has multiple values in the DHT, returning a stored value may not
+be sufficient, as then no more nodes can be contacted to get more stored
+values. Instead, return both the stored values and the list of closest
+nodes so that the peer doing the lookup can decide when to stop looking
+(when it has received enough values).
+
+

 Missing Kademlia implementation details are needed.
 
 The current implementation is missing some important features, mostly 
 Missing Kademlia implementation details are needed.
 
 The current implementation is missing some important features, mostly 

diff --git a/test.py b/test.py
index 9329b3761f2ac74c9e2a3da84ca59a85912872c2..d2dece48e0d14087472d40a1fd189fe598301ce6 100755 (executable)
--- a/test.py
+++ b/test.py
@@ -59,15 +59,15 @@ tests = {'1': ('Start a single bootstrap and downloader, test updating and downl
                {1: {},
                 2: {}},
                [(1, ['update']),
                {1: {},
                 2: {}},
                [(1, ['update']),

+                (2, ['update']),

                 (1, ['install', 'aboot-base']),
                 (1, ['install', 'aboot-base']),

+                (2, ['install', 'aboot-base']),

                 (1, ['install', 'aap-doc']),
                 (1, ['install', 'ada-reference-manual']),
                 (1, ['install', 'fop-doc']),
                 (1, ['install', 'jswat-doc']),
                 (1, ['install', 'bison-doc']),
                 (1, ['install', 'crash-whitepaper']),
                 (1, ['install', 'aap-doc']),
                 (1, ['install', 'ada-reference-manual']),
                 (1, ['install', 'fop-doc']),
                 (1, ['install', 'jswat-doc']),
                 (1, ['install', 'bison-doc']),
                 (1, ['install', 'crash-whitepaper']),

-                (2, ['update']),
-                (2, ['install', 'aboot-base']),

                 (2, ['install', 'aap-doc']),
                 (2, ['install', 'ada-reference-manual']),
                 (2, ['install', 'fop-doc']),
                 (2, ['install', 'aap-doc']),
                 (2, ['install', 'ada-reference-manual']),
                 (2, ['install', 'fop-doc']),