LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

updated references to daemon after moving it to extras

Browse source
This commit is contained in:
Lex Berezhny 2018-11-04 13:44:17 -05:00
parent a03c94bfad
commit eee964cfa0
18 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lbrynet/cli.py
View file

@ -20,10 +20,10 @@ from docopt import docopt
from textwrap import dedent from textwrap import dedent
from lbrynet import __name__ as lbrynet_name from lbrynet import __name__ as lbrynet_name
from lbrynet.daemon.Daemon import Daemon from lbrynet.extras.daemon.Daemon import Daemon
from lbrynet.daemon.DaemonControl import start as daemon_main from lbrynet.extras.daemon.DaemonControl import start as daemon_main
from lbrynet.daemon.DaemonConsole import main as daemon_console from lbrynet.extras.daemon.DaemonConsole import main as daemon_console
from lbrynet.daemon.auth.client import LBRYAPIClient from lbrynet.extras.daemon.auth.client import LBRYAPIClient
from lbrynet.core.system_info import get_platform from lbrynet.core.system_info import get_platform

4
lbrynet/extras/daemon/Components.py
View file

@ -21,8 +21,8 @@ from lbrynet.extras.wallet import LbryWalletManager
from lbrynet.extras.wallet import Network from lbrynet.extras.wallet import Network
from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
from lbrynet.core.server.ServerProtocol import ServerProtocolFactory from lbrynet.core.server.ServerProtocol import ServerProtocolFactory
from lbrynet.daemon.Component import Component from .Component import Component
from lbrynet.daemon.ExchangeRateManager import ExchangeRateManager from .ExchangeRateManager import ExchangeRateManager
from lbrynet.database.storage import SQLiteStorage from lbrynet.database.storage import SQLiteStorage
from lbrynet.dht import node, hashannouncer from lbrynet.dht import node, hashannouncer
from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager

16
lbrynet/extras/daemon/Daemon.py
View file

@ -28,14 +28,14 @@ from lbrynet.schema.decode import smart_decode
from lbrynet.core.system_info import get_lbrynet_version from lbrynet.core.system_info import get_lbrynet_version
from lbrynet import conf from lbrynet import conf
from lbrynet.extras.reflector import reupload from lbrynet.extras.reflector import reupload
from lbrynet.daemon.Components import d2f, f2d from .Components import d2f, f2d
from lbrynet.daemon.Components import WALLET_COMPONENT, DATABASE_COMPONENT, DHT_COMPONENT, BLOB_COMPONENT from .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 .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 .Components import EXCHANGE_RATE_MANAGER_COMPONENT, PAYMENT_RATE_COMPONENT, UPNP_COMPONENT
from lbrynet.daemon.ComponentManager import RequiredCondition from .ComponentManager import RequiredCondition
from lbrynet.daemon.Downloader import GetStream from .Downloader import GetStream
from lbrynet.daemon.Publisher import Publisher from .Publisher import Publisher
from lbrynet.daemon.auth.server import AuthJSONRPCServer from .auth.server import AuthJSONRPCServer
from lbrynet.core import utils, system_info from lbrynet.core import utils, system_info
from lbrynet.core.StreamDescriptor import download_sd_blob from lbrynet.core.StreamDescriptor import download_sd_blob
from lbrynet.core.Error import InsufficientFundsError, UnknownNameError from lbrynet.core.Error import InsufficientFundsError, UnknownNameError

4
lbrynet/extras/daemon/DaemonConsole.py
View file

@ -10,8 +10,8 @@ from lbrynet import analytics
from lbrynet import conf from lbrynet import conf
from lbrynet.core import utils from lbrynet.core import utils
from lbrynet.core import log_support from lbrynet.core import log_support
from lbrynet.daemon.auth.client import LBRYAPIClient from .auth.client import LBRYAPIClient
from lbrynet.daemon.Daemon import Daemon from .Daemon import Daemon
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

2
lbrynet/extras/daemon/DaemonControl.py
View file

@ -16,7 +16,7 @@ from twisted.internet import reactor
from lbrynet import conf from lbrynet import conf
from lbrynet.core import utils, system_info from lbrynet.core import utils, system_info
from lbrynet.daemon.Daemon import Daemon from .Daemon import Daemon
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

2
lbrynet/extras/daemon/Downloader.py
View file

@ -3,7 +3,7 @@ import os
from twisted.internet import defer from twisted.internet import defer
from twisted.internet.task import LoopingCall from twisted.internet.task import LoopingCall
from lbrynet.daemon.Components import f2d from .Components import f2d
from lbrynet.schema.fee import Fee from lbrynet.schema.fee import Fee
from lbrynet.core.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed, InvalidStreamDescriptorError from lbrynet.core.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed, InvalidStreamDescriptorError

2
lbrynet/extras/daemon/auth/client.py
View file

@ -4,7 +4,7 @@ import logging
from urllib.parse import urlparse from urllib.parse import urlparse
from lbrynet import conf from lbrynet import conf
from lbrynet.daemon.auth.keyring import Keyring, APIKey from .keyring import Keyring, APIKey
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
USER_AGENT = "AuthServiceProxy/0.1" USER_AGENT = "AuthServiceProxy/0.1"

4
lbrynet/extras/daemon/auth/server.py
View file

@ -19,11 +19,11 @@ from lbrynet.core.Error import InvalidAuthenticationToken
from lbrynet.core import utils from lbrynet.core import utils
from lbrynet.core.Error import ComponentsNotStarted, ComponentStartConditionNotMet from lbrynet.core.Error import ComponentsNotStarted, ComponentStartConditionNotMet
from lbrynet.core.looping_call_manager import LoopingCallManager 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 .keyring import APIKey, Keyring
from .undecorated import undecorated from .undecorated import undecorated
from .factory import AuthJSONRPCResource 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__) log = logging.getLogger(__name__)
EMPTY_PARAMS = [{}] EMPTY_PARAMS = [{}]

4
tests/integration/cli/test_cli.py
View file

@ -5,11 +5,11 @@ from twisted.internet import defer
from lbrynet import conf from lbrynet import conf
from lbrynet import cli 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, \ DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, STREAM_IDENTIFIER_COMPONENT, FILE_MANAGER_COMPONENT, \
PEER_PROTOCOL_SERVER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT, \ PEER_PROTOCOL_SERVER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT, \
RATE_LIMITER_COMPONENT, PAYMENT_RATE_COMPONENT RATE_LIMITER_COMPONENT, PAYMENT_RATE_COMPONENT
from lbrynet.daemon.Daemon import Daemon from lbrynet.extras.daemon.Daemon import Daemon
class FakeAnalytics: class FakeAnalytics:

14
tests/integration/wallet/test_commands.py
View file

@ -15,15 +15,15 @@ lbrynet.schema.BLOCKCHAIN_NAME = 'lbrycrd_regtest'
from lbrynet import conf as lbry_conf from lbrynet import conf as lbry_conf
from lbrynet.dht.node import Node 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.extras.wallet import LbryWalletManager
from lbrynet.daemon.Components import WalletComponent, DHTComponent, HashAnnouncerComponent, \ from lbrynet.extras.daemon.Components import WalletComponent, DHTComponent, HashAnnouncerComponent, \
ExchangeRateManagerComponent ExchangeRateManagerComponent
from lbrynet.daemon.Components import REFLECTOR_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT from lbrynet.extras.daemon.Components import REFLECTOR_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT
from lbrynet.daemon.Components import UPnPComponent from lbrynet.extras.daemon.Components import UPnPComponent
from lbrynet.daemon.Components import d2f from lbrynet.extras.daemon.Components import d2f
from lbrynet.daemon.ComponentManager import ComponentManager from lbrynet.extras.daemon.ComponentManager import ComponentManager
from lbrynet.daemon.auth.server import jsonrpc_dumps_pretty from lbrynet.extras.daemon.auth.server import jsonrpc_dumps_pretty
class FakeUPnP(UPnPComponent): class FakeUPnP(UPnPComponent):

2
tests/mocks.py
View file

@ -13,7 +13,7 @@ from lbrynet.core.Error import RequestCanceledError
from lbrynet.core import BlobAvailability from lbrynet.core import BlobAvailability
from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager
from lbrynet.dht.node import Node as RealNode 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 from lbrynet import conf
KB = 2**10 KB = 2**10

12
tests/unit/components/test_Component_Manager.py
View file

@ -1,12 +1,12 @@
from twisted.internet.task import Clock from twisted.internet.task import Clock
from twisted.trial import unittest from twisted.trial import unittest
from lbrynet.daemon.ComponentManager import ComponentManager from lbrynet.extras.daemon.ComponentManager import ComponentManager
from lbrynet.daemon.Components import DATABASE_COMPONENT, DHT_COMPONENT, STREAM_IDENTIFIER_COMPONENT from lbrynet.extras.daemon.Components import DATABASE_COMPONENT, DHT_COMPONENT, STREAM_IDENTIFIER_COMPONENT
from lbrynet.daemon.Components import HASH_ANNOUNCER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT from lbrynet.extras.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.extras.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.extras.daemon.Components import RATE_LIMITER_COMPONENT, HEADERS_COMPONENT, PAYMENT_RATE_COMPONENT
from lbrynet.daemon import Components from lbrynet.extras.daemon import Components
from tests import mocks from tests import mocks

4
tests/unit/lbrynet_daemon/auth/test_server.py
View file

@ -1,8 +1,8 @@
import mock import mock
from twisted.internet import defer, reactor from twisted.internet import reactor
from twisted.trial import unittest from twisted.trial import unittest
from lbrynet import conf from lbrynet import conf
from lbrynet.daemon.auth import server from lbrynet.extras.daemon.auth import server
from tests.mocks import mock_conf_settings from tests.mocks import mock_conf_settings

14
tests/unit/lbrynet_daemon/test_Daemon.py
View file

@ -11,13 +11,13 @@ from faker import Faker
from lbrynet.schema.decode import smart_decode from lbrynet.schema.decode import smart_decode
from lbrynet import conf from lbrynet import conf
from lbrynet.database.storage import SQLiteStorage from lbrynet.database.storage import SQLiteStorage
from lbrynet.daemon.ComponentManager import ComponentManager from lbrynet.extras.daemon.ComponentManager import ComponentManager
from lbrynet.daemon.Components import DATABASE_COMPONENT, DHT_COMPONENT, WALLET_COMPONENT, STREAM_IDENTIFIER_COMPONENT from lbrynet.extras.daemon.Components import DATABASE_COMPONENT, DHT_COMPONENT, WALLET_COMPONENT, STREAM_IDENTIFIER_COMPONENT
from lbrynet.daemon.Components import f2d from lbrynet.extras.daemon.Components import f2d
from lbrynet.daemon.Components import HASH_ANNOUNCER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT, BLOB_COMPONENT from lbrynet.extras.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.extras.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.extras.daemon.Components import RATE_LIMITER_COMPONENT, HEADERS_COMPONENT, FILE_MANAGER_COMPONENT
from lbrynet.daemon.Daemon import Daemon as LBRYDaemon from lbrynet.extras.daemon.Daemon import Daemon as LBRYDaemon
from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
from lbrynet.extras.wallet import LbryWalletManager from lbrynet.extras.wallet import LbryWalletManager
from torba.client.wallet import Wallet from torba.client.wallet import Wallet

4
tests/unit/lbrynet_daemon/test_Downloader.py
View file

@ -9,8 +9,8 @@ from lbrynet.core.Error import DownloadDataTimeout, DownloadSDTimeout
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier
from lbrynet.core.BlobManager import DiskBlobManager from lbrynet.core.BlobManager import DiskBlobManager
from lbrynet.core.RateLimiter import DummyRateLimiter from lbrynet.core.RateLimiter import DummyRateLimiter
from lbrynet.daemon import Downloader from lbrynet.extras.daemon import Downloader
from lbrynet.daemon.ExchangeRateManager import ExchangeRateManager from lbrynet.extras.daemon import ExchangeRateManager
from lbrynet.database.storage import SQLiteStorage from lbrynet.database.storage import SQLiteStorage
from lbrynet.dht.peerfinder import DummyPeerFinder from lbrynet.dht.peerfinder import DummyPeerFinder
from lbrynet.file_manager.EncryptedFileStatusReport import EncryptedFileStatusReport from lbrynet.file_manager.EncryptedFileStatusReport import EncryptedFileStatusReport

2
tests/unit/lbrynet_daemon/test_ExchangeRateManager.py
View file

@ -1,5 +1,5 @@
from lbrynet.schema.fee import Fee from lbrynet.schema.fee import Fee
from lbrynet.daemon import ExchangeRateManager from lbrynet.extras.daemon import ExchangeRateManager
from lbrynet.core.Error import InvalidExchangeRateResponse from lbrynet.core.Error import InvalidExchangeRateResponse
from twisted.trial import unittest from twisted.trial import unittest
from twisted.internet import defer from twisted.internet import defer

2
tests/unit/lbrynet_daemon/test_claims_comparator.py
View file

@ -1,6 +1,6 @@
import unittest import unittest
from lbrynet.daemon.Daemon import sort_claim_results from lbrynet.extras.daemon.Daemon import sort_claim_results
class ClaimsComparatorTest(unittest.TestCase): class ClaimsComparatorTest(unittest.TestCase):

2
tests/unit/lbrynet_daemon/test_docs.py
View file

@ -1,6 +1,6 @@
import docopt import docopt
from twisted.trial import unittest from twisted.trial import unittest
from lbrynet.daemon.Daemon import Daemon from lbrynet.extras.daemon.Daemon import Daemon
class DaemonDocsTests(unittest.TestCase): class DaemonDocsTests(unittest.TestCase):