From eee964cfa01dabea8b8a051177d406a41b15016f Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Sun, 4 Nov 2018 13:44:17 -0500
Subject: [PATCH] updated references to daemon after moving it to extras

---
 lbrynet/cli.py                                   |  8 ++++----
 lbrynet/extras/daemon/Components.py              |  4 ++--
 lbrynet/extras/daemon/Daemon.py                  | 16 ++++++++--------
 lbrynet/extras/daemon/DaemonConsole.py           |  4 ++--
 lbrynet/extras/daemon/DaemonControl.py           |  2 +-
 lbrynet/extras/daemon/Downloader.py              |  2 +-
 lbrynet/extras/daemon/auth/client.py             |  2 +-
 lbrynet/extras/daemon/auth/server.py             |  4 ++--
 tests/integration/cli/test_cli.py                |  4 ++--
 tests/integration/wallet/test_commands.py        | 14 +++++++-------
 tests/mocks.py                                   |  2 +-
 tests/unit/components/test_Component_Manager.py  | 12 ++++++------
 tests/unit/lbrynet_daemon/auth/test_server.py    |  4 ++--
 tests/unit/lbrynet_daemon/test_Daemon.py         | 14 +++++++-------
 tests/unit/lbrynet_daemon/test_Downloader.py     |  4 ++--
 .../lbrynet_daemon/test_ExchangeRateManager.py   |  2 +-
 .../lbrynet_daemon/test_claims_comparator.py     |  2 +-
 tests/unit/lbrynet_daemon/test_docs.py           |  2 +-
 18 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/lbrynet/cli.py b/lbrynet/cli.py
index 4a3ebc5ed..9f4cc8248 100644
--- a/lbrynet/cli.py
+++ b/lbrynet/cli.py
@@ -20,10 +20,10 @@ from docopt import docopt
 from textwrap import dedent
 
 from lbrynet import __name__ as lbrynet_name
-from lbrynet.daemon.Daemon import Daemon
-from lbrynet.daemon.DaemonControl import start as daemon_main
-from lbrynet.daemon.DaemonConsole import main as daemon_console
-from lbrynet.daemon.auth.client import LBRYAPIClient
+from lbrynet.extras.daemon.Daemon import Daemon
+from lbrynet.extras.daemon.DaemonControl import start as daemon_main
+from lbrynet.extras.daemon.DaemonConsole import main as daemon_console
+from lbrynet.extras.daemon.auth.client import LBRYAPIClient
 from lbrynet.core.system_info import get_platform
 
 
diff --git a/lbrynet/extras/daemon/Components.py b/lbrynet/extras/daemon/Components.py
index c93f78845..5d1b0b673 100644
--- a/lbrynet/extras/daemon/Components.py
+++ b/lbrynet/extras/daemon/Components.py
@@ -21,8 +21,8 @@ from lbrynet.extras.wallet import LbryWalletManager
 from lbrynet.extras.wallet import Network
 from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
 from lbrynet.core.server.ServerProtocol import ServerProtocolFactory
-from lbrynet.daemon.Component import Component
-from lbrynet.daemon.ExchangeRateManager import ExchangeRateManager
+from .Component import Component
+from .ExchangeRateManager import ExchangeRateManager
 from lbrynet.database.storage import SQLiteStorage
 from lbrynet.dht import node, hashannouncer
 from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
diff --git a/lbrynet/extras/daemon/Daemon.py b/lbrynet/extras/daemon/Daemon.py
index dfbb8cbb2..2a6c68c04 100644
--- a/lbrynet/extras/daemon/Daemon.py
+++ b/lbrynet/extras/daemon/Daemon.py
@@ -28,14 +28,14 @@ from lbrynet.schema.decode import smart_decode
 from lbrynet.core.system_info import get_lbrynet_version
 from lbrynet import conf
 from lbrynet.extras.reflector import reupload
-from lbrynet.daemon.Components import d2f, f2d
-from lbrynet.daemon.Components import WALLET_COMPONENT, DATABASE_COMPONENT, DHT_COMPONENT, BLOB_COMPONENT
-from lbrynet.daemon.Components import STREAM_IDENTIFIER_COMPONENT, FILE_MANAGER_COMPONENT, RATE_LIMITER_COMPONENT
-from lbrynet.daemon.Components import EXCHANGE_RATE_MANAGER_COMPONENT, PAYMENT_RATE_COMPONENT, UPNP_COMPONENT
-from lbrynet.daemon.ComponentManager import RequiredCondition
-from lbrynet.daemon.Downloader import GetStream
-from lbrynet.daemon.Publisher import Publisher
-from lbrynet.daemon.auth.server import AuthJSONRPCServer
+from .Components import d2f, f2d
+from .Components import WALLET_COMPONENT, DATABASE_COMPONENT, DHT_COMPONENT, BLOB_COMPONENT
+from .Components import STREAM_IDENTIFIER_COMPONENT, FILE_MANAGER_COMPONENT, RATE_LIMITER_COMPONENT
+from .Components import EXCHANGE_RATE_MANAGER_COMPONENT, PAYMENT_RATE_COMPONENT, UPNP_COMPONENT
+from .ComponentManager import RequiredCondition
+from .Downloader import GetStream
+from .Publisher import Publisher
+from .auth.server import AuthJSONRPCServer
 from lbrynet.core import utils, system_info
 from lbrynet.core.StreamDescriptor import download_sd_blob
 from lbrynet.core.Error import InsufficientFundsError, UnknownNameError
diff --git a/lbrynet/extras/daemon/DaemonConsole.py b/lbrynet/extras/daemon/DaemonConsole.py
index 58355c7fc..02f2a7b51 100644
--- a/lbrynet/extras/daemon/DaemonConsole.py
+++ b/lbrynet/extras/daemon/DaemonConsole.py
@@ -10,8 +10,8 @@ from lbrynet import analytics
 from lbrynet import conf
 from lbrynet.core import utils
 from lbrynet.core import log_support
-from lbrynet.daemon.auth.client import LBRYAPIClient
-from lbrynet.daemon.Daemon import Daemon
+from .auth.client import LBRYAPIClient
+from .Daemon import Daemon
 
 log = logging.getLogger(__name__)
 
diff --git a/lbrynet/extras/daemon/DaemonControl.py b/lbrynet/extras/daemon/DaemonControl.py
index 65402531b..302810937 100644
--- a/lbrynet/extras/daemon/DaemonControl.py
+++ b/lbrynet/extras/daemon/DaemonControl.py
@@ -16,7 +16,7 @@ from twisted.internet import reactor
 
 from lbrynet import conf
 from lbrynet.core import utils, system_info
-from lbrynet.daemon.Daemon import Daemon
+from .Daemon import Daemon
 
 log = logging.getLogger(__name__)
 
diff --git a/lbrynet/extras/daemon/Downloader.py b/lbrynet/extras/daemon/Downloader.py
index 58ab045eb..7c80976ca 100644
--- a/lbrynet/extras/daemon/Downloader.py
+++ b/lbrynet/extras/daemon/Downloader.py
@@ -3,7 +3,7 @@ import os
 from twisted.internet import defer
 from twisted.internet.task import LoopingCall
 
-from lbrynet.daemon.Components import f2d
+from .Components import f2d
 from lbrynet.schema.fee import Fee
 
 from lbrynet.core.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed, InvalidStreamDescriptorError
diff --git a/lbrynet/extras/daemon/auth/client.py b/lbrynet/extras/daemon/auth/client.py
index e6b3c63b6..cb9c657f9 100644
--- a/lbrynet/extras/daemon/auth/client.py
+++ b/lbrynet/extras/daemon/auth/client.py
@@ -4,7 +4,7 @@ import logging
 from urllib.parse import urlparse
 
 from lbrynet import conf
-from lbrynet.daemon.auth.keyring import Keyring, APIKey
+from .keyring import Keyring, APIKey
 
 log = logging.getLogger(__name__)
 USER_AGENT = "AuthServiceProxy/0.1"
diff --git a/lbrynet/extras/daemon/auth/server.py b/lbrynet/extras/daemon/auth/server.py
index e06e8a740..a3b4c0898 100644
--- a/lbrynet/extras/daemon/auth/server.py
+++ b/lbrynet/extras/daemon/auth/server.py
@@ -19,11 +19,11 @@ from lbrynet.core.Error import InvalidAuthenticationToken
 from lbrynet.core import utils
 from lbrynet.core.Error import ComponentsNotStarted, ComponentStartConditionNotMet
 from lbrynet.core.looping_call_manager import LoopingCallManager
-from lbrynet.daemon.ComponentManager import ComponentManager
+from lbrynet.extras.daemon.ComponentManager import ComponentManager
 from .keyring import APIKey, Keyring
 from .undecorated import undecorated
 from .factory import AuthJSONRPCResource
-from lbrynet.daemon.json_response_encoder import JSONResponseEncoder
+from lbrynet.extras.daemon.json_response_encoder import JSONResponseEncoder
 log = logging.getLogger(__name__)
 
 EMPTY_PARAMS = [{}]
diff --git a/tests/integration/cli/test_cli.py b/tests/integration/cli/test_cli.py
index 8b96537b6..30951d42b 100644
--- a/tests/integration/cli/test_cli.py
+++ b/tests/integration/cli/test_cli.py
@@ -5,11 +5,11 @@ from twisted.internet import defer
 
 from lbrynet import conf
 from lbrynet import cli
-from lbrynet.daemon.Components import DATABASE_COMPONENT, BLOB_COMPONENT, HEADERS_COMPONENT, WALLET_COMPONENT, \
+from lbrynet.extras.daemon.Components import DATABASE_COMPONENT, BLOB_COMPONENT, HEADERS_COMPONENT, WALLET_COMPONENT, \
     DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, STREAM_IDENTIFIER_COMPONENT, FILE_MANAGER_COMPONENT, \
     PEER_PROTOCOL_SERVER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT, \
     RATE_LIMITER_COMPONENT, PAYMENT_RATE_COMPONENT
-from lbrynet.daemon.Daemon import Daemon
+from lbrynet.extras.daemon.Daemon import Daemon
 
 
 class FakeAnalytics:
diff --git a/tests/integration/wallet/test_commands.py b/tests/integration/wallet/test_commands.py
index db7023f28..32f1ce388 100644
--- a/tests/integration/wallet/test_commands.py
+++ b/tests/integration/wallet/test_commands.py
@@ -15,15 +15,15 @@ lbrynet.schema.BLOCKCHAIN_NAME = 'lbrycrd_regtest'
 
 from lbrynet import conf as lbry_conf
 from lbrynet.dht.node import Node
-from lbrynet.daemon.Daemon import Daemon
+from lbrynet.extras.daemon.Daemon import Daemon
 from lbrynet.extras.wallet import LbryWalletManager
-from lbrynet.daemon.Components import WalletComponent, DHTComponent, HashAnnouncerComponent, \
+from lbrynet.extras.daemon.Components import WalletComponent, DHTComponent, HashAnnouncerComponent, \
     ExchangeRateManagerComponent
-from lbrynet.daemon.Components import REFLECTOR_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT
-from lbrynet.daemon.Components import UPnPComponent
-from lbrynet.daemon.Components import d2f
-from lbrynet.daemon.ComponentManager import ComponentManager
-from lbrynet.daemon.auth.server import jsonrpc_dumps_pretty
+from lbrynet.extras.daemon.Components import REFLECTOR_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT
+from lbrynet.extras.daemon.Components import UPnPComponent
+from lbrynet.extras.daemon.Components import d2f
+from lbrynet.extras.daemon.ComponentManager import ComponentManager
+from lbrynet.extras.daemon.auth.server import jsonrpc_dumps_pretty
 
 
 class FakeUPnP(UPnPComponent):
diff --git a/tests/mocks.py b/tests/mocks.py
index 0826410a7..83de006c3 100644
--- a/tests/mocks.py
+++ b/tests/mocks.py
@@ -13,7 +13,7 @@ from lbrynet.core.Error import RequestCanceledError
 from lbrynet.core import BlobAvailability
 from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
 from lbrynet.dht.node import Node as RealNode
-from lbrynet.daemon import ExchangeRateManager as ERM
+from lbrynet.extras.daemon import ExchangeRateManager as ERM
 from lbrynet import conf
 
 KB = 2**10
diff --git a/tests/unit/components/test_Component_Manager.py b/tests/unit/components/test_Component_Manager.py
index de6f2863f..15feeb78b 100644
--- a/tests/unit/components/test_Component_Manager.py
+++ b/tests/unit/components/test_Component_Manager.py
@@ -1,12 +1,12 @@
 from twisted.internet.task import Clock
 from twisted.trial import unittest
 
-from lbrynet.daemon.ComponentManager import ComponentManager
-from lbrynet.daemon.Components import DATABASE_COMPONENT, DHT_COMPONENT, STREAM_IDENTIFIER_COMPONENT
-from lbrynet.daemon.Components import HASH_ANNOUNCER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT
-from lbrynet.daemon.Components import PEER_PROTOCOL_SERVER_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT
-from lbrynet.daemon.Components import RATE_LIMITER_COMPONENT, HEADERS_COMPONENT, PAYMENT_RATE_COMPONENT
-from lbrynet.daemon import Components
+from lbrynet.extras.daemon.ComponentManager import ComponentManager
+from lbrynet.extras.daemon.Components import DATABASE_COMPONENT, DHT_COMPONENT, STREAM_IDENTIFIER_COMPONENT
+from lbrynet.extras.daemon.Components import HASH_ANNOUNCER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT
+from lbrynet.extras.daemon.Components import PEER_PROTOCOL_SERVER_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT
+from lbrynet.extras.daemon.Components import RATE_LIMITER_COMPONENT, HEADERS_COMPONENT, PAYMENT_RATE_COMPONENT
+from lbrynet.extras.daemon import Components
 from tests import mocks
 
 
diff --git a/tests/unit/lbrynet_daemon/auth/test_server.py b/tests/unit/lbrynet_daemon/auth/test_server.py
index d28bb8ad4..849a2634c 100644
--- a/tests/unit/lbrynet_daemon/auth/test_server.py
+++ b/tests/unit/lbrynet_daemon/auth/test_server.py
@@ -1,8 +1,8 @@
 import mock
-from twisted.internet import defer, reactor
+from twisted.internet import reactor
 from twisted.trial import unittest
 from lbrynet import conf
-from lbrynet.daemon.auth import server
+from lbrynet.extras.daemon.auth import server
 
 from tests.mocks import mock_conf_settings
 
diff --git a/tests/unit/lbrynet_daemon/test_Daemon.py b/tests/unit/lbrynet_daemon/test_Daemon.py
index efe22637b..9c2b1a3ef 100644
--- a/tests/unit/lbrynet_daemon/test_Daemon.py
+++ b/tests/unit/lbrynet_daemon/test_Daemon.py
@@ -11,13 +11,13 @@ from faker import Faker
 from lbrynet.schema.decode import smart_decode
 from lbrynet import conf
 from lbrynet.database.storage import SQLiteStorage
-from lbrynet.daemon.ComponentManager import ComponentManager
-from lbrynet.daemon.Components import DATABASE_COMPONENT, DHT_COMPONENT, WALLET_COMPONENT, STREAM_IDENTIFIER_COMPONENT
-from lbrynet.daemon.Components import f2d
-from lbrynet.daemon.Components import HASH_ANNOUNCER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT, BLOB_COMPONENT
-from lbrynet.daemon.Components import PEER_PROTOCOL_SERVER_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT
-from lbrynet.daemon.Components import RATE_LIMITER_COMPONENT, HEADERS_COMPONENT, FILE_MANAGER_COMPONENT
-from lbrynet.daemon.Daemon import Daemon as LBRYDaemon
+from lbrynet.extras.daemon.ComponentManager import ComponentManager
+from lbrynet.extras.daemon.Components import DATABASE_COMPONENT, DHT_COMPONENT, WALLET_COMPONENT, STREAM_IDENTIFIER_COMPONENT
+from lbrynet.extras.daemon.Components import f2d
+from lbrynet.extras.daemon.Components import HASH_ANNOUNCER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT, BLOB_COMPONENT
+from lbrynet.extras.daemon.Components import PEER_PROTOCOL_SERVER_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT
+from lbrynet.extras.daemon.Components import RATE_LIMITER_COMPONENT, HEADERS_COMPONENT, FILE_MANAGER_COMPONENT
+from lbrynet.extras.daemon.Daemon import Daemon as LBRYDaemon
 from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
 from lbrynet.extras.wallet import LbryWalletManager
 from torba.client.wallet import Wallet
diff --git a/tests/unit/lbrynet_daemon/test_Downloader.py b/tests/unit/lbrynet_daemon/test_Downloader.py
index 512f20e4c..fed267aaa 100644
--- a/tests/unit/lbrynet_daemon/test_Downloader.py
+++ b/tests/unit/lbrynet_daemon/test_Downloader.py
@@ -9,8 +9,8 @@ from lbrynet.core.Error import DownloadDataTimeout, DownloadSDTimeout
 from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier
 from lbrynet.core.BlobManager import DiskBlobManager
 from lbrynet.core.RateLimiter import DummyRateLimiter
-from lbrynet.daemon import Downloader
-from lbrynet.daemon.ExchangeRateManager import ExchangeRateManager
+from lbrynet.extras.daemon import Downloader
+from lbrynet.extras.daemon import ExchangeRateManager
 from lbrynet.database.storage import SQLiteStorage
 from lbrynet.dht.peerfinder import DummyPeerFinder
 from lbrynet.file_manager.EncryptedFileStatusReport import EncryptedFileStatusReport
diff --git a/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py b/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
index f507b201e..5f63a819b 100644
--- a/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
+++ b/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
@@ -1,5 +1,5 @@
 from lbrynet.schema.fee import Fee
-from lbrynet.daemon import ExchangeRateManager
+from lbrynet.extras.daemon import ExchangeRateManager
 from lbrynet.core.Error import InvalidExchangeRateResponse
 from twisted.trial import unittest
 from twisted.internet import defer
diff --git a/tests/unit/lbrynet_daemon/test_claims_comparator.py b/tests/unit/lbrynet_daemon/test_claims_comparator.py
index 4a4333aba..afd246900 100644
--- a/tests/unit/lbrynet_daemon/test_claims_comparator.py
+++ b/tests/unit/lbrynet_daemon/test_claims_comparator.py
@@ -1,6 +1,6 @@
 import unittest
 
-from lbrynet.daemon.Daemon import sort_claim_results
+from lbrynet.extras.daemon.Daemon import sort_claim_results
 
 
 class ClaimsComparatorTest(unittest.TestCase):
diff --git a/tests/unit/lbrynet_daemon/test_docs.py b/tests/unit/lbrynet_daemon/test_docs.py
index 139a720a3..4b7626204 100644
--- a/tests/unit/lbrynet_daemon/test_docs.py
+++ b/tests/unit/lbrynet_daemon/test_docs.py
@@ -1,6 +1,6 @@
 import docopt
 from twisted.trial import unittest
-from lbrynet.daemon.Daemon import Daemon
+from lbrynet.extras.daemon.Daemon import Daemon
 
 
 class DaemonDocsTests(unittest.TestCase):