Skip to content

Commit 88709e9

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24258: test: check localaddresses in getnetworkinfo for nodes with proxy
89bb25d test: check localaddresses in getnetworkinfo for nodes with proxy (brunoerg) Pull request description: This PR adds test coverage for the field `localaddresses` for `getnetworkinfo`. In this case, it verifies if this field is empty for all nodes since they are using proxy. Reference: https://github.com/bitcoin/bitcoin/blob/515200298b555845696a07ae2bc0a84a5dd02ae4/src/init.cpp#L449 ACKs for top commit: jonatack: ACK 89bb25d Tree-SHA512: 3c765c7060b6972c1ae5a1104734cd7669b650b5f6aa4f623f4299567732260da5083fef306a7c1e71c931f5d1396f24abad251d95c3d82b1f3ee0efee7fcd1f
2 parents 3d2f24b + 89bb25d commit 88709e9

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

test/functional/feature_proxy.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,15 @@ def networks_dict(d):
239239
return r
240240

241241
self.log.info("Test RPC getnetworkinfo")
242-
n0 = networks_dict(self.nodes[0].getnetworkinfo())
242+
nodes_network_info = []
243+
244+
self.log.debug("Test that setting -proxy disables local address discovery, i.e. -discover=0")
245+
for node in self.nodes:
246+
network_info = node.getnetworkinfo()
247+
assert_equal(network_info["localaddresses"], [])
248+
nodes_network_info.append(network_info)
249+
250+
n0 = networks_dict(nodes_network_info[0])
243251
assert_equal(NETWORKS, n0.keys())
244252
for net in NETWORKS:
245253
if net == NET_I2P:
@@ -254,7 +262,7 @@ def networks_dict(d):
254262
assert_equal(n0['i2p']['reachable'], False)
255263
assert_equal(n0['cjdns']['reachable'], False)
256264

257-
n1 = networks_dict(self.nodes[1].getnetworkinfo())
265+
n1 = networks_dict(nodes_network_info[1])
258266
assert_equal(NETWORKS, n1.keys())
259267
for net in ['ipv4', 'ipv6']:
260268
assert_equal(n1[net]['proxy'], f'{self.conf1.addr[0]}:{self.conf1.addr[1]}')
@@ -266,7 +274,7 @@ def networks_dict(d):
266274
assert_equal(n1['i2p']['proxy_randomize_credentials'], False)
267275
assert_equal(n1['i2p']['reachable'], True)
268276

269-
n2 = networks_dict(self.nodes[2].getnetworkinfo())
277+
n2 = networks_dict(nodes_network_info[2])
270278
assert_equal(NETWORKS, n2.keys())
271279
proxy = f'{self.conf2.addr[0]}:{self.conf2.addr[1]}'
272280
for net in NETWORKS:
@@ -283,7 +291,7 @@ def networks_dict(d):
283291
assert_equal(n2['cjdns']['reachable'], False)
284292

285293
if self.have_ipv6:
286-
n3 = networks_dict(self.nodes[3].getnetworkinfo())
294+
n3 = networks_dict(nodes_network_info[3])
287295
assert_equal(NETWORKS, n3.keys())
288296
proxy = f'[{self.conf3.addr[0]}]:{self.conf3.addr[1]}'
289297
for net in NETWORKS:
@@ -294,7 +302,7 @@ def networks_dict(d):
294302
assert_equal(n3['i2p']['reachable'], False)
295303
assert_equal(n3['cjdns']['reachable'], False)
296304

297-
n4 = networks_dict(self.nodes[4].getnetworkinfo())
305+
n4 = networks_dict(nodes_network_info[4])
298306
assert_equal(NETWORKS, n4.keys())
299307
for net in NETWORKS:
300308
if net == NET_I2P:

0 commit comments

Comments
 (0)