Skip to content

Commit df609a3

Browse files
committed
Merge bitcoin/bitcoin#29699: test: check disconnection when sending sendaddrv2 after verack
b4c9ace test: check disconnection when sending sendaddrv2 after verack (brunoerg) Pull request description: This PR adds test coverage for: https://github.com/bitcoin/bitcoin/blob/71b63195b30b2fa0dff20ebb262ce7566dd5d673/src/net_processing.cpp#L3796-L3807 ACKs for top commit: maflcko: lgtm ACK b4c9ace byaye: Tested ACK b4c9ace Tree-SHA512: 2ad49a269cb64794b8d626941cf532acafdbe6e97f3da5ccb52f3201a6773d2f5e3d7d62ce4289334b85d578790d4dd5833f6b8ba54bd49a8418a20aee0c3e5f
2 parents 22c8614 + b4c9ace commit df609a3

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

test/functional/p2p_addrv2_relay.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from test_framework.messages import (
1212
CAddress,
1313
msg_addrv2,
14+
msg_sendaddrv2,
1415
)
1516
from test_framework.p2p import (
1617
P2PInterface,
@@ -75,6 +76,12 @@ def set_test_params(self):
7576
self.extra_args = [["-whitelist=addr@127.0.0.1"]]
7677

7778
def run_test(self):
79+
self.log.info('Check disconnection when sending sendaddrv2 after verack')
80+
conn = self.nodes[0].add_p2p_connection(P2PInterface())
81+
with self.nodes[0].assert_debug_log(['sendaddrv2 received after verack from peer=0; disconnecting']):
82+
conn.send_message(msg_sendaddrv2())
83+
conn.wait_for_disconnect()
84+
7885
self.log.info('Create connection that sends addrv2 messages')
7986
addr_source = self.nodes[0].add_p2p_connection(P2PInterface())
8087
msg = msg_addrv2()
@@ -89,8 +96,8 @@ def run_test(self):
8996
msg.addrs = ADDRS
9097
msg_size = calc_addrv2_msg_size(ADDRS)
9198
with self.nodes[0].assert_debug_log([
92-
f'received: addrv2 ({msg_size} bytes) peer=0',
93-
f'sending addrv2 ({msg_size} bytes) peer=1',
99+
f'received: addrv2 ({msg_size} bytes) peer=1',
100+
f'sending addrv2 ({msg_size} bytes) peer=2',
94101
]):
95102
addr_source.send_and_ping(msg)
96103
self.nodes[0].setmocktime(int(time.time()) + 30 * 60)

0 commit comments

Comments
 (0)