diff --git a/lbrynet/core/Wallet.py b/lbrynet/core/Wallet.py index f26f28e2d..b3fc83592 100644 --- a/lbrynet/core/Wallet.py +++ b/lbrynet/core/Wallet.py @@ -20,7 +20,6 @@ from lbryum.transaction import Transaction from lbrynet.interfaces import IRequestCreator, IQueryHandlerFactory, IQueryHandler, IWallet from lbrynet.core.client.ClientRequest import ClientRequest from lbrynet.core.Error import UnknownNameError, InvalidStreamInfoError, RequestCanceledError -from lbrynet.core.Error import InsufficientFundsError from lbrynet.db_migrator.migrate1to2 import UNSET_NOUT from lbrynet.metadata.Metadata import Metadata diff --git a/lbrynet/lbrynet_console/Console.py b/lbrynet/lbrynet_console/Console.py index 7a67c7409..04d3136c1 100644 --- a/lbrynet/lbrynet_console/Console.py +++ b/lbrynet/lbrynet_console/Console.py @@ -45,7 +45,7 @@ from lbrynet.lbrynet_console.ControlHandlers import ShowServerStatusFactory, Mod from lbrynet.lbrynet_console.ControlHandlers import ModifyEncryptedFileOptionsChooserFactory, StatusFactory from lbrynet.lbrynet_console.ControlHandlers import PeerStatsAndSettingsChooserFactory, PublishFactory from lbrynet.lbrynet_console.ControlHandlers import BlockchainStatusFactory -from lbrynet.core.Wallet import LBRYcrdWallet, LBRYumWallet +from lbrynet.core.Wallet import LBRYumWallet log = logging.getLogger(__name__) @@ -218,10 +218,6 @@ class Console(): def get_wallet(): if self.fake_wallet: d = defer.succeed(PTCWallet(self.db_dir)) - elif self.lbrycrdd_path is not None: - d = defer.succeed(LBRYcrdWallet(self.db_dir, wallet_dir=self.lbrycrd_dir, - wallet_conf=self.lbrycrd_conf, - lbrycrdd_path=self.lbrycrdd_path)) else: d = defer.succeed(LBRYumWallet(self.db_dir)) d.addCallback(lambda wallet: {"wallet": wallet}) diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index 5937b339f..9edc154f5 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -10,7 +10,6 @@ import base58 import requests import simplejson as json from urllib2 import urlopen -from appdirs import user_data_dir from datetime import datetime from decimal import Decimal @@ -18,7 +17,6 @@ from twisted.web import server from twisted.internet import defer, threads, error, reactor, task from twisted.internet.task import LoopingCall from twisted.python.failure import Failure -from txjsonrpc import jsonrpclib from jsonschema import ValidationError # TODO: importing this when internet is disabled raises a socket.gaierror