fix peer search using inexistent variable, fix test to cover it

lbrynet/blob_exchange/downloader.py

@@ -15,6 +15,7 @@ log = logging.getLogger(__name__)
 
 class BlobDownloader:
     BAN_FACTOR = 2.0  # fixme: when connection manager gets implemented, move it out from here
+    BAN_CAP = 30.0*60.0  # maximum time a node remains banned before being retried
 
     def __init__(self, loop: asyncio.BaseEventLoop, config: 'Config', blob_manager: 'BlobManager',
                  peer_queue: asyncio.Queue):
@@ -71,7 +72,7 @@ class BlobDownloader:
         now = self.loop.time()
         self.ignored = dict((
             (peer, when) for (peer, when) in self.ignored.items()
-            if (now - when) < min(30.0, (self.failures.get(peer, 0) ** self.BAN_FACTOR))
+            if (now - when) < min(self.BAN_CAP, (self.failures.get(peer, 0) ** self.BAN_FACTOR))
         ))
 
     @cache_concurrent

lbrynet/dht/node.py

@@ -201,7 +201,6 @@ class Node:
         try:
             async with peer_generator as junction:
                 yield junction
-            await peer_generator.finished.wait()
         finally:
             if add_hashes_task and not (add_hashes_task.done() or add_hashes_task.cancelled()):
                 add_hashes_task.cancel()

tests/unit/dht/test_blob_announcer.py

@@ -105,7 +105,7 @@ class TestBlobAnnouncer(AsyncioTestCase):
 
             _, task = last.accumulate_peers(search_q, peer_q)
             found_peers = await peer_q.get()
-            task.cancel()
+            await task
 
             self.assertEqual(1, len(found_peers))
             self.assertEqual(self.node.protocol.node_id, found_peers[0].node_id)