From 7a8c2fc98ba31751ec9262ab4adcefe4f6335a9e Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Tue, 15 Jan 2019 00:22:55 -0500 Subject: [PATCH] removed hard coded ipv4 and replaced it with being able to provide hostname to --spv --- torba/orchstr8/cli.py | 9 ++++++--- torba/server/session.py | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/torba/orchstr8/cli.py b/torba/orchstr8/cli.py index 523e0c1dd..e3639ecdb 100644 --- a/torba/orchstr8/cli.py +++ b/torba/orchstr8/cli.py @@ -18,9 +18,9 @@ def get_argument_parser(): subparsers.add_parser("download", help="Download blockchain node binary.") start = subparsers.add_parser("start", help="Start orchstr8 service.") - start.add_argument("--blockchain", help="Start blockchain node.", action="store_true") - start.add_argument("--spv", help="Start SPV server.", action="store_true") - start.add_argument("--wallet", help="Start wallet daemon.", action="store_true") + start.add_argument("--blockchain", help="Hostname to start blockchain node.") + start.add_argument("--spv", help="Hostname to start SPV server.") + start.add_argument("--wallet", help="Hostname to start wallet daemon.") generate = subparsers.add_parser("generate", help="Call generate method on running orchstr8 instance.") generate.add_argument("blocks", type=int, help="Number of blocks to generate") @@ -62,10 +62,13 @@ def main(): conductor = Conductor() if getattr(args, 'blockchain', False): + conductor.blockchain_node.hostname = args.blockchain loop.run_until_complete(conductor.start_blockchain()) if getattr(args, 'spv', False): + conductor.spv_node.hostname = args.spv loop.run_until_complete(conductor.start_spv()) if getattr(args, 'wallet', False): + conductor.wallet_node.hostname = args.wallet loop.run_until_complete(conductor.start_wallet()) service = ConductorService(conductor, loop) diff --git a/torba/server/session.py b/torba/server/session.py index b85182cec..c5b063ec5 100644 --- a/torba/server/session.py +++ b/torba/server/session.py @@ -16,7 +16,6 @@ import os import pylru import ssl import time -import socket from asyncio import Event, sleep from collections import defaultdict from functools import partial @@ -148,7 +147,7 @@ class SessionManager: protocol_class = self.env.coin.SESSIONCLS protocol_factory = partial(protocol_class, self, self.db, self.mempool, self.peer_mgr, kind) - server = loop.create_server(protocol_factory, *args, family=socket.AF_INET, **kw_args) + server = loop.create_server(protocol_factory, *args, **kw_args) host, port = args[:2] try: