electrum

commit 753a28b452dca1023fbde548469c36a34555dc95
parent 67145e053b5c71a5379411bbd2c83394329b5d65
Author: ThomasV <thomasv@electrum.org>
Date:   Sun, 20 Mar 2016 13:25:24 +0100

set timeout to 30s for synchronous operations

Diffstat:
M
lib/commands.py
 | 
2
+-
M
lib/network.py
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/commands.py b/lib/commands.py
@@ -231,7 +231,7 @@ class Commands:
         return tx.deserialize()
 
     @command('n')
-    def broadcast(self, tx, timeout=10):
+    def broadcast(self, tx, timeout=30):
         """Broadcast a transaction to the network. """
         return self.network.broadcast(tx, timeout)
 
diff --git a/lib/network.py b/lib/network.py
@@ -821,7 +821,7 @@ class Network(util.DaemonThread):
     def get_local_height(self):
         return self.blockchain.height()
 
-    def synchronous_get(self, request, timeout=100000000):
+    def synchronous_get(self, request, timeout=30):
         queue = Queue.Queue()
         self.send([request], queue.put)
         try:
@@ -832,7 +832,7 @@ class Network(util.DaemonThread):
             raise BaseException(r.get('error'))
         return r.get('result')
 
-    def broadcast(self, tx, timeout=10):
+    def broadcast(self, tx, timeout=30):
         tx_hash = tx.hash()
         try:
             out = self.synchronous_get(('blockchain.transaction.broadcast', [str(tx)]), timeout)