From 488b9767345ce90847f0915d575666b982cae36b Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Wed, 7 Nov 2018 09:54:09 -0500 Subject: [PATCH] move HashAnnouncer.py to extras --- lbrynet/extras/daemon/Components.py | 5 +++-- .../{dht/hashannouncer.py => extras/daemon/HashAnnouncer.py} | 0 tests/unit/dht/test_hash_announcer.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename lbrynet/{dht/hashannouncer.py => extras/daemon/HashAnnouncer.py} (100%) diff --git a/lbrynet/extras/daemon/Components.py b/lbrynet/extras/daemon/Components.py index b1c936429..8642e34d9 100644 --- a/lbrynet/extras/daemon/Components.py +++ b/lbrynet/extras/daemon/Components.py @@ -24,7 +24,8 @@ from lbrynet.p2p.server.ServerProtocol import ServerProtocolFactory from .Component import Component from .ExchangeRateManager import ExchangeRateManager from lbrynet.extras.daemon.storage import SQLiteStorage -from lbrynet.dht import node, hashannouncer +from lbrynet.dht import node +from lbrynet.extras.daemon.HashAnnouncer import DHTHashAnnouncer from lbrynet.blob.EncryptedFileManager import EncryptedFileManager from lbrynet.blob.client.EncryptedFileDownloader import EncryptedFileSaverFactory from lbrynet.blob.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier @@ -466,7 +467,7 @@ class HashAnnouncerComponent(Component): def start(self): storage = self.component_manager.get_component(DATABASE_COMPONENT) dht_node = self.component_manager.get_component(DHT_COMPONENT) - self.hash_announcer = hashannouncer.DHTHashAnnouncer(dht_node, storage) + self.hash_announcer = DHTHashAnnouncer(dht_node, storage) yield self.hash_announcer.start() @defer.inlineCallbacks diff --git a/lbrynet/dht/hashannouncer.py b/lbrynet/extras/daemon/HashAnnouncer.py similarity index 100% rename from lbrynet/dht/hashannouncer.py rename to lbrynet/extras/daemon/HashAnnouncer.py diff --git a/tests/unit/dht/test_hash_announcer.py b/tests/unit/dht/test_hash_announcer.py index 7919a01e1..5aeb54943 100644 --- a/tests/unit/dht/test_hash_announcer.py +++ b/tests/unit/dht/test_hash_announcer.py @@ -1,7 +1,7 @@ from twisted.trial import unittest from twisted.internet import defer, task from lbrynet.p2p import utils -from lbrynet.dht.hashannouncer import DHTHashAnnouncer +from lbrynet.extras.daemon.HashAnnouncer import DHTHashAnnouncer from tests.util import random_lbry_hash from tests.mocks import mock_conf_settings