Skip to content

Commit

Permalink
qa: Remove never used return value of sync_with_ping
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcoFalke committed Oct 13, 2017
1 parent fa9de37 commit fafa003
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
9 changes: 6 additions & 3 deletions test/functional/p2p-acceptblock.py
Expand Up @@ -103,7 +103,8 @@ def run_test(self):
test_node.send_message(msg_block(blocks_h2[0]))
white_node.send_message(msg_block(blocks_h2[1]))

[ x.sync_with_ping() for x in [test_node, white_node] ]
for x in [test_node, white_node]:
x.sync_with_ping()
assert_equal(self.nodes[0].getblockcount(), 2)
assert_equal(self.nodes[1].getblockcount(), 2)
self.log.info("First height 2 block accepted by both nodes")
Expand All @@ -116,7 +117,8 @@ def run_test(self):
test_node.send_message(msg_block(blocks_h2f[0]))
white_node.send_message(msg_block(blocks_h2f[1]))

[ x.sync_with_ping() for x in [test_node, white_node] ]
for x in [test_node, white_node]:
x.sync_with_ping()
for x in self.nodes[0].getchaintips():
if x['hash'] == blocks_h2f[0].hash:
assert_equal(x['status'], "headers-only")
Expand All @@ -135,7 +137,8 @@ def run_test(self):
test_node.send_message(msg_block(blocks_h3[0]))
white_node.send_message(msg_block(blocks_h3[1]))

[ x.sync_with_ping() for x in [test_node, white_node] ]
for x in [test_node, white_node]:
x.sync_with_ping()
# Since the earlier block was not processed by node0, the new block
# can't be fully validated.
for x in self.nodes[0].getchaintips():
Expand Down
1 change: 0 additions & 1 deletion test/functional/test_framework/mininode.py
Expand Up @@ -1615,7 +1615,6 @@ def sync_with_ping(self, timeout=60):
test_function = lambda: self.last_message.get("pong") and self.last_message["pong"].nonce == self.ping_counter
wait_until(test_function, timeout=timeout, lock=mininode_lock)
self.ping_counter += 1
return True

# The actual NodeConn class
# This class provides an interface for a p2p connection to a specified node
Expand Down

0 comments on commit fafa003

Please sign in to comment.