move dht related classes to lbrynet.dht

lbrynet/core/BlobManager.py

@@ -5,7 +5,7 @@ from twisted.internet import threads, defer, reactor, task
 from lbrynet import conf
 from lbrynet.blob.blob_file import BlobFile
 from lbrynet.blob.creator import BlobFileCreator
-from lbrynet.core.server.DHTHashAnnouncer import DHTHashSupplier
+from lbrynet.dht.hashannouncer import DHTHashSupplier
 
 log = logging.getLogger(__name__)
 

lbrynet/core/Session.py

@@ -1,17 +1,15 @@
 import logging
 import miniupnpc
+from twisted.internet import threads, defer
 from lbrynet.core.BlobManager import DiskBlobManager
-from lbrynet.dht import node
+from lbrynet.dht import node, peerfinder, peermanager
 from lbrynet.database.storage import SQLiteStorage
-from lbrynet.core.PeerManager import PeerManager
 from lbrynet.core.RateLimiter import RateLimiter
-from lbrynet.core.client.DHTPeerFinder import DHTPeerFinder
 from lbrynet.core.HashAnnouncer import DummyHashAnnouncer
-from lbrynet.core.server.DHTHashAnnouncer import DHTHashAnnouncer
+from lbrynet.dht.hashannouncer import DHTHashAnnouncer
 from lbrynet.core.utils import generate_id
 from lbrynet.core.PaymentRateManager import BasePaymentRateManager, NegotiatedPaymentRateManager
 from lbrynet.core.BlobAvailability import BlobAvailabilityTracker
-from twisted.internet import threads, defer
 
 log = logging.getLogger(__name__)
 
@@ -152,7 +150,7 @@ class Session(object):
             self.wallet = PTCWallet(self.db_dir)
 
         if self.peer_manager is None:
-            self.peer_manager = PeerManager()
+            self.peer_manager = peermanager.PeerManager()
 
         if self.use_upnp is True:
             d = self._try_upnp()
@@ -296,7 +294,7 @@ class Session(object):
             externalIP=self.external_ip,
             peerPort=self.peer_port
         )
-        self.peer_finder = DHTPeerFinder(self.dht_node, self.peer_manager)
+        self.peer_finder = peerfinder.DHTPeerFinder(self.dht_node, self.peer_manager)
         if self.hash_announcer is None:
             self.hash_announcer = DHTHashAnnouncer(self.dht_node, self.peer_port)
 

lbrynet/dht/node.py

@@ -278,10 +278,10 @@ class Node(object):
                 value['token'] = result['token']
                 try:
                     res = yield n.store(blob_hash, value, self.node_id)
-                    log.debug("Response to store request: %s", str(res))
+                    log.info("Response to store request: %s", str(res))
                     announced = True
                 except protocol.TimeoutError:
-                    log.debug("Timeout while storing blob_hash %s at %s",
+                    log.info("Timeout while storing blob_hash %s at %s",
                                 blob_hash.encode('hex')[:16], n.id.encode('hex'))
                 except Exception as err:
                     log.error("Unexpected error while storing blob_hash %s at %s: %s",

lbrynet/dht/routingtable.py

@@ -20,7 +20,7 @@ log = logging.getLogger(__name__)
 class TreeRoutingTable(object):
     """ This class implements a routing table used by a Node class.
 
-    The Kademlia routing table is a binary tree whose leaves are k-buckets,
+    The Kademlia routing table is a binary tree whFose leaves are k-buckets,
     where each k-bucket contains nodes with some common prefix of their IDs.
     This prefix is the k-bucket's position in the binary tree; it therefore
     covers some range of ID values, and together all of the k-buckets cover

lbrynet/tests/functional/test_misc.py

@@ -23,7 +23,7 @@ from twisted.trial.unittest import TestCase
 from twisted.python.failure import Failure
 
 from lbrynet.dht.node import Node
-from lbrynet.core.PeerManager import PeerManager
+from lbrynet.dht.peermanager import PeerManager
 from lbrynet.core.RateLimiter import DummyRateLimiter, RateLimiter
 from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
 from lbrynet.core.server.ServerProtocol import ServerProtocolFactory

lbrynet/tests/functional/test_reflector.py

@@ -5,7 +5,7 @@ from lbrynet import conf
 from lbrynet.core.StreamDescriptor import get_sd_info
 from lbrynet import reflector
 from lbrynet.core import BlobManager
-from lbrynet.core import PeerManager
+from lbrynet.dht import peermanager
 from lbrynet.core import Session
 from lbrynet.core import StreamDescriptor
 from lbrynet.lbry_file.client import EncryptedFileOptions
@@ -26,7 +26,7 @@ class TestReflector(unittest.TestCase):
         self.port = None
         self.addCleanup(self.take_down_env)
         wallet = mocks.Wallet()
-        peer_manager = PeerManager.PeerManager()
+        peer_manager = peermanager.PeerManager()
         peer_finder = mocks.PeerFinder(5553, peer_manager, 2)
         hash_announcer = mocks.Announcer()
         sd_identifier = StreamDescriptor.StreamDescriptorIdentifier()

lbrynet/tests/functional/test_streamify.py

@@ -13,7 +13,7 @@ from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier
 from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file
 from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
 from lbrynet.core.StreamDescriptor import get_sd_info
-from lbrynet.core.PeerManager import PeerManager
+from lbrynet.dht.peermanager import PeerManager
 from lbrynet.core.RateLimiter import DummyRateLimiter
 
 from lbrynet.tests import mocks

lbrynet/tests/unit/core/client/test_ConnectionManager.py

@@ -3,7 +3,7 @@ from lbrynet.core.server.ServerProtocol import ServerProtocol
 from lbrynet.core.client.ClientProtocol import ClientProtocol
 from lbrynet.core.RateLimiter import RateLimiter
 from lbrynet.core.Peer import Peer
-from lbrynet.core.PeerManager import PeerManager
+from lbrynet.dht.peermanager import PeerManager
 from lbrynet.core.Error import NoResponseError
 
 from twisted.trial import unittest

lbrynet/tests/unit/core/server/test_DHTHashAnnouncer.py

@@ -2,7 +2,7 @@ from twisted.trial import unittest
 from twisted.internet import defer, reactor
 
 from lbrynet.tests.util import random_lbry_hash
-from lbrynet.core.server.DHTHashAnnouncer import DHTHashAnnouncer
+from lbrynet.dht.hashannouncer import DHTHashAnnouncer
 
 class MocDHTNode(object):
     def __init__(self, announce_will_fail=False):

lbrynet/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py

@@ -8,7 +8,7 @@ from lbrynet.database.storage import SQLiteStorage
 from lbrynet.core.StreamDescriptor import get_sd_info, BlobStreamDescriptorReader
 from lbrynet.core import BlobManager
 from lbrynet.core import Session
-from lbrynet.core.server import DHTHashAnnouncer
+from lbrynet.dht import hashannouncer
 from lbrynet.file_manager import EncryptedFileCreator
 from lbrynet.file_manager import EncryptedFileManager
 from lbrynet.tests import mocks
@@ -33,7 +33,7 @@ class CreateEncryptedFileTest(unittest.TestCase):
         self.session = mock.Mock(spec=Session.Session)(None, None)
         self.session.payment_rate_manager.min_blob_data_payment_rate = 0
 
-        hash_announcer = DHTHashAnnouncer.DHTHashAnnouncer(None, None)
+        hash_announcer = hashannouncer.DHTHashAnnouncer(None, None)
         self.blob_manager = BlobManager.DiskBlobManager(
             hash_announcer, self.tmp_blob_dir, SQLiteStorage(self.tmp_db_dir))
         self.session.blob_manager = self.blob_manager