orchstr8 works again, for now...

lbry/lbry/wallet/orchstr8/cli.py

@@ -3,8 +3,10 @@ import argparse
 import asyncio
 import aiohttp
 
-from torba.orchstr8.node import Conductor, get_ledger_from_environment, get_blockchain_node_from_ledger
-from torba.orchstr8.service import ConductorService
+from lbry.wallet.orchstr8.node import (
+    Conductor, get_ledger_from_environment, get_blockchain_node_from_ledger
+)
+from lbry.wallet.orchstr8.service import ConductorService
 
 
 def get_argument_parser():
@@ -13,8 +15,6 @@ def get_argument_parser():
     )
     subparsers = parser.add_subparsers(dest='command', help='sub-command help')
 
-    subparsers.add_parser("gui", help="Start Qt GUI.")
-
     subparsers.add_parser("download", help="Download blockchain node binary.")
 
     start = subparsers.add_parser("start", help="Start orchstr8 service.")
@@ -41,10 +41,6 @@ def main():
     args = parser.parse_args()
     command = getattr(args, 'command', 'help')
 
-    if command == 'gui':
-        from torba.workbench import main as start_app  # pylint: disable=import-outside-toplevel
-        return start_app()
-
     loop = asyncio.get_event_loop()
     asyncio.set_event_loop(loop)
     ledger = get_ledger_from_environment()

lbry/lbry/wallet/orchstr8/node.py

@@ -31,10 +31,7 @@ def get_manager_from_environment(default_manager=BaseWalletManager):
 
 
 def get_ledger_from_environment():
-    if 'TORBA_LEDGER' not in os.environ:
-        raise ValueError('Environment variable TORBA_LEDGER must point to a torba based ledger module.')
-    module_name = os.environ['TORBA_LEDGER'].split('-')[-1]  # tox support
-    return importlib.import_module(module_name)
+    return importlib.import_module('lbry.wallet')
 
 
 def get_spvserver_from_ledger(ledger_module):

lbry/setup.cfg

@@ -3,8 +3,8 @@ branch = True
 
 [coverage:paths]
 source =
-  torba
-  .tox/*/lib/python*/site-packages/torba
+  lbry
+  .tox/*/lib/python*/site-packages/lbry
 
 [cryptography.*,coincurve.*,pbkdf2]
 ignore_missing_imports = True

lbry/setup.py

@@ -29,6 +29,7 @@ setup(
         'console_scripts': [
             'lbrynet=lbry.extras.cli:main',
             'torba-server=lbry.wallet.server.cli:main',
+            'orchstr8=lbry.wallet.orchstr8.cli:main',
         ],
     },
     install_requires=[