diff --git a/test/functional/p2p_compactblocks.py b/test/functional/p2p_compactblocks.py --- a/test/functional/p2p_compactblocks.py +++ b/test/functional/p2p_compactblocks.py @@ -744,20 +744,20 @@ block, _ = self.build_block_with_transactions(node, utxo, 10) - [l.clear_block_announcement() for l in listeners] + [listener.clear_block_announcement() for listener in listeners] node.submitblock(ToHex(block)) - for l in listeners: - wait_until(lambda: l.received_block_announcement(), + for listener in listeners: + wait_until(lambda: listener.received_block_announcement(), timeout=30, lock=mininode_lock) with mininode_lock: - for l in listeners: - assert "cmpctblock" in l.last_message - l.last_message["cmpctblock"].header_and_shortids.header.calc_sha256( + for listener in listeners: + assert "cmpctblock" in listener.last_message + listener.last_message["cmpctblock"].header_and_shortids.header.calc_sha256( ) assert_equal( - l.last_message["cmpctblock"].header_and_shortids.header.sha256, block.sha256) + listener.last_message["cmpctblock"].header_and_shortids.header.sha256, block.sha256) # Test that we don't get disconnected if we relay a compact block with valid header, # but invalid transactions. diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -74,16 +74,16 @@ return sha256(sha256(s)) -def ser_compact_size(l): +def ser_compact_size(size): r = b"" - if l < 253: - r = struct.pack("B", l) - elif l < 0x10000: - r = struct.pack("