highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-02 16:59:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: hoist proxy out of 2 network loops in feature_proxy.py

Browse Source
This commit is contained in:
Jon Atack
2022-01-30 22:48:37 +01:00
parent afdf2de282
commit bd57dcbaf2
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/functional/feature_proxy.py
View File

@@ -263,12 +263,13 @@ class ProxyTest(BitcoinTestFramework):
n2 = networks_dict(self.nodes[2].getnetworkinfo()) n2 = networks_dict(self.nodes[2].getnetworkinfo())
assert_equal(NETWORKS, n2.keys()) assert_equal(NETWORKS, n2.keys())
proxy = f'{self.conf2.addr[0]}:{self.conf2.addr[1]}'
for net in NETWORKS: for net in NETWORKS:
if net == NET_I2P: if net == NET_I2P:
expected_proxy = '' expected_proxy = ''
expected_randomize = False expected_randomize = False
else: else:
expected_proxy = f'{self.conf2.addr[0]}:{self.conf2.addr[1]}' expected_proxy = proxy
expected_randomize = True expected_randomize = True
assert_equal(n2[net]['proxy'], expected_proxy) assert_equal(n2[net]['proxy'], expected_proxy)
assert_equal(n2[net]['proxy_randomize_credentials'], expected_randomize) assert_equal(n2[net]['proxy_randomize_credentials'], expected_randomize)
@@ -279,11 +280,9 @@ class ProxyTest(BitcoinTestFramework):
if self.have_ipv6: if self.have_ipv6:
n3 = networks_dict(self.nodes[3].getnetworkinfo()) n3 = networks_dict(self.nodes[3].getnetworkinfo())
assert_equal(NETWORKS, n3.keys()) assert_equal(NETWORKS, n3.keys())
proxy = f'[{self.conf3.addr[0]}]:{self.conf3.addr[1]}'
for net in NETWORKS: for net in NETWORKS:
if net == NET_I2P or net == NET_ONION: expected_proxy = '' if net == NET_I2P or net == NET_ONION else proxy
expected_proxy = ''
else:
expected_proxy = f'[{self.conf3.addr[0]}]:{self.conf3.addr[1]}'
assert_equal(n3[net]['proxy'], expected_proxy) assert_equal(n3[net]['proxy'], expected_proxy)
assert_equal(n3[net]['proxy_randomize_credentials'], False) assert_equal(n3[net]['proxy_randomize_credentials'], False)
assert_equal(n3['onion']['reachable'], False) assert_equal(n3['onion']['reachable'], False)