diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-10-11 22:14:49 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-11-01 15:23:06 -0400 |
| commit | 41088795dd9a1c90bb379b2d5237d88ae8889c90 (patch) | |
| tree | 118bf80a3a71222f2dba01e594ce834bbd0cf17e | |
| parent | f3457d0e83c408770eeabb002f569e22c9832c1b (diff) | |
| download | bitcoin-41088795dd9a1c90bb379b2d5237d88ae8889c90.tar.xz | |
qa: Remove never used return value of sync_with_ping
Github-Pull: #11472
Rebased-From: fafa0039708e15d1067be091b2bfc10195afa480
| -rwxr-xr-x | test/functional/p2p-acceptblock.py | 9 | ||||
| -rwxr-xr-x | test/functional/test_framework/mininode.py | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/functional/p2p-acceptblock.py b/test/functional/p2p-acceptblock.py index 5b6429b410..6c7e6a22ec 100755 --- a/test/functional/p2p-acceptblock.py +++ b/test/functional/p2p-acceptblock.py @@ -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(): diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 843b67cd5c..dc8731066b 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -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 |