moved lbrynet -> lbry

lbry/lbry/blob/__init__.py

@@ -1,4 +1,4 @@
-from lbrynet.cryptoutils import get_lbry_hash_obj
+from lbry.cryptoutils import get_lbry_hash_obj
 
 MAX_BLOB_SIZE = 2 * 2 ** 20
 

lbry/lbry/blob/blob_file.py

@@ -10,12 +10,12 @@ from cryptography.hazmat.primitives.ciphers import Cipher, modes
 from cryptography.hazmat.primitives.ciphers.algorithms import AES
 from cryptography.hazmat.primitives.padding import PKCS7
 
-from lbrynet.cryptoutils import backend, get_lbry_hash_obj
-from lbrynet.error import DownloadCancelledError, InvalidBlobHashError, InvalidDataError
+from lbry.cryptoutils import backend, get_lbry_hash_obj
+from lbry.error import DownloadCancelledError, InvalidBlobHashError, InvalidDataError
 
-from lbrynet.blob import MAX_BLOB_SIZE, blobhash_length
-from lbrynet.blob.blob_info import BlobInfo
-from lbrynet.blob.writer import HashBlobWriter
+from lbry.blob import MAX_BLOB_SIZE, blobhash_length
+from lbry.blob.blob_info import BlobInfo
+from lbry.blob.writer import HashBlobWriter
 
 log = logging.getLogger(__name__)
 

lbry/lbry/blob/blob_manager.py

@@ -2,15 +2,15 @@ import os
 import typing
 import asyncio
 import logging
-from lbrynet.utils import LRUCache
-from lbrynet.blob.blob_file import is_valid_blobhash, BlobFile, BlobBuffer, AbstractBlob
-from lbrynet.stream.descriptor import StreamDescriptor
-from lbrynet.connection_manager import ConnectionManager
+from lbry.utils import LRUCache
+from lbry.blob.blob_file import is_valid_blobhash, BlobFile, BlobBuffer, AbstractBlob
+from lbry.stream.descriptor import StreamDescriptor
+from lbry.connection_manager import ConnectionManager
 
 if typing.TYPE_CHECKING:
-    from lbrynet.conf import Config
-    from lbrynet.dht.protocol.data_store import DictDataStore
-    from lbrynet.extras.daemon.storage import SQLiteStorage
+    from lbry.conf import Config
+    from lbry.dht.protocol.data_store import DictDataStore
+    from lbry.extras.daemon.storage import SQLiteStorage
 
 log = logging.getLogger(__name__)
 

lbry/lbry/blob/writer.py

@@ -2,8 +2,8 @@ import typing
 import logging
 import asyncio
 from io import BytesIO
-from lbrynet.error import InvalidBlobHashError, InvalidDataError
-from lbrynet.cryptoutils import get_lbry_hash_obj
+from lbry.error import InvalidBlobHashError, InvalidDataError
+from lbry.cryptoutils import get_lbry_hash_obj
 
 log = logging.getLogger(__name__)
 

lbry/lbry/blob_exchange/client.py

@@ -2,13 +2,13 @@ import asyncio
 import logging
 import typing
 import binascii
-from lbrynet.error import InvalidBlobHashError, InvalidDataError
-from lbrynet.blob_exchange.serialization import BlobResponse, BlobRequest
-from lbrynet.utils import cache_concurrent
+from lbry.error import InvalidBlobHashError, InvalidDataError
+from lbry.blob_exchange.serialization import BlobResponse, BlobRequest
+from lbry.utils import cache_concurrent
 if typing.TYPE_CHECKING:
-    from lbrynet.blob.blob_file import AbstractBlob
-    from lbrynet.blob.writer import HashBlobWriter
-    from lbrynet.connection_manager import ConnectionManager
+    from lbry.blob.blob_file import AbstractBlob
+    from lbry.blob.writer import HashBlobWriter
+    from lbry.connection_manager import ConnectionManager
 
 log = logging.getLogger(__name__)
 

lbry/lbry/blob_exchange/downloader.py

@@ -1,14 +1,14 @@
 import asyncio
 import typing
 import logging
-from lbrynet.utils import cache_concurrent
-from lbrynet.blob_exchange.client import request_blob
+from lbry.utils import cache_concurrent
+from lbry.blob_exchange.client import request_blob
 if typing.TYPE_CHECKING:
-    from lbrynet.conf import Config
-    from lbrynet.dht.node import Node
-    from lbrynet.dht.peer import KademliaPeer
-    from lbrynet.blob.blob_manager import BlobManager
-    from lbrynet.blob.blob_file import AbstractBlob
+    from lbry.conf import Config
+    from lbry.dht.node import Node
+    from lbry.dht.peer import KademliaPeer
+    from lbry.blob.blob_manager import BlobManager
+    from lbry.blob.blob_file import AbstractBlob
 
 log = logging.getLogger(__name__)
 

lbry/lbry/blob_exchange/server.py

@@ -3,12 +3,12 @@ import binascii
 import logging
 import typing
 from json.decoder import JSONDecodeError
-from lbrynet.blob_exchange.serialization import BlobResponse, BlobRequest, blob_response_types
-from lbrynet.blob_exchange.serialization import BlobAvailabilityResponse, BlobPriceResponse, BlobDownloadResponse, \
+from lbry.blob_exchange.serialization import BlobResponse, BlobRequest, blob_response_types
+from lbry.blob_exchange.serialization import BlobAvailabilityResponse, BlobPriceResponse, BlobDownloadResponse, \
     BlobPaymentAddressResponse
 
 if typing.TYPE_CHECKING:
-    from lbrynet.blob.blob_manager import BlobManager
+    from lbry.blob.blob_manager import BlobManager
 
 log = logging.getLogger(__name__)
 

lbry/lbry/conf.py

@@ -7,8 +7,8 @@ import yaml
 from argparse import ArgumentParser
 from contextlib import contextmanager
 from appdirs import user_data_dir, user_config_dir
-from lbrynet.error import InvalidCurrencyError
-from lbrynet.dht import constants
+from lbry.error import InvalidCurrencyError
+from lbry.dht import constants
 
 log = logging.getLogger(__name__)
 
@@ -595,7 +595,7 @@ class Config(CLIConfig):
 
 
 def get_windows_directories() -> typing.Tuple[str, str, str]:
-    from lbrynet.winpaths import get_path, FOLDERID, UserHandle
+    from lbry.winpaths import get_path, FOLDERID, UserHandle
 
     download_dir = get_path(FOLDERID.Downloads, UserHandle.current)
 

lbry/lbry/dht/blob_announcer.py

@@ -2,8 +2,8 @@ import asyncio
 import typing
 import logging
 if typing.TYPE_CHECKING:
-    from lbrynet.dht.node import Node
-    from lbrynet.extras.daemon.storage import SQLiteStorage
+    from lbry.dht.node import Node
+    from lbry.extras.daemon.storage import SQLiteStorage
 
 log = logging.getLogger(__name__)
 

lbry/lbry/dht/node.py

@@ -2,15 +2,15 @@ import logging
 import asyncio
 import typing
 import binascii
-from lbrynet.utils import resolve_host
-from lbrynet.dht import constants
-from lbrynet.dht.protocol.distance import Distance
-from lbrynet.dht.protocol.iterative_find import IterativeNodeFinder, IterativeValueFinder
-from lbrynet.dht.protocol.protocol import KademliaProtocol
-from lbrynet.dht.peer import KademliaPeer
+from lbry.utils import resolve_host
+from lbry.dht import constants
+from lbry.dht.protocol.distance import Distance
+from lbry.dht.protocol.iterative_find import IterativeNodeFinder, IterativeValueFinder
+from lbry.dht.protocol.protocol import KademliaProtocol
+from lbry.dht.peer import KademliaPeer
 
 if typing.TYPE_CHECKING:
-    from lbrynet.dht.peer import PeerManager
+    from lbry.dht.peer import PeerManager
 
 log = logging.getLogger(__name__)
 

lbry/lbry/dht/peer.py

@@ -5,8 +5,8 @@ import ipaddress
 from binascii import hexlify
 from functools import lru_cache
 
-from lbrynet.dht import constants
-from lbrynet.dht.serialization.datagram import make_compact_address, make_compact_ip, decode_compact_address
+from lbry.dht import constants
+from lbry.dht.serialization.datagram import make_compact_address, make_compact_ip, decode_compact_address
 
 log = logging.getLogger(__name__)
 

lbry/lbry/dht/protocol/data_store.py

@@ -1,9 +1,9 @@
 import asyncio
 import typing
 
-from lbrynet.dht import constants
+from lbry.dht import constants
 if typing.TYPE_CHECKING:
-    from lbrynet.dht.peer import KademliaPeer, PeerManager
+    from lbry.dht.peer import KademliaPeer, PeerManager
 
 
 class DictDataStore:

lbry/lbry/dht/protocol/distance.py

@@ -1,4 +1,4 @@
-from lbrynet.dht import constants
+from lbry.dht import constants
 
 
 class Distance:

lbry/lbry/dht/protocol/iterative_find.py

@@ -4,15 +4,15 @@ from itertools import chain
 
 import typing
 import logging
-from lbrynet.dht import constants
-from lbrynet.dht.error import RemoteException, TransportNotConnected
-from lbrynet.dht.protocol.distance import Distance
+from lbry.dht import constants
+from lbry.dht.error import RemoteException, TransportNotConnected
+from lbry.dht.protocol.distance import Distance
 
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
-    from lbrynet.dht.protocol.routing_table import TreeRoutingTable
-    from lbrynet.dht.protocol.protocol import KademliaProtocol
-    from lbrynet.dht.peer import PeerManager, KademliaPeer
+    from lbry.dht.protocol.routing_table import TreeRoutingTable
+    from lbry.dht.protocol.protocol import KademliaProtocol
+    from lbry.dht.peer import PeerManager, KademliaPeer
 
 log = logging.getLogger(__name__)
 

lbry/lbry/dht/protocol/protocol.py

@@ -9,15 +9,15 @@ import random
 from asyncio.protocols import DatagramProtocol
 from asyncio.transports import DatagramTransport
 
-from lbrynet.dht import constants
-from lbrynet.dht.serialization.datagram import decode_datagram, ErrorDatagram, ResponseDatagram, RequestDatagram
-from lbrynet.dht.serialization.datagram import RESPONSE_TYPE, ERROR_TYPE, PAGE_KEY
-from lbrynet.dht.error import RemoteException, TransportNotConnected
-from lbrynet.dht.protocol.routing_table import TreeRoutingTable
-from lbrynet.dht.protocol.data_store import DictDataStore
+from lbry.dht import constants
+from lbry.dht.serialization.datagram import decode_datagram, ErrorDatagram, ResponseDatagram, RequestDatagram
+from lbry.dht.serialization.datagram import RESPONSE_TYPE, ERROR_TYPE, PAGE_KEY
+from lbry.dht.error import RemoteException, TransportNotConnected
+from lbry.dht.protocol.routing_table import TreeRoutingTable
+from lbry.dht.protocol.data_store import DictDataStore
 
 if typing.TYPE_CHECKING:
-    from lbrynet.dht.peer import PeerManager, KademliaPeer
+    from lbry.dht.peer import PeerManager, KademliaPeer
 
 log = logging.getLogger(__name__)
 

lbry/lbry/dht/protocol/routing_table.py

@@ -4,10 +4,10 @@ import logging
 import typing
 import itertools
 
-from lbrynet.dht import constants
-from lbrynet.dht.protocol.distance import Distance
+from lbry.dht import constants
+from lbry.dht.protocol.distance import Distance
 if typing.TYPE_CHECKING:
-    from lbrynet.dht.peer import KademliaPeer, PeerManager
+    from lbry.dht.peer import KademliaPeer, PeerManager
 
 log = logging.getLogger(__name__)
 

lbry/lbry/dht/serialization/bencoding.py

@@ -1,5 +1,5 @@
 import typing
-from lbrynet.dht.error import DecodeError
+from lbry.dht.error import DecodeError
 
 
 def _bencode(data: typing.Union[int, bytes, bytearray, str, list, tuple, dict]) -> bytes:

lbry/lbry/dht/serialization/datagram.py

@@ -1,7 +1,7 @@
 import typing
 from functools import reduce
-from lbrynet.dht import constants
-from lbrynet.dht.serialization.bencoding import bencode, bdecode
+from lbry.dht import constants
+from lbry.dht.serialization.bencoding import bencode, bdecode
 
 REQUEST_TYPE = 0
 RESPONSE_TYPE = 1

lbry/lbry/extras/cli.py

@@ -12,10 +12,10 @@ from docopt import docopt
 import aiohttp
 from aiohttp.web import GracefulExit
 
-from lbrynet import __name__ as lbrynet_name, __version__ as lbrynet_version
-from lbrynet.extras.daemon.loggly_handler import get_loggly_handler
-from lbrynet.conf import Config, CLIConfig
-from lbrynet.extras.daemon.Daemon import Daemon
+from lbry import __name__ as lbrynet_name, __version__ as lbrynet_version
+from lbry.extras.daemon.loggly_handler import get_loggly_handler
+from lbry.conf import Config, CLIConfig
+from lbry.extras.daemon.Daemon import Daemon
 
 log = logging.getLogger(lbrynet_name)
 log.addHandler(logging.NullHandler())

lbry/lbry/extras/daemon/Component.py

@@ -1,7 +1,7 @@
 import asyncio
 import logging
-from lbrynet.conf import Config
-from lbrynet.extras.daemon.ComponentManager import ComponentManager
+from lbry.conf import Config
+from lbry.extras.daemon.ComponentManager import ComponentManager
 
 log = logging.getLogger(__name__)
 

lbry/lbry/extras/daemon/ComponentManager.py

@@ -1,8 +1,8 @@
 import logging
 import asyncio
-from lbrynet.conf import Config
-from lbrynet.error import ComponentStartConditionNotMet
-from lbrynet.dht.peer import PeerManager
+from lbry.conf import Config
+from lbry.error import ComponentStartConditionNotMet
+from lbry.dht.peer import PeerManager
 
 log = logging.getLogger(__name__)
 

lbry/lbry/extras/daemon/Components.py

@@ -12,18 +12,18 @@ from aioupnp import __version__ as aioupnp_version
 from aioupnp.upnp import UPnP
 from aioupnp.fault import UPnPError
 
-from lbrynet import utils
-from lbrynet.conf import HEADERS_FILE_SHA256_CHECKSUM
-from lbrynet.dht.node import Node
-from lbrynet.dht.blob_announcer import BlobAnnouncer
-from lbrynet.blob.blob_manager import BlobManager
-from lbrynet.blob_exchange.server import BlobServer
-from lbrynet.stream.stream_manager import StreamManager
-from lbrynet.extras.daemon.Component import Component
-from lbrynet.extras.daemon.exchange_rate_manager import ExchangeRateManager
-from lbrynet.extras.daemon.storage import SQLiteStorage
-from lbrynet.wallet import LbryWalletManager
-from lbrynet.wallet import Network
+from lbry import utils
+from lbry.conf import HEADERS_FILE_SHA256_CHECKSUM
+from lbry.dht.node import Node
+from lbry.dht.blob_announcer import BlobAnnouncer
+from lbry.blob.blob_manager import BlobManager
+from lbry.blob_exchange.server import BlobServer
+from lbry.stream.stream_manager import StreamManager
+from lbry.extras.daemon.Component import Component
+from lbry.extras.daemon.exchange_rate_manager import ExchangeRateManager
+from lbry.extras.daemon.storage import SQLiteStorage
+from lbry.wallet import LbryWalletManager
+from lbry.wallet import Network
 
 
 log = logging.getLogger(__name__)
@@ -90,7 +90,7 @@ class DatabaseComponent(Component):
                             'Your database is revision %i, expected %i' %
                             (old_revision, self.get_current_db_revision()))
         if old_revision < self.get_current_db_revision():
-            from lbrynet.extras.daemon.migrator import dbmigrator
+            from lbry.extras.daemon.migrator import dbmigrator
             log.info("Upgrading your databases (revision %i to %i)", old_revision, self.get_current_db_revision())
             await asyncio.get_event_loop().run_in_executor(
                 None, dbmigrator.migrate_db, self.conf, old_revision, self.get_current_db_revision()

lbry/lbry/extras/daemon/Daemon.py

@@ -19,38 +19,38 @@ from google.protobuf.message import DecodeError
 from torba.client.wallet import Wallet
 from torba.client.baseaccount import SingleKey, HierarchicalDeterministic
 
-from lbrynet import utils
-from lbrynet.conf import Config, Setting
-from lbrynet.blob.blob_file import is_valid_blobhash, BlobBuffer
-from lbrynet.blob_exchange.downloader import download_blob
-from lbrynet.error import DownloadSDTimeout, ComponentsNotStarted
-from lbrynet.error import NullFundsError, NegativeFundsError, ComponentStartConditionNotMet
-from lbrynet.extras import system_info
-from lbrynet.extras.daemon import analytics
-from lbrynet.extras.daemon.Components import WALLET_COMPONENT, DATABASE_COMPONENT, DHT_COMPONENT, BLOB_COMPONENT
-from lbrynet.extras.daemon.Components import STREAM_MANAGER_COMPONENT
-from lbrynet.extras.daemon.Components import EXCHANGE_RATE_MANAGER_COMPONENT, UPNP_COMPONENT
-from lbrynet.extras.daemon.ComponentManager import RequiredCondition
-from lbrynet.extras.daemon.ComponentManager import ComponentManager
-from lbrynet.extras.daemon.json_response_encoder import JSONResponseEncoder
-from lbrynet.extras.daemon.comment_client import jsonrpc_post, sign_comment, is_comment_signed_by_channel
-from lbrynet.extras.daemon.undecorated import undecorated
-from lbrynet.wallet.transaction import Transaction, Output, Input
-from lbrynet.wallet.account import Account as LBCAccount
-from lbrynet.wallet.dewies import dewies_to_lbc, lbc_to_dewies
-from lbrynet.schema.claim import Claim
-from lbrynet.schema.url import URL
+from lbry import utils
+from lbry.conf import Config, Setting
+from lbry.blob.blob_file import is_valid_blobhash, BlobBuffer
+from lbry.blob_exchange.downloader import download_blob
+from lbry.error import DownloadSDTimeout, ComponentsNotStarted
+from lbry.error import NullFundsError, NegativeFundsError, ComponentStartConditionNotMet
+from lbry.extras import system_info
+from lbry.extras.daemon import analytics
+from lbry.extras.daemon.Components import WALLET_COMPONENT, DATABASE_COMPONENT, DHT_COMPONENT, BLOB_COMPONENT
+from lbry.extras.daemon.Components import STREAM_MANAGER_COMPONENT
+from lbry.extras.daemon.Components import EXCHANGE_RATE_MANAGER_COMPONENT, UPNP_COMPONENT
+from lbry.extras.daemon.ComponentManager import RequiredCondition
+from lbry.extras.daemon.ComponentManager import ComponentManager
+from lbry.extras.daemon.json_response_encoder import JSONResponseEncoder
+from lbry.extras.daemon.comment_client import jsonrpc_post, sign_comment, is_comment_signed_by_channel
+from lbry.extras.daemon.undecorated import undecorated
+from lbry.wallet.transaction import Transaction, Output, Input
+from lbry.wallet.account import Account as LBCAccount
+from lbry.wallet.dewies import dewies_to_lbc, lbc_to_dewies
+from lbry.schema.claim import Claim
+from lbry.schema.url import URL
 
 
 if typing.TYPE_CHECKING:
-    from lbrynet.blob.blob_manager import BlobManager
-    from lbrynet.dht.node import Node
-    from lbrynet.extras.daemon.Components import UPnPComponent
-    from lbrynet.extras.daemon.exchange_rate_manager import ExchangeRateManager
-    from lbrynet.extras.daemon.storage import SQLiteStorage
-    from lbrynet.wallet.manager import LbryWalletManager
-    from lbrynet.wallet.ledger import MainNetLedger
-    from lbrynet.stream.stream_manager import StreamManager
+    from lbry.blob.blob_manager import BlobManager
+    from lbry.dht.node import Node
+    from lbry.extras.daemon.Components import UPnPComponent
+    from lbry.extras.daemon.exchange_rate_manager import ExchangeRateManager
+    from lbry.extras.daemon.storage import SQLiteStorage
+    from lbry.wallet.manager import LbryWalletManager
+    from lbry.wallet.ledger import MainNetLedger
+    from lbry.stream.stream_manager import StreamManager
 
 log = logging.getLogger(__name__)
 

lbry/lbry/extras/daemon/__init__.py

@@ -0,0 +1 @@
+from lbry.extras.daemon import Components  # register Component classes

lbry/lbry/extras/daemon/analytics.py

@@ -3,9 +3,9 @@ import collections
 import logging
 import aiohttp
 import typing
-from lbrynet import utils
-from lbrynet.conf import Config
-from lbrynet.extras import system_info
+from lbry import utils
+from lbry.conf import Config
+from lbry.extras import system_info
 
 ANALYTICS_ENDPOINT = 'https://api.segment.io/v1'
 ANALYTICS_TOKEN = 'Ax5LZzR1o3q3Z3WjATASDwR5rKyHH0qOIRIbLmMXn2H='

lbry/lbry/extras/daemon/client.py

@@ -1,5 +1,5 @@
-from lbrynet.conf import Config
-from lbrynet.extras.cli import execute_command
+from lbry.conf import Config
+from lbry.extras.cli import execute_command
 
 
 def daemon_rpc(conf: Config, method: str, **kwargs):

lbry/lbry/extras/daemon/comment_client.py

@@ -6,7 +6,7 @@ import binascii
 import aiohttp
 import ecdsa
 from torba.client.hash import sha256
-from lbrynet.wallet.transaction import Output
+from lbry.wallet.transaction import Output
 
 log = logging.getLogger(__name__)
 

lbry/lbry/extras/daemon/exchange_rate_manager.py

@@ -4,8 +4,8 @@ import logging
 import json
 from decimal import Decimal
 
-from lbrynet.error import InvalidExchangeRateResponse, CurrencyConversionError
-from lbrynet.utils import aiohttp_request
+from lbry.error import InvalidExchangeRateResponse, CurrencyConversionError
+from lbry.utils import aiohttp_request
 
 log = logging.getLogger(__name__)
 

lbry/lbry/extras/daemon/json_response_encoder.py

@@ -6,11 +6,11 @@ from json import JSONEncoder
 
 from google.protobuf.message import DecodeError
 
-from lbrynet.schema.claim import Claim
-from lbrynet.wallet.ledger import MainNetLedger, Account
-from lbrynet.wallet.transaction import Transaction, Output
-from lbrynet.wallet.dewies import dewies_to_lbc
-from lbrynet.stream.managed_stream import ManagedStream
+from lbry.schema.claim import Claim
+from lbry.wallet.ledger import MainNetLedger, Account
+from lbry.wallet.transaction import Transaction, Output
+from lbry.wallet.dewies import dewies_to_lbc
+from lbry.stream.managed_stream import ManagedStream
 
 
 log = logging.getLogger(__name__)

lbry/lbry/extras/daemon/loggly_handler.py

@@ -2,7 +2,7 @@ import asyncio
 import json
 import logging.handlers
 import traceback
-from lbrynet import utils, __version__
+from lbry import utils, __version__
 
 
 LOGGLY_TOKEN = 'BQEzZmMzLJHgAGxkBF00LGD0YGuyATVgAmqxAQEuAQZ2BQH4'

lbry/lbry/extras/daemon/migrator/migrate5to6.py

@@ -3,7 +3,7 @@ import os
 import json
 import logging
 from binascii import hexlify
-from lbrynet.schema.claim import Claim
+from lbry.schema.claim import Claim
 
 log = logging.getLogger(__name__)
 

lbry/lbry/extras/daemon/migrator/migrate8to9.py

@@ -2,8 +2,8 @@ import sqlite3
 import logging
 import os
 import asyncio
-from lbrynet.blob.blob_info import BlobInfo
-from lbrynet.stream.descriptor import StreamDescriptor
+from lbry.blob.blob_info import BlobInfo
+from lbry.stream.descriptor import StreamDescriptor
 
 log = logging.getLogger(__name__)
 

lbry/lbry/extras/daemon/storage.py

@@ -6,16 +6,16 @@ import asyncio
 import binascii
 import time
 from torba.client.basedatabase import SQLiteMixin
-from lbrynet.conf import Config
-from lbrynet.wallet.dewies import dewies_to_lbc, lbc_to_dewies
-from lbrynet.wallet.transaction import Transaction
-from lbrynet.schema.claim import Claim
-from lbrynet.dht.constants import data_expiration
-from lbrynet.blob.blob_info import BlobInfo
+from lbry.conf import Config
+from lbry.wallet.dewies import dewies_to_lbc, lbc_to_dewies
+from lbry.wallet.transaction import Transaction
+from lbry.schema.claim import Claim
+from lbry.dht.constants import data_expiration
+from lbry.blob.blob_info import BlobInfo
 
 if typing.TYPE_CHECKING:
-    from lbrynet.blob.blob_file import BlobFile
-    from lbrynet.stream.descriptor import StreamDescriptor
+    from lbry.blob.blob_file import BlobFile
+    from lbry.stream.descriptor import StreamDescriptor
 
 log = logging.getLogger(__name__)
 opt_str = typing.Optional[str]

lbry/lbry/extras/system_info.py

@@ -2,7 +2,7 @@ import platform
 import os
 import logging.handlers
 
-from lbrynet import build_type, __version__ as lbrynet_version
+from lbry import build_type, __version__ as lbrynet_version
 from torba import __version__ as torba_version
 
 log = logging.getLogger(__name__)

lbry/lbry/schema/attrs.py

@@ -11,9 +11,9 @@ from google.protobuf.json_format import MessageToDict
 from torba.client.hash import Base58
 from torba.client.constants import COIN
 
-from lbrynet.schema.mime_types import guess_media_type
-from lbrynet.schema.base import Metadata, BaseMessageList
-from lbrynet.schema.types.v2.claim_pb2 import (
+from lbry.schema.mime_types import guess_media_type
+from lbry.schema.base import Metadata, BaseMessageList
+from lbry.schema.types.v2.claim_pb2 import (
     Fee as FeeMessage,
     Location as LocationMessage,
     Language as LanguageMessage

lbry/lbry/schema/claim.py

@@ -8,14 +8,14 @@ from hachoir.core.log import log as hachoir_log
 from hachoir.parser import createParser as binary_file_parser
 from hachoir.metadata import extractMetadata as binary_file_metadata
 
-from lbrynet.schema import compat
-from lbrynet.schema.base import Signable
-from lbrynet.schema.mime_types import guess_media_type, guess_stream_type
-from lbrynet.schema.attrs import (
+from lbry.schema import compat
+from lbry.schema.base import Signable
+from lbry.schema.mime_types import guess_media_type, guess_stream_type
+from lbry.schema.attrs import (
     Source, Playable, Dimmensional, Fee, Image, Video, Audio,
     LanguageList, LocationList, ClaimList, ClaimReference
 )
-from lbrynet.schema.types.v2.claim_pb2 import Claim as ClaimMessage
+from lbry.schema.types.v2.claim_pb2 import Claim as ClaimMessage
 
 
 hachoir_log.use_print = False

lbry/lbry/schema/compat.py

@@ -3,9 +3,9 @@ from decimal import Decimal
 
 from google.protobuf.message import DecodeError
 
-from lbrynet.schema.types.v1.legacy_claim_pb2 import Claim as OldClaimMessage
-from lbrynet.schema.types.v1.certificate_pb2 import KeyType
-from lbrynet.schema.types.v1.fee_pb2 import Fee as FeeMessage
+from lbry.schema.types.v1.legacy_claim_pb2 import Claim as OldClaimMessage
+from lbry.schema.types.v1.certificate_pb2 import KeyType
+from lbry.schema.types.v1.fee_pb2 import Fee as FeeMessage
 
 
 def from_old_json_schema(claim, payload: bytes):

lbry/lbry/schema/result.py

@@ -4,7 +4,7 @@ from typing import List
 from binascii import hexlify
 from itertools import chain
 
-from lbrynet.schema.types.v2.result_pb2 import Outputs as OutputsMessage
+from lbry.schema.types.v2.result_pb2 import Outputs as OutputsMessage
 
 
 class Outputs:

lbry/lbry/schema/support.py

@@ -1,4 +1,4 @@
-from lbrynet.schema.base import Signable
+from lbry.schema.base import Signable
 
 
 class Support(Signable):

lbry/lbry/stream/descriptor.py

@@ -6,11 +6,11 @@ import typing
 import asyncio
 from collections import OrderedDict
 from cryptography.hazmat.primitives.ciphers.algorithms import AES
-from lbrynet.blob import MAX_BLOB_SIZE
-from lbrynet.blob.blob_info import BlobInfo
-from lbrynet.blob.blob_file import AbstractBlob, BlobFile
-from lbrynet.cryptoutils import get_lbry_hash_obj
-from lbrynet.error import InvalidStreamDescriptorError
+from lbry.blob import MAX_BLOB_SIZE
+from lbry.blob.blob_info import BlobInfo
+from lbry.blob.blob_file import AbstractBlob, BlobFile
+from lbry.cryptoutils import get_lbry_hash_obj
+from lbry.error import InvalidStreamDescriptorError
 
 log = logging.getLogger(__name__)
 

lbry/lbry/stream/downloader.py

@@ -2,17 +2,17 @@ import asyncio
 import typing
 import logging
 import binascii
-from lbrynet.error import DownloadSDTimeout
-from lbrynet.utils import resolve_host, lru_cache_concurrent
-from lbrynet.stream.descriptor import StreamDescriptor
-from lbrynet.blob_exchange.downloader import BlobDownloader
-from lbrynet.dht.peer import KademliaPeer
+from lbry.error import DownloadSDTimeout
+from lbry.utils import resolve_host, lru_cache_concurrent
+from lbry.stream.descriptor import StreamDescriptor
+from lbry.blob_exchange.downloader import BlobDownloader
+from lbry.dht.peer import KademliaPeer
 if typing.TYPE_CHECKING:
-    from lbrynet.conf import Config
-    from lbrynet.dht.node import Node
-    from lbrynet.blob.blob_manager import BlobManager
-    from lbrynet.blob.blob_file import AbstractBlob
-    from lbrynet.blob.blob_info import BlobInfo
+    from lbry.conf import Config
+    from lbry.dht.node import Node
+    from lbry.blob.blob_manager import BlobManager
+    from lbry.blob.blob_file import AbstractBlob
+    from lbry.blob.blob_info import BlobInfo
 
 log = logging.getLogger(__name__)
 

lbry/lbry/stream/managed_stream.py

@@ -4,21 +4,21 @@ import typing
 import logging
 import binascii
 from aiohttp.web import Request, StreamResponse, HTTPRequestRangeNotSatisfiable
-from lbrynet.utils import generate_id
-from lbrynet.error import DownloadSDTimeout
-from lbrynet.schema.mime_types import guess_media_type
-from lbrynet.stream.downloader import StreamDownloader
-from lbrynet.stream.descriptor import StreamDescriptor
-from lbrynet.stream.reflector.client import StreamReflectorClient
-from lbrynet.extras.daemon.storage import StoredStreamClaim
+from lbry.utils import generate_id
+from lbry.error import DownloadSDTimeout
+from lbry.schema.mime_types import guess_media_type
+from lbry.stream.downloader import StreamDownloader
+from lbry.stream.descriptor import StreamDescriptor
+from lbry.stream.reflector.client import StreamReflectorClient
+from lbry.extras.daemon.storage import StoredStreamClaim
 if typing.TYPE_CHECKING:
-    from lbrynet.conf import Config
-    from lbrynet.schema.claim import Claim
-    from lbrynet.blob.blob_manager import BlobManager
-    from lbrynet.blob.blob_info import BlobInfo
-    from lbrynet.dht.node import Node
-    from lbrynet.extras.daemon.analytics import AnalyticsManager
-    from lbrynet.wallet.transaction import Transaction
+    from lbry.conf import Config
+    from lbry.schema.claim import Claim
+    from lbry.blob.blob_manager import BlobManager
+    from lbry.blob.blob_info import BlobInfo
+    from lbry.dht.node import Node
+    from lbry.extras.daemon.analytics import AnalyticsManager
+    from lbry.wallet.transaction import Transaction
 
 log = logging.getLogger(__name__)
 

lbry/lbry/stream/reflector/client.py

@@ -4,8 +4,8 @@ import logging
 import typing
 
 if typing.TYPE_CHECKING:
-    from lbrynet.blob.blob_manager import BlobManager
-    from lbrynet.stream.descriptor import StreamDescriptor
+    from lbry.blob.blob_manager import BlobManager
+    from lbry.stream.descriptor import StreamDescriptor
 
 REFLECTOR_V1 = 0
 REFLECTOR_V2 = 1

lbry/lbry/stream/reflector/server.py

@@ -3,12 +3,12 @@ import logging
 import typing
 import json
 from json.decoder import JSONDecodeError
-from lbrynet.stream.descriptor import StreamDescriptor
+from lbry.stream.descriptor import StreamDescriptor
 
 if typing.TYPE_CHECKING:
-    from lbrynet.blob.blob_file import BlobFile
-    from lbrynet.blob.blob_manager import BlobManager
-    from lbrynet.blob.writer import HashBlobWriter
+    from lbry.blob.blob_file import BlobFile
+    from lbry.blob.blob_manager import BlobManager
+    from lbry.blob.writer import HashBlobWriter
 
 
 log = logging.getLogger(__name__)

lbry/lbry/stream/stream_manager.py

@@ -6,24 +6,24 @@ import logging
 import random
 from decimal import Decimal
 from aiohttp.web import Request
-from lbrynet.error import ResolveError, InvalidStreamDescriptorError, KeyFeeAboveMaxAllowed, InsufficientFundsError
-from lbrynet.error import ResolveTimeout, DownloadDataTimeout
-from lbrynet.utils import cache_concurrent
-from lbrynet.stream.descriptor import StreamDescriptor
-from lbrynet.stream.managed_stream import ManagedStream
-from lbrynet.schema.claim import Claim
-from lbrynet.schema.url import URL
-from lbrynet.extras.daemon.storage import lbc_to_dewies, dewies_to_lbc
-from lbrynet.wallet.transaction import Output
+from lbry.error import ResolveError, InvalidStreamDescriptorError, KeyFeeAboveMaxAllowed, InsufficientFundsError
+from lbry.error import ResolveTimeout, DownloadDataTimeout
+from lbry.utils import cache_concurrent
+from lbry.stream.descriptor import StreamDescriptor
+from lbry.stream.managed_stream import ManagedStream
+from lbry.schema.claim import Claim
+from lbry.schema.url import URL
+from lbry.extras.daemon.storage import lbc_to_dewies, dewies_to_lbc
+from lbry.wallet.transaction import Output
 if typing.TYPE_CHECKING:
-    from lbrynet.conf import Config
-    from lbrynet.blob.blob_manager import BlobManager
-    from lbrynet.dht.node import Node
-    from lbrynet.extras.daemon.analytics import AnalyticsManager
-    from lbrynet.extras.daemon.storage import SQLiteStorage, StoredStreamClaim
-    from lbrynet.wallet import LbryWalletManager
-    from lbrynet.wallet.transaction import Transaction
-    from lbrynet.extras.daemon.exchange_rate_manager import ExchangeRateManager
+    from lbry.conf import Config
+    from lbry.blob.blob_manager import BlobManager
+    from lbry.dht.node import Node
+    from lbry.extras.daemon.analytics import AnalyticsManager
+    from lbry.extras.daemon.storage import SQLiteStorage, StoredStreamClaim
+    from lbry.wallet import LbryWalletManager
+    from lbry.wallet.transaction import Transaction
+    from lbry.extras.daemon.exchange_rate_manager import ExchangeRateManager
 
 log = logging.getLogger(__name__)
 

lbry/lbry/testcase.py

@@ -6,21 +6,21 @@ from binascii import unhexlify
 
 from torba.testcase import IntegrationTestCase, WalletNode
 
-import lbrynet.wallet
+import lbry.wallet
 
-from lbrynet.conf import Config
-from lbrynet.extras.daemon.Daemon import Daemon, jsonrpc_dumps_pretty
-from lbrynet.wallet import LbryWalletManager
-from lbrynet.extras.daemon.Components import Component, WalletComponent
-from lbrynet.extras.daemon.Components import (
+from lbry.conf import Config
+from lbry.extras.daemon.Daemon import Daemon, jsonrpc_dumps_pretty
+from lbry.wallet import LbryWalletManager
+from lbry.extras.daemon.Components import Component, WalletComponent
+from lbry.extras.daemon.Components import (
     DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT,
     UPNP_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT
 )
-from lbrynet.extras.daemon.ComponentManager import ComponentManager
-from lbrynet.extras.daemon.storage import SQLiteStorage
-from lbrynet.blob.blob_manager import BlobManager
-from lbrynet.stream.reflector.server import ReflectorServer
-from lbrynet.blob_exchange.server import BlobServer
+from lbry.extras.daemon.ComponentManager import ComponentManager
+from lbry.extras.daemon.storage import SQLiteStorage
+from lbry.blob.blob_manager import BlobManager
+from lbry.stream.reflector.server import ReflectorServer
+from lbry.blob_exchange.server import BlobServer
 
 
 class ExchangeRateManager:
@@ -58,7 +58,7 @@ class ExchangeRateManagerComponent(Component):
 
 class CommandTestCase(IntegrationTestCase):
 
-    LEDGER = lbrynet.wallet
+    LEDGER = lbry.wallet
     MANAGER = LbryWalletManager
     VERBOSITY = logging.WARN
     blob_lru_cache_size = 0

lbry/lbry/utils.py

@@ -16,8 +16,8 @@ import certifi
 import aiohttp
 import functools
 import collections
-from lbrynet.schema.claim import Claim
-from lbrynet.cryptoutils import get_lbry_hash_obj
+from lbry.schema.claim import Claim
+from lbry.cryptoutils import get_lbry_hash_obj
 
 
 log = logging.getLogger(__name__)

lbry/lbry/wallet/__init__.py

@@ -6,6 +6,6 @@ __node_url__ = (
 )
 __spvserver__ = 'lbrynet.wallet.server.coin.LBCRegTest'
 
-from lbrynet.wallet.manager import LbryWalletManager
-from lbrynet.wallet.network import Network
-from lbrynet.wallet.ledger import MainNetLedger, RegTestLedger, TestNetLedger
+from lbry.wallet.manager import LbryWalletManager
+from lbry.wallet.network import Network
+from lbry.wallet.ledger import MainNetLedger, RegTestLedger, TestNetLedger

lbry/lbry/wallet/database.py

@@ -2,7 +2,7 @@ from typing import List
 
 from torba.client.basedatabase import BaseDatabase
 
-from lbrynet.wallet.transaction import Output
+from lbry.wallet.transaction import Output
 
 
 class WalletDatabase(BaseDatabase):

lbry/lbry/wallet/ledger.py

@@ -5,15 +5,15 @@ from typing import Tuple, List, Dict
 
 from torba.client.baseledger import BaseLedger
 from torba.client.baseaccount import SingleKey
-from lbrynet.schema.result import Outputs
-from lbrynet.schema.url import URL
-from lbrynet.wallet.dewies import dewies_to_lbc
-from lbrynet.wallet.resolve import Resolver
-from lbrynet.wallet.account import Account
-from lbrynet.wallet.network import Network
-from lbrynet.wallet.database import WalletDatabase
-from lbrynet.wallet.transaction import Transaction, Output
-from lbrynet.wallet.header import Headers, UnvalidatedHeaders
+from lbry.schema.result import Outputs
+from lbry.schema.url import URL
+from lbry.wallet.dewies import dewies_to_lbc
+from lbry.wallet.resolve import Resolver
+from lbry.wallet.account import Account
+from lbry.wallet.network import Network
+from lbry.wallet.database import WalletDatabase
+from lbry.wallet.transaction import Transaction, Output
+from lbry.wallet.header import Headers, UnvalidatedHeaders
 
 
 log = logging.getLogger(__name__)

lbry/lbry/wallet/manager.py

@@ -8,11 +8,11 @@ from datetime import datetime
 from torba.client.basemanager import BaseWalletManager
 from torba.rpc.jsonrpc import CodeMessageError
 
-from lbrynet.wallet.ledger import MainNetLedger
-from lbrynet.wallet.account import BaseAccount
-from lbrynet.wallet.transaction import Transaction
-from lbrynet.wallet.database import WalletDatabase
-from lbrynet.wallet.dewies import dewies_to_lbc
+from lbry.wallet.ledger import MainNetLedger
+from lbry.wallet.account import BaseAccount
+from lbry.wallet.transaction import Transaction
+from lbry.wallet.database import WalletDatabase
+from lbry.wallet.dewies import dewies_to_lbc
 
 
 log = logging.getLogger(__name__)