From 753a28b452dca1023fbde548469c36a34555dc95 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sun, 20 Mar 2016 13:25:24 +0100 Subject: [PATCH] set timeout to 30s for synchronous operations --- lib/commands.py | 2 +- lib/network.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/commands.py b/lib/commands.py index cfbc83cc9..776b1c79b 100644 --- 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 index cafcea486..226fe784e 100644 --- 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)