AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #1120

Browse Source
This commit is contained in:
ThomasV
2015-04-02 12:43:17 +02:00
parent fb699e5294
commit 3c77eeba7d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/merchant/merchant.py
View File

@@ -258,8 +258,8 @@ if __name__ == '__main__':
# start network # start network
c = electrum.SimpleConfig({'wallet_path':wallet_path}) c = electrum.SimpleConfig({'wallet_path':wallet_path})
daemon_socket = electrum.daemon.get_daemon(c,True) daemon_socket = electrum.daemon.get_daemon(c, True)
network = electrum.NetworkProxy(daemon_socket,config) network = electrum.NetworkProxy(daemon_socket, config)
network.start() network.start()
# wait until connected # wait until connected
@@ -267,7 +267,7 @@ if __name__ == '__main__':
time.sleep(0.1) time.sleep(0.1)
if not network.is_connected(): if not network.is_connected():
print_msg("daemon is not connected") print "daemon is not connected"
sys.exit(1) sys.exit(1)
# create watching_only wallet # create watching_only wallet
@@ -282,7 +282,6 @@ if __name__ == '__main__':
wallet.start_threads(network) wallet.start_threads(network)
network.register_callback('updated', on_wallet_update) network.register_callback('updated', on_wallet_update)
threading.Thread(target=db_thread, args=()).start() threading.Thread(target=db_thread, args=()).start()
out_queue = Queue.Queue() out_queue = Queue.Queue()