Browse Source

qa: Remove never used return value of sync_with_ping

Github-Pull: #11472
Rebased-From: fafa003970
tags/v0.15.1
MarcoFalke 3 years ago
parent
commit
41088795dd
2 changed files with 6 additions and 4 deletions
  1. 6
    3
      test/functional/p2p-acceptblock.py
  2. 0
    1
      test/functional/test_framework/mininode.py

+ 6
- 3
test/functional/p2p-acceptblock.py View File

@@ -103,7 +103,8 @@ class AcceptBlockTest(BitcoinTestFramework):
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")
@@ -116,7 +117,8 @@ class AcceptBlockTest(BitcoinTestFramework):
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")
@@ -135,7 +137,8 @@ class AcceptBlockTest(BitcoinTestFramework):
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():

+ 0
- 1
test/functional/test_framework/mininode.py View File

@@ -1622,7 +1622,6 @@ class NodeConnCB(object):
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

Loading…
Cancel
Save