rename LBRYcrdWallet.py to LBRYWallet.py and change default wallet to lbrycrd

lbrynet/conf.py

@@ -38,7 +38,7 @@ API_CONNECTION_STRING = "http://%s:%i/%s" % (API_INTERFACE, API_PORT, API_ADDRES
 UI_ADDRESS = "http://%s:%i" % (API_INTERFACE, API_PORT)
 PROTOCOL_PREFIX = "lbry"
 
-DEFAULT_WALLET = "lbryum"
+DEFAULT_WALLET = "lbrycrd"
 WALLET_TYPES = ["lbryum", "lbrycrd"]
 DEFAULT_TIMEOUT = 30
 DEFAULT_MAX_SEARCH_RESULTS = 25

lbrynet/core/PTCWallet.py

@@ -12,7 +12,7 @@ from lbrynet.pointtraderclient import pointtraderclient
 from twisted.internet import defer, threads
 from zope.interface import implements
 from twisted.python.failure import Failure
-from lbrynet.core.LBRYcrdWallet import ReservedPoints
+from lbrynet.core.LBRYWallet import ReservedPoints
 
 
 log = logging.getLogger(__name__)

lbrynet/lbrynet_console/LBRYConsole.py

@@ -43,7 +43,7 @@ from lbrynet.lbrynet_console.ControlHandlers import ShowServerStatusFactory, Mod
 from lbrynet.lbrynet_console.ControlHandlers import ModifyLBRYFileOptionsChooserFactory, StatusFactory
 from lbrynet.lbrynet_console.ControlHandlers import PeerStatsAndSettingsChooserFactory, PublishFactory
 from lbrynet.lbrynet_console.ControlHandlers import BlockchainStatusFactory
-from lbrynet.core.LBRYcrdWallet import LBRYcrdWallet, LBRYumWallet
+from lbrynet.core.LBRYWallet import LBRYcrdWallet, LBRYumWallet
 
 
 log = logging.getLogger(__name__)

lbrynet/lbrynet_daemon/LBRYDaemon.py

@@ -45,7 +45,7 @@ from lbrynet.conf import DEFAULT_TIMEOUT, WALLET_TYPES
 from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier, download_sd_blob
 from lbrynet.core.Session import LBRYSession
 from lbrynet.core.PTCWallet import PTCWallet
-from lbrynet.core.LBRYcrdWallet import LBRYcrdWallet, LBRYumWallet
+from lbrynet.core.LBRYWallet import LBRYcrdWallet, LBRYumWallet
 from lbrynet.lbryfilemanager.LBRYFileManager import LBRYFileManager
 from lbrynet.lbryfile.LBRYFileMetadataManager import DBLBRYFileMetadataManager, TempLBRYFileMetadataManager
 # from lbryum import LOG_PATH as lbryum_log
@@ -431,7 +431,8 @@ class LBRYDaemon(jsonrpc.JSONRPC):
             #     d.addCallback(lambda _: self._check_first_run())
             #     d.addCallback(self._show_first_run_result)
 
-            d.addCallback(lambda _: _wait_for_credits() if self.requested_first_run_credits else _announce())
+            # d.addCallback(lambda _: _wait_for_credits() if self.requested_first_run_credits else _announce())
+            d.addCallback(lambda _: _announce())
             return d
 
         log.info("[" + str(datetime.now()) + "] Starting lbrynet-daemon")