From f89486f5fe364e493845c09abac5e5a206b32b3c Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 24 Jun 2016 13:12:27 -0400 Subject: [PATCH] port and import name --- lbrynet/core/LBRYcrdWallet.py | 4 ++-- lbrynet/lbrynet_daemon/LBRYDaemon.py | 2 +- lbrynet/lbrynet_daemon/LBRYUIManager.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lbrynet/core/LBRYcrdWallet.py b/lbrynet/core/LBRYcrdWallet.py index 17fd0e229..8807e757c 100644 --- a/lbrynet/core/LBRYcrdWallet.py +++ b/lbrynet/core/LBRYcrdWallet.py @@ -634,7 +634,7 @@ class LBRYcrdWallet(LBRYWallet): def _get_rpc_conf(self): settings = {"username": "rpcuser", "password": "rpcpassword", - "rpc_port": 8332} + "rpc_port": 9245} if os.path.exists(self.wallet_conf): conf = open(self.wallet_conf) for l in conf: @@ -846,7 +846,7 @@ class LBRYcrdWallet(LBRYWallet): @_catch_connection_error def _get_nametrie_rpc(self): rpc_conn = self._get_rpc_conn() - return rpc_conn.getnametrie() + return rpc_conn.getclaimtrie() @_catch_connection_error def _get_wallet_balance_rpc(self): diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/LBRYDaemon.py index ac157bd71..aa47f021d 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemon.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemon.py @@ -24,7 +24,7 @@ from appdirs import user_data_dir from urllib2 import urlopen from lbrynet import __version__ as lbrynet_version -from lbryum.version import ELECTRUM_VERSION as lbryum_version +from lbryum.version import LBRYUM_VERSION as lbryum_version from lbrynet.core.PaymentRateManager import PaymentRateManager from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory diff --git a/lbrynet/lbrynet_daemon/LBRYUIManager.py b/lbrynet/lbrynet_daemon/LBRYUIManager.py index e7c405352..ce36aaf01 100644 --- a/lbrynet/lbrynet_daemon/LBRYUIManager.py +++ b/lbrynet/lbrynet_daemon/LBRYUIManager.py @@ -10,7 +10,7 @@ from twisted.web import static from twisted.internet import defer from lbrynet.conf import DEFAULT_UI_BRANCH, LOG_FILE_NAME from lbrynet import __version__ as lbrynet_version -from lbryum.version import ELECTRUM_VERSION as lbryum_version +from lbryum.version import LBRYUM_VERSION as lbryum_version from zipfile import ZipFile from appdirs import user_data_dir