Skip to content

Commit 1b241a2

Browse files
committed
merge bitcoin#23392: move check_node_connections to util
1 parent f6fa0c0 commit 1b241a2

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

test/functional/feature_anchors.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,12 @@
88

99
from test_framework.p2p import P2PInterface
1010
from test_framework.test_framework import BitcoinTestFramework
11-
from test_framework.util import assert_equal
11+
from test_framework.util import check_node_connections
1212

1313
INBOUND_CONNECTIONS = 5
1414
BLOCK_RELAY_CONNECTIONS = 2
1515

1616

17-
def check_node_connections(*, node, num_in, num_out):
18-
info = node.getnetworkinfo()
19-
assert_equal(info["connections_in"], num_in)
20-
assert_equal(info["connections_out"], num_out)
21-
22-
2317
class AnchorsTest(BitcoinTestFramework):
2418
def set_test_params(self):
2519
self.num_nodes = 1

test/functional/p2p_add_connections.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@
66

77
from test_framework.p2p import P2PInterface
88
from test_framework.test_framework import BitcoinTestFramework
9-
from test_framework.util import assert_equal
10-
11-
12-
def check_node_connections(*, node, num_in, num_out):
13-
info = node.getnetworkinfo()
14-
assert_equal(info["connections_in"], num_in)
15-
assert_equal(info["connections_out"], num_out)
9+
from test_framework.util import check_node_connections
1610

1711

1812
class P2PAddConnections(BitcoinTestFramework):

test/functional/test_framework/util.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ def wait_until_helper(predicate, *, attempts=float('inf'), timeout=float('inf'),
264264
else:
265265
return False
266266

267+
267268
def sha256sum_file(filename):
268269
h = hashlib.sha256()
269270
with open(filename, 'rb') as f:
@@ -479,6 +480,11 @@ def set_node_times(nodes, t):
479480
node.mocktime = t
480481
node.setmocktime(t)
481482

483+
def check_node_connections(*, node, num_in, num_out):
484+
info = node.getnetworkinfo()
485+
assert_equal(info["connections_in"], num_in)
486+
assert_equal(info["connections_out"], num_out)
487+
482488

483489
def force_finish_mnsync(node):
484490
"""

0 commit comments

Comments
 (0)