Skip to content

Commit d2dbfe6

Browse files
[test] Extract sending an addr message into a helper
Also reduces mocktime to prevent idle disconnects Co-Authored-By: Martin Zumsande <[email protected]>
1 parent c991943 commit d2dbfe6

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

test/functional/p2p_addr_relay.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ def setup_addr_msg(self, num):
5858
msg.addrs = addrs
5959
return msg
6060

61+
def send_addr_msg(self, source, msg, receivers):
62+
source.send_and_ping(msg)
63+
# pop m_next_addr_send timer
64+
self.mocktime += 5 * 60
65+
self.nodes[0].setmocktime(self.mocktime)
66+
for peer in receivers:
67+
peer.sync_with_ping()
68+
6169
def oversized_addr_test(self):
6270
self.log.info('Send an addr message that is too large')
6371
addr_source = self.nodes[0].add_p2p_connection(P2PInterface())
@@ -86,11 +94,7 @@ def relay_tests(self):
8694
'received: addr (301 bytes) peer=1',
8795
]
8896
):
89-
addr_source.send_and_ping(msg)
90-
self.mocktime += 30 * 60
91-
self.nodes[0].setmocktime(self.mocktime)
92-
for receiver in receivers:
93-
receiver.sync_with_ping()
97+
self.send_addr_msg(addr_source, msg, receivers)
9498

9599
total_ipv4_received = sum(r.num_ipv4_received for r in receivers)
96100

0 commit comments

Comments
 (0)