mirror of
https://github.com/kvazar-network/kevacoin.git
synced 2025-01-24 05:44:30 +00:00
Tests: add timeout to sync_blocks() and sync_mempools()
Previously these functions would infinitely loop if sync failed; now they have a default timeout of 60 seconds, after which an AssertionError is raised. sync_blocks() has also been improved and now compares the tip hash of each node, rather than just using block count.
This commit is contained in:
parent
425278d17b
commit
e871f8338a
@ -121,30 +121,34 @@ def hex_str_to_bytes(hex_str):
|
|||||||
def str_to_b64str(string):
|
def str_to_b64str(string):
|
||||||
return b64encode(string.encode('utf-8')).decode('ascii')
|
return b64encode(string.encode('utf-8')).decode('ascii')
|
||||||
|
|
||||||
def sync_blocks(rpc_connections, wait=1):
|
def sync_blocks(rpc_connections, wait=1, timeout=60):
|
||||||
"""
|
"""
|
||||||
Wait until everybody has the same block count
|
Wait until everybody has the same tip
|
||||||
"""
|
"""
|
||||||
while True:
|
while timeout > 0:
|
||||||
counts = [ x.getblockcount() for x in rpc_connections ]
|
tips = [ x.getbestblockhash() for x in rpc_connections ]
|
||||||
if counts == [ counts[0] ]*len(counts):
|
if tips == [ tips[0] ]*len(tips):
|
||||||
break
|
return True
|
||||||
time.sleep(wait)
|
time.sleep(wait)
|
||||||
|
timeout -= wait
|
||||||
|
raise AssertionError("Block sync failed")
|
||||||
|
|
||||||
def sync_mempools(rpc_connections, wait=1):
|
def sync_mempools(rpc_connections, wait=1, timeout=60):
|
||||||
"""
|
"""
|
||||||
Wait until everybody has the same transactions in their memory
|
Wait until everybody has the same transactions in their memory
|
||||||
pools
|
pools
|
||||||
"""
|
"""
|
||||||
while True:
|
while timeout > 0:
|
||||||
pool = set(rpc_connections[0].getrawmempool())
|
pool = set(rpc_connections[0].getrawmempool())
|
||||||
num_match = 1
|
num_match = 1
|
||||||
for i in range(1, len(rpc_connections)):
|
for i in range(1, len(rpc_connections)):
|
||||||
if set(rpc_connections[i].getrawmempool()) == pool:
|
if set(rpc_connections[i].getrawmempool()) == pool:
|
||||||
num_match = num_match+1
|
num_match = num_match+1
|
||||||
if num_match == len(rpc_connections):
|
if num_match == len(rpc_connections):
|
||||||
break
|
return True
|
||||||
time.sleep(wait)
|
time.sleep(wait)
|
||||||
|
timeout -= wait
|
||||||
|
raise AssertionError("Mempool sync failed")
|
||||||
|
|
||||||
bitcoind_processes = {}
|
bitcoind_processes = {}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user