Skip to content

Commit 57529ac

Browse files
committed
test: set P2PConnection.p2p_connected_to_node in peer_connect_helper()
Set `P2PConnection.p2p_connected_to_node` in `P2PConnection.peer_connect_helper()` instead of `TestNode.add_p2p_connection()` and `TestNode.add_outbound_p2p_connection()`. This way tests can create an instance of `P2PConnection` and use `P2PConnection.peer_connect_helper()` directly.
1 parent 22cd0e8 commit 57529ac

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

test/functional/test_framework/p2p.py

+1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ def peer_connect_helper(self, dstaddr, dstport, net, timeout_factor):
188188
self.on_connection_send_msg = None
189189
self.recvbuf = b""
190190
self.magic_bytes = MAGIC_BYTES[net]
191+
self.p2p_connected_to_node = dstport != 0
191192

192193
def peer_connect(self, dstaddr, dstport, *, net, timeout_factor, supports_v2_p2p):
193194
self.peer_connect_helper(dstaddr, dstport, net, timeout_factor)

test/functional/test_framework/test_node.py

-2
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,6 @@ def add_p2p_connection(self, p2p_conn, *, wait_for_verack=True, send_version=Tru
714714
if supports_v2_p2p is None:
715715
supports_v2_p2p = self.use_v2transport
716716

717-
p2p_conn.p2p_connected_to_node = True
718717
if self.use_v2transport:
719718
kwargs['services'] = kwargs.get('services', P2P_SERVICES) | NODE_P2P_V2
720719
supports_v2_p2p = self.use_v2transport and supports_v2_p2p
@@ -781,7 +780,6 @@ def addconnection_callback(address, port):
781780
self.log.debug("Connecting to %s:%d %s" % (address, port, connection_type))
782781
self.addconnection('%s:%d' % (address, port), connection_type, advertise_v2_p2p)
783782

784-
p2p_conn.p2p_connected_to_node = False
785783
if supports_v2_p2p is None:
786784
supports_v2_p2p = self.use_v2transport
787785
if advertise_v2_p2p is None:

0 commit comments

Comments
 (0)