Merge pull request #718 from lbryio/lbryum-refactor

update lbryum imports

CHANGELOG.md

@@ -18,6 +18,8 @@ at anytime.
   * Renamed `lbrynet.lbryfilemanager` to `lbrynet.file_manager`
   * Renamed `lbrynet.lbrynet_daemon` to `lbrynet.daemon`
   * Initialize lbrynet settings when configuring an api client if they are not set yet
+  * Updated lbryum imports
+  *
 
 ### Fixed
   * Fixed some log messages throwing exceptions

lbrynet/core/Wallet.py

@@ -12,9 +12,10 @@ from collections import defaultdict, deque
 from zope.interface import implements
 from decimal import Decimal
 
-from lbryum import SimpleConfig, Network
-from lbryum.lbrycrd import COIN
 import lbryum.wallet
+from lbryum.network import Network
+from lbryum.simple_config import SimpleConfig
+from lbryum.constants import COIN
 from lbryum.commands import known_commands, Commands
 
 from lbryschema.uri import parse_lbry_uri

lbrynet/core/system_info.py

@@ -4,11 +4,10 @@ import subprocess
 import os
 
 from urllib2 import urlopen
-
+from lbryschema import __version__ as lbryschema_version
+from lbryum import __version__ as LBRYUM_VERSION
 from lbrynet import build_type, __version__ as lbrynet_version
 from lbrynet.conf import ROOT_DIR
-from lbryum.version import LBRYUM_VERSION
-from lbryschema import __version__ as lbryschema_version
 
 
 def get_lbrynet_version():

requirements.txt

@@ -14,7 +14,7 @@ jsonrpc==1.2
 jsonrpclib==0.1.7
 jsonschema==2.5.1
 git+https://github.com/lbryio/lbryschema.git@v0.0.7#egg=lbryschema
-git+https://github.com/lbryio/lbryum.git@v3.0.1#egg=lbryum
+git+https://github.com/lbryio/lbryum.git@v3.1.0#egg=lbryum
 miniupnpc==1.9
 pbkdf2==1.3
 pycrypto==2.6.1

setup.py

@@ -21,7 +21,7 @@ requires = [
     'envparse',
     'jsonrpc',
     'jsonschema',
-    'lbryum==3.0.1',
+    'lbryum==3.1.0',
     'lbryschema==0.0.7',
     'miniupnpc',
     'pycrypto',