Skip to content

Commit 012b0b7

Browse files
MarcoFalkePastaPastaPasta
authored andcommitted
Merge 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
1 parent c67f527 commit 012b0b7

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
@@ -237,7 +237,15 @@ def networks_dict(d):
237237
return r
238238

239239
self.log.info("Test RPC getnetworkinfo")
240-
n0 = networks_dict(self.nodes[0].getnetworkinfo())
240+
nodes_network_info = []
241+
242+
self.log.debug("Test that setting -proxy disables local address discovery, i.e. -discover=0")
243+
for node in self.nodes:
244+
network_info = node.getnetworkinfo()
245+
assert_equal(network_info["localaddresses"], [])
246+
nodes_network_info.append(network_info)
247+
248+
n0 = networks_dict(nodes_network_info[0])
241249
assert_equal(NETWORKS, n0.keys())
242250
for net in NETWORKS:
243251
if net == NET_I2P:
@@ -252,7 +260,7 @@ def networks_dict(d):
252260
assert_equal(n0['i2p']['reachable'], False)
253261
assert_equal(n0['cjdns']['reachable'], False)
254262

255-
n1 = networks_dict(self.nodes[1].getnetworkinfo())
263+
n1 = networks_dict(nodes_network_info[1])
256264
assert_equal(NETWORKS, n1.keys())
257265
for net in ['ipv4', 'ipv6']:
258266
assert_equal(n1[net]['proxy'], f'{self.conf1.addr[0]}:{self.conf1.addr[1]}')
@@ -264,7 +272,7 @@ def networks_dict(d):
264272
assert_equal(n1['i2p']['proxy_randomize_credentials'], False)
265273
assert_equal(n1['i2p']['reachable'], True)
266274

267-
n2 = networks_dict(self.nodes[2].getnetworkinfo())
275+
n2 = networks_dict(nodes_network_info[2])
268276
assert_equal(NETWORKS, n2.keys())
269277
proxy = f'{self.conf2.addr[0]}:{self.conf2.addr[1]}'
270278
for net in NETWORKS:
@@ -281,7 +289,7 @@ def networks_dict(d):
281289
assert_equal(n2['cjdns']['reachable'], False)
282290

283291
if self.have_ipv6:
284-
n3 = networks_dict(self.nodes[3].getnetworkinfo())
292+
n3 = networks_dict(nodes_network_info[3])
285293
assert_equal(NETWORKS, n3.keys())
286294
proxy = f'[{self.conf3.addr[0]}]:{self.conf3.addr[1]}'
287295
for net in NETWORKS:
@@ -292,7 +300,7 @@ def networks_dict(d):
292300
assert_equal(n3['i2p']['reachable'], False)
293301
assert_equal(n3['cjdns']['reachable'], False)
294302

295-
n4 = networks_dict(self.nodes[4].getnetworkinfo())
303+
n4 = networks_dict(nodes_network_info[4])
296304
assert_equal(NETWORKS, n4.keys())
297305
for net in NETWORKS:
298306
if net == NET_I2P:

0 commit comments

Comments
 (0)