From d2dbfe6ff1806e5248399b28a7a1a22dab726c40 Mon Sep 17 00:00:00 2001 From: Amiti Uttarwar Date: Tue, 30 Mar 2021 13:15:30 -0700 Subject: [PATCH] [test] Extract sending an addr message into a helper Also reduces mocktime to prevent idle disconnects Co-Authored-By: Martin Zumsande --- test/functional/p2p_addr_relay.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py index b728ed428bc..4d7ad2eb107 100755 --- a/test/functional/p2p_addr_relay.py +++ b/test/functional/p2p_addr_relay.py @@ -58,6 +58,14 @@ class AddrTest(BitcoinTestFramework): msg.addrs = addrs return msg + def send_addr_msg(self, source, msg, receivers): + source.send_and_ping(msg) + # pop m_next_addr_send timer + self.mocktime += 5 * 60 + self.nodes[0].setmocktime(self.mocktime) + for peer in receivers: + peer.sync_with_ping() + def oversized_addr_test(self): self.log.info('Send an addr message that is too large') addr_source = self.nodes[0].add_p2p_connection(P2PInterface()) @@ -86,11 +94,7 @@ class AddrTest(BitcoinTestFramework): 'received: addr (301 bytes) peer=1', ] ): - addr_source.send_and_ping(msg) - self.mocktime += 30 * 60 - self.nodes[0].setmocktime(self.mocktime) - for receiver in receivers: - receiver.sync_with_ping() + self.send_addr_msg(addr_source, msg, receivers) total_ipv4_received = sum(r.num_ipv4_received for r in receivers)