diff --git a/lbrynet/blob/EncryptedFileDownloader.py b/lbrynet/blob/EncryptedFileDownloader.py index 0a037ff7e..1179b1763 100644 --- a/lbrynet/blob/EncryptedFileDownloader.py +++ b/lbrynet/blob/EncryptedFileDownloader.py @@ -9,9 +9,9 @@ from lbrynet import conf from lbrynet.p2p.client.StreamProgressManager import FullStreamProgressManager from lbrynet.p2p.HTTPBlobDownloader import HTTPBlobDownloader from lbrynet.p2p.utils import short_hash -from lbrynet.file_manager.client.EncryptedFileDownloader import EncryptedFileSaver -from lbrynet.file_manager.client.EncryptedFileDownloader import EncryptedFileDownloader -from lbrynet.file_manager.EncryptedFileStatusReport import EncryptedFileStatusReport +from lbrynet.blob.client.EncryptedFileDownloader import EncryptedFileSaver +from lbrynet.blob.client.EncryptedFileDownloader import EncryptedFileDownloader +from lbrynet.blob.EncryptedFileStatusReport import EncryptedFileStatusReport from lbrynet.p2p.StreamDescriptor import save_sd_info log = logging.getLogger(__name__) diff --git a/lbrynet/blob/EncryptedFileManager.py b/lbrynet/blob/EncryptedFileManager.py index 85f593baa..a1bd6509a 100644 --- a/lbrynet/blob/EncryptedFileManager.py +++ b/lbrynet/blob/EncryptedFileManager.py @@ -8,8 +8,8 @@ from binascii import hexlify, unhexlify from twisted.internet import defer, task, reactor from twisted.python.failure import Failure from lbrynet.extras.reflector.reupload import reflect_file -from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader -from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory +from lbrynet.blob.EncryptedFileDownloader import ManagedEncryptedFileDownloader +from lbrynet.blob.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory from lbrynet.p2p.StreamDescriptor import EncryptedFileStreamType, get_sd_info from lbrynet.blob.client.CryptStreamDownloader import AlreadyStoppedError from lbrynet.blob.client.CryptStreamDownloader import CurrentlyStoppingError diff --git a/lbrynet/blob/client/EncryptedFileDownloader.py b/lbrynet/blob/client/EncryptedFileDownloader.py index 423738074..735ea3bf4 100644 --- a/lbrynet/blob/client/EncryptedFileDownloader.py +++ b/lbrynet/blob/client/EncryptedFileDownloader.py @@ -7,7 +7,7 @@ from lbrynet.p2p.StreamDescriptor import save_sd_info from lbrynet.blob.client.CryptStreamDownloader import CryptStreamDownloader from lbrynet.p2p.client.StreamProgressManager import FullStreamProgressManager from lbrynet.p2p.Error import FileOpenError -from lbrynet.file_manager.client.EncryptedFileMetadataHandler import EncryptedFileMetadataHandler +from lbrynet.blob.client.EncryptedFileMetadataHandler import EncryptedFileMetadataHandler from twisted.internet import defer, threads diff --git a/lbrynet/extras/daemon/Components.py b/lbrynet/extras/daemon/Components.py index 464996def..979a57f2a 100644 --- a/lbrynet/extras/daemon/Components.py +++ b/lbrynet/extras/daemon/Components.py @@ -25,9 +25,9 @@ from .Component import Component from .ExchangeRateManager import ExchangeRateManager from lbrynet.extras.daemon.storage import SQLiteStorage from lbrynet.dht import node, hashannouncer -from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager -from lbrynet.file_manager.client.EncryptedFileDownloader import EncryptedFileSaverFactory -from lbrynet.file_manager.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier +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 from lbrynet.extras.reflector import ServerFactory as reflector_server_factory from lbrynet.p2p.utils import generate_id diff --git a/lbrynet/extras/daemon/Downloader.py b/lbrynet/extras/daemon/Downloader.py index b18eb1a8f..e98dadda7 100644 --- a/lbrynet/extras/daemon/Downloader.py +++ b/lbrynet/extras/daemon/Downloader.py @@ -10,7 +10,7 @@ from lbrynet.p2p.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed, Inv from lbrynet.p2p.Error import DownloadDataTimeout, DownloadCanceledError, DownloadSDTimeout from lbrynet.p2p.utils import safe_start_looping_call, safe_stop_looping_call from lbrynet.p2p.StreamDescriptor import download_sd_blob -from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory +from lbrynet.blob.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory from lbrynet import conf from torba.client.constants import COIN from lbrynet.extras.wallet.dewies import dewies_to_lbc diff --git a/lbrynet/extras/daemon/Publisher.py b/lbrynet/extras/daemon/Publisher.py index 39ce1c908..34d123a0c 100644 --- a/lbrynet/extras/daemon/Publisher.py +++ b/lbrynet/extras/daemon/Publisher.py @@ -3,7 +3,7 @@ import logging import mimetypes import os -from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file +from lbrynet.blob.EncryptedFileCreator import create_lbry_file log = logging.getLogger(__name__) diff --git a/tests/functional/test_misc.py b/tests/functional/test_misc.py index 220f40bc4..a697de022 100644 --- a/tests/functional/test_misc.py +++ b/tests/functional/test_misc.py @@ -13,9 +13,9 @@ from lbrynet.p2p.RateLimiter import RateLimiter from lbrynet.p2p.server.BlobRequestHandler import BlobRequestHandlerFactory from lbrynet.p2p.server.ServerProtocol import ServerProtocolFactory from lbrynet.extras.daemon.storage import SQLiteStorage -from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file -from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager -from lbrynet.file_manager.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier +from lbrynet.blob.EncryptedFileCreator import create_lbry_file +from lbrynet.blob.EncryptedFileManager import EncryptedFileManager +from lbrynet.blob.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier from tests import mocks from tests.util import mk_db_and_blob_dir, rm_db_and_blob_dir diff --git a/tests/functional/test_reflector.py b/tests/functional/test_reflector.py index e2cbd1021..c6b4128ac 100644 --- a/tests/functional/test_reflector.py +++ b/tests/functional/test_reflector.py @@ -7,8 +7,8 @@ from lbrynet.p2p.StreamDescriptor import get_sd_info from lbrynet.extras import reflector from lbrynet.p2p import BlobManager, PeerManager from lbrynet.p2p import StreamDescriptor -from lbrynet.file_manager import EncryptedFileCreator -from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager +from lbrynet.blob import EncryptedFileCreator +from lbrynet.blob.EncryptedFileManager import EncryptedFileManager from lbrynet.p2p.RateLimiter import DummyRateLimiter from lbrynet.extras.daemon.storage import SQLiteStorage from lbrynet.p2p.PaymentRateManager import OnlyFreePaymentsManager diff --git a/tests/functional/test_streamify.py b/tests/functional/test_streamify.py index 24dbd4bcb..a044624b7 100644 --- a/tests/functional/test_streamify.py +++ b/tests/functional/test_streamify.py @@ -11,8 +11,8 @@ from lbrynet.p2p.PeerManager import PeerManager from lbrynet.p2p.RateLimiter import DummyRateLimiter from lbrynet.extras.daemon.storage import SQLiteStorage from lbrynet.p2p.PaymentRateManager import OnlyFreePaymentsManager -from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file -from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager +from lbrynet.blob.EncryptedFileCreator import create_lbry_file +from lbrynet.blob.EncryptedFileManager import EncryptedFileManager from tests import mocks diff --git a/tests/mocks.py b/tests/mocks.py index cd78440ce..0073eb3f3 100644 --- a/tests/mocks.py +++ b/tests/mocks.py @@ -11,7 +11,7 @@ from twisted.python.failure import Failure from lbrynet.p2p.client.ClientRequest import ClientRequest from lbrynet.p2p.Error import RequestCanceledError from lbrynet.p2p import BlobAvailability -from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager +from lbrynet.blob.EncryptedFileManager import EncryptedFileManager from lbrynet.dht.node import Node as RealNode from lbrynet.extras.daemon import ExchangeRateManager as ERM from lbrynet import conf diff --git a/tests/unit/database/test_SQLiteStorage.py b/tests/unit/database/test_SQLiteStorage.py index ab13e2307..d2d90e621 100644 --- a/tests/unit/database/test_SQLiteStorage.py +++ b/tests/unit/database/test_SQLiteStorage.py @@ -7,7 +7,7 @@ from twisted.internet import defer from twisted.trial import unittest from lbrynet import conf from lbrynet.extras.daemon.storage import SQLiteStorage, open_file_for_writing -from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader +from lbrynet.blob.EncryptedFileDownloader import ManagedEncryptedFileDownloader from tests.util import random_lbry_hash log = logging.getLogger() diff --git a/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py b/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py index 3eed979c1..8266f29bf 100644 --- a/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py +++ b/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py @@ -10,8 +10,8 @@ from lbrynet.p2p.PeerManager import PeerManager from lbrynet.p2p.RateLimiter import DummyRateLimiter from lbrynet.p2p.PaymentRateManager import OnlyFreePaymentsManager from lbrynet.extras.daemon.storage import SQLiteStorage -from lbrynet.file_manager import EncryptedFileCreator -from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager +from lbrynet.blob import EncryptedFileCreator +from lbrynet.blob.EncryptedFileManager import EncryptedFileManager from lbrynet.p2p.StreamDescriptor import JSONBytesEncoder from tests import mocks from tests.util import mk_db_and_blob_dir, rm_db_and_blob_dir diff --git a/tests/unit/lbrynet_daemon/test_Daemon.py b/tests/unit/lbrynet_daemon/test_Daemon.py index 5afc80ea4..f4d19e5c0 100644 --- a/tests/unit/lbrynet_daemon/test_Daemon.py +++ b/tests/unit/lbrynet_daemon/test_Daemon.py @@ -18,7 +18,7 @@ from lbrynet.extras.daemon.Components import HASH_ANNOUNCER_COMPONENT, REFLECTOR 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.blob.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 1833c9af5..f930d2d5e 100644 --- a/tests/unit/lbrynet_daemon/test_Downloader.py +++ b/tests/unit/lbrynet_daemon/test_Downloader.py @@ -13,8 +13,8 @@ from lbrynet.extras.daemon import Downloader from lbrynet.extras.daemon import ExchangeRateManager from lbrynet.extras.daemon.storage import SQLiteStorage from lbrynet.dht.peerfinder import DummyPeerFinder -from lbrynet.file_manager.EncryptedFileStatusReport import EncryptedFileStatusReport -from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader +from lbrynet.blob.EncryptedFileStatusReport import EncryptedFileStatusReport +from lbrynet.blob.EncryptedFileDownloader import ManagedEncryptedFileDownloader from lbrynet.extras.wallet import LbryWalletManager from tests.mocks import mock_conf_settings