diff options
| author | fanquake <fanquake@gmail.com> | 2021-09-23 16:47:23 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-09-23 17:13:02 +0800 |
| commit | 86c3b84388813c9d6cab6031bc36d87a8a169fee (patch) | |
| tree | e97cfcbb4f16c9dc418b942be7da1346d4a0441b /test/functional/rpc_net.py | |
| parent | 8bda5e0988e1e5e2336ad47095b93f136fef5fcf (diff) | |
| parent | b69a106bcd8ddefdb810df6ebb3625c430197e04 (diff) | |
| download | bitcoin-86c3b84388813c9d6cab6031bc36d87a8a169fee.tar.xz | |
Merge bitcoin/bitcoin#23036: test: use test_framework.p2p `P2P_SERVICES` constant in functional tests
b69a106bcd8ddefdb810df6ebb3625c430197e04 test: use test_framework.p2p P2P_SERVICES in functional tests (Jon Atack)
Pull request description:
`P2P_SERVICES` is defined in `test/functional/test_framework/p2p.py`, so we can use it as a single definition for our functional tests. It may also be a tiny bit more efficient to use the constant rather than calculating `NODE_NETWORK | NODE_WITNESS` every time we need it in the tests.
ACKs for top commit:
laanwj:
Code review ACK b69a106bcd8ddefdb810df6ebb3625c430197e04
klementtan:
crACK b69a106bcd8ddefdb810df6ebb3625c430197e04
fanquake:
ACK b69a106bcd8ddefdb810df6ebb3625c430197e04 - didn't look at the formatting changes.
Tree-SHA512: f83e593663a69182986325d9ba2b4b787b87896d6648973f4f802f191a2573201b9e7d7e10e69662ef1965fa63268845726ed1aa5742a2e38dcccf4aebc6a961
Diffstat (limited to 'test/functional/rpc_net.py')
| -rwxr-xr-x | test/functional/rpc_net.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index 3fcca97cb7..0f3bbce54c 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -12,11 +12,10 @@ from itertools import product import time from test_framework.blocktools import COINBASE_MATURITY -from test_framework.p2p import P2PInterface import test_framework.messages -from test_framework.messages import ( - NODE_NETWORK, - NODE_WITNESS, +from test_framework.p2p import ( + P2PInterface, + P2P_SERVICES, ) from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( @@ -189,7 +188,6 @@ class NetTest(BitcoinTestFramework): def test_getnodeaddresses(self): self.log.info("Test getnodeaddresses") self.nodes[0].add_p2p_connection(P2PInterface()) - services = NODE_NETWORK | NODE_WITNESS # Add an IPv6 address to the address manager. ipv6_addr = "1233:3432:2434:2343:3234:2345:6546:4534" @@ -217,7 +215,7 @@ class NetTest(BitcoinTestFramework): assert_greater_than(10000, len(node_addresses)) for a in node_addresses: assert_greater_than(a["time"], 1527811200) # 1st June 2018 - assert_equal(a["services"], services) + assert_equal(a["services"], P2P_SERVICES) assert a["address"] in imported_addrs assert_equal(a["port"], 8333) assert_equal(a["network"], "ipv4") @@ -228,7 +226,7 @@ class NetTest(BitcoinTestFramework): assert_equal(res[0]["address"], ipv6_addr) assert_equal(res[0]["network"], "ipv6") assert_equal(res[0]["port"], 8333) - assert_equal(res[0]["services"], services) + assert_equal(res[0]["services"], P2P_SERVICES) # Test for the absence of onion and I2P addresses. for network in ["onion", "i2p"]: |