tfix #1120 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 3c77eeba7db333bfe676725f49ec8a1864a6491c
DIR parent fb699e5294a48f12d32a5a9fb5eb5e847b10bbeb
HTML Author: ThomasV <thomasv@gitorious>
Date: Thu, 2 Apr 2015 12:43:17 +0200
fix #1120
Diffstat:
M scripts/merchant/merchant.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
---
DIR diff --git a/scripts/merchant/merchant.py b/scripts/merchant/merchant.py
t@@ -258,8 +258,8 @@ if __name__ == '__main__':
# start network
c = electrum.SimpleConfig({'wallet_path':wallet_path})
- daemon_socket = electrum.daemon.get_daemon(c,True)
- network = electrum.NetworkProxy(daemon_socket,config)
+ daemon_socket = electrum.daemon.get_daemon(c, True)
+ network = electrum.NetworkProxy(daemon_socket, config)
network.start()
# wait until connected
t@@ -267,7 +267,7 @@ if __name__ == '__main__':
time.sleep(0.1)
if not network.is_connected():
- print_msg("daemon is not connected")
+ print "daemon is not connected"
sys.exit(1)
# create watching_only wallet
t@@ -282,7 +282,6 @@ if __name__ == '__main__':
wallet.start_threads(network)
network.register_callback('updated', on_wallet_update)
-
threading.Thread(target=db_thread, args=()).start()
out_queue = Queue.Queue()