From 04432fe93e89092a69a898e8511fd400cf6a212f Mon Sep 17 00:00:00 2001 From: Janus Date: Tue, 10 Jul 2018 13:49:51 +0200 Subject: [PATCH] use python3 in scripts shebang, fix #4519 --- scripts/block_headers | 2 +- scripts/estimate_fee | 5 +++-- scripts/util.py | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/block_headers b/scripts/block_headers index cda9e14b9..0be84433c 100755 --- a/scripts/block_headers +++ b/scripts/block_headers @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # A simple script that connects to a server and displays block headers diff --git a/scripts/estimate_fee b/scripts/estimate_fee index a0581f5a8..2e46b6da4 100755 --- a/scripts/estimate_fee +++ b/scripts/estimate_fee @@ -1,5 +1,6 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import util, json -peers = util.get_peers() +from electrum.network import filter_protocol +peers = filter_protocol(util.get_peers()) results = util.send_request(peers, 'blockchain.estimatefee', [2]) print(json.dumps(results, indent=4)) diff --git a/scripts/util.py b/scripts/util.py index db14a384d..d3ac97149 100644 --- a/scripts/util.py +++ b/scripts/util.py @@ -10,6 +10,7 @@ def get_interfaces(servers, timeout=10): '''Returns a map of servers to connected interfaces. If any connections fail or timeout, they will be missing from the map. ''' + assert type(servers) is list socket_queue = queue.Queue() config = SimpleConfig() connecting = {} @@ -51,6 +52,9 @@ def get_peers(): peers = {} # 1. get connected interfaces server = config.get('server') + if server is None: + print("You need to set a secure server, for example (for mainnet): 'electrum setconfig server helicarrier.bauerj.eu:50002:s'") + return [] interfaces = get_interfaces([server]) if not interfaces: print("No connection to", server)