net_processing: use CNode::DisconnectMsg helper

This is not a pure refactor:
1. It slightly changes the log messages, as reflected in the test changes
2. It adds the IP address to all disconnect logging (when fLogIPs is set)

test/functional/feature_maxuploadtarget.py

@@ -122,7 +122,7 @@ def run_test(self):
         assert_equal(len(self.nodes[0].getpeerinfo()), 3)
         # At most a couple more tries should succeed (depending on how long
         # the test has been running so far).
-        with self.nodes[0].assert_debug_log(expected_msgs=["historical block serving limit reached, disconnect peer"]):
+        with self.nodes[0].assert_debug_log(expected_msgs=["historical block serving limit reached, disconnecting peer=0"]):
             for _ in range(3):
                 p2p_conns[0].send_message(getdata_request)
             p2p_conns[0].wait_for_disconnect()
@@ -147,7 +147,7 @@ def run_test(self):
 
         # But if p2p_conns[1] tries for an old block, it gets disconnected too.
         getdata_request.inv = [CInv(MSG_BLOCK, big_old_block)]
-        with self.nodes[0].assert_debug_log(expected_msgs=["historical block serving limit reached, disconnect peer"]):
+        with self.nodes[0].assert_debug_log(expected_msgs=["historical block serving limit reached, disconnecting peer=1"]):
             p2p_conns[1].send_message(getdata_request)
             p2p_conns[1].wait_for_disconnect()
         assert_equal(len(self.nodes[0].getpeerinfo()), 1)
@@ -197,7 +197,7 @@ def run_test(self):
         assert_equal(peer_info[0]['permissions'], ['download'])
 
         self.log.info("Peer gets disconnected for a mempool request after limit is reached")
-        with self.nodes[0].assert_debug_log(expected_msgs=["mempool request with bandwidth limit reached, disconnect peer"]):
+        with self.nodes[0].assert_debug_log(expected_msgs=["mempool request with bandwidth limit reached, disconnecting peer=0"]):
             peer.send_message(msg_mempool())
             peer.wait_for_disconnect()
 

test/functional/p2p_addrv2_relay.py

@@ -78,7 +78,7 @@ def set_test_params(self):
     def run_test(self):
         self.log.info('Check disconnection when sending sendaddrv2 after verack')
         conn = self.nodes[0].add_p2p_connection(P2PInterface())
-        with self.nodes[0].assert_debug_log(['sendaddrv2 received after verack from peer=0; disconnecting']):
+        with self.nodes[0].assert_debug_log(['sendaddrv2 received after verack, disconnecting peer=0']):
             conn.send_message(msg_sendaddrv2())
             conn.wait_for_disconnect()
 

test/functional/p2p_leak.py

@@ -172,7 +172,7 @@ def run_test(self):
 
         self.log.info('Check that old peers are disconnected')
         p2p_old_peer = self.nodes[0].add_p2p_connection(P2PInterface(), send_version=False, wait_for_verack=False)
-        with self.nodes[0].assert_debug_log(["using obsolete version 31799; disconnecting"]):
+        with self.nodes[0].assert_debug_log(["using obsolete version 31799, disconnecting peer=5"]):
             p2p_old_peer.send_message(self.create_old_version(31799))
             p2p_old_peer.wait_for_disconnect()
 

test/functional/p2p_sendtxrcncl.py

@@ -168,7 +168,7 @@ def run_test(self):
         with self.nodes[0].assert_debug_log(["received: sendtxrcncl"]):
             peer.send_message(create_sendtxrcncl_msg())
         self.log.info('second SENDTXRCNCL triggers a disconnect')
-        with self.nodes[0].assert_debug_log(["(sendtxrcncl received from already registered peer); disconnecting"]):
+        with self.nodes[0].assert_debug_log(["(sendtxrcncl received from already registered peer), disconnecting peer=0"]):
             peer.send_message(create_sendtxrcncl_msg())
             peer.wait_for_disconnect()
 
@@ -226,7 +226,7 @@ def run_test(self):
         self.log.info('SENDTXRCNCL if block-relay-only triggers a disconnect')
         peer = self.nodes[0].add_outbound_p2p_connection(
             PeerNoVerack(), wait_for_verack=False, p2p_idx=0, connection_type="block-relay-only")
-        with self.nodes[0].assert_debug_log(["we indicated no tx relay; disconnecting"]):
+        with self.nodes[0].assert_debug_log(["we indicated no tx relay, disconnecting peer=5"]):
             peer.send_message(create_sendtxrcncl_msg())
             peer.wait_for_disconnect()
 

test/functional/p2p_timeouts.py

@@ -66,7 +66,7 @@ def run_test(self):
         assert no_version_node.is_connected
         assert no_send_node.is_connected
 
-        with self.nodes[0].assert_debug_log(['Unsupported message "ping" prior to verack from peer=0']):
+        with self.nodes[0].assert_debug_log(['Unsupported message "ping" prior to verack, disconnecting peer=0']):
             no_verack_node.send_message(msg_ping())
 
         with self.nodes[0].assert_debug_log(['non-version message before version handshake. Message "ping" from peer=1']):