Merge bitcoin#23036: test: use test_framework.p2p P2P_SERVICES constant in functional tests

b69a106 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 b69a106
  klementtan:
    crACK b69a106
  fanquake:
    ACK b69a106 - didn't look at the formatting changes.

Tree-SHA512: f83e593663a69182986325d9ba2b4b787b87896d6648973f4f802f191a2573201b9e7d7e10e69662ef1965fa63268845726ed1aa5742a2e38dcccf4aebc6a961

Author: fanquake

test/functional/p2p_addr_relay.py

@@ -10,20 +10,20 @@
 
 from test_framework.messages import (
     CAddress,
-    NODE_NETWORK,
     msg_addr,
     msg_getaddr,
-    msg_verack
+    msg_verack,
 )
 from test_framework.p2p import (
     P2PInterface,
     p2p_lock,
+    P2P_SERVICES,
 )
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
     assert_greater_than,
-    assert_greater_than_or_equal
+    assert_greater_than_or_equal,
 )
 
 ONE_MINUTE  = 60
@@ -51,7 +51,7 @@ def on_addr(self, message):
             if(self.test_addr_contents):
                 # relay_tests checks the content of the addr messages match
                 # expectations based on the message creation in setup_addr_msg
-                assert_equal(addr.nServices, 1)
+                assert_equal(addr.nServices, 2049)
                 if not 8333 <= addr.port < 8343:
                     raise AssertionError("Invalid addr.port of {} (8333-8342 expected)".format(addr.port))
                 assert addr.ip.startswith('123.123.')
@@ -109,7 +109,7 @@ def setup_addr_msg(self, num, sequential_ips=True):
         for i in range(num):
             addr = CAddress()
             addr.time = self.mocktime + random.randrange(-100, 100)
-            addr.nServices = NODE_NETWORK
+            addr.nServices = P2P_SERVICES
             if sequential_ips:
                 assert self.counter < 256 ** 2  # Don't allow the returned ip addresses to wrap.
                 addr.ip = f"123.123.{self.counter // 256}.{self.counter % 256}"

test/functional/p2p_addrfetch.py

@@ -8,14 +8,21 @@
 
 import time
 
-from test_framework.messages import msg_addr, CAddress, NODE_NETWORK
-from test_framework.p2p import P2PInterface, p2p_lock
+from test_framework.messages import (
+    CAddress,
+    msg_addr,
+)
+from test_framework.p2p import (
+    P2PInterface,
+    p2p_lock,
+    P2P_SERVICES,
+)
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 
 ADDR = CAddress()
 ADDR.time = int(time.time())
-ADDR.nServices = NODE_NETWORK
+ADDR.nServices = P2P_SERVICES
 ADDR.ip = "192.0.0.8"
 ADDR.port = 18444
 

test/functional/p2p_addrv2_relay.py

@@ -11,9 +11,11 @@
 from test_framework.messages import (
     CAddress,
     msg_addrv2,
-    NODE_NETWORK,
 )
-from test_framework.p2p import P2PInterface
+from test_framework.p2p import (
+    P2PInterface,
+    P2P_SERVICES,
+)
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 
@@ -42,7 +44,7 @@ def calc_addrv2_msg_size(addrs):
     size = 1  # vector length byte
     for addr in addrs:
         size += 4  # time
-        size += 1  # services, COMPACTSIZE(P2P_SERVICES)
+        size += 3  # services, COMPACTSIZE(P2P_SERVICES)
         size += 1  # network id
         size += 1  # address length byte
         size += addr.ADDRV2_ADDRESS_LENGTH[addr.net]  # address
@@ -60,7 +62,7 @@ def run_test(self):
             addr = CAddress()
             addr.time = int(self.mocktime) + i
             addr.port = 8333 + i
-            addr.nServices = NODE_NETWORK
+            addr.nServices = P2P_SERVICES
             # Add one I2P and one onion V3 address at an arbitrary position.
             if i == 5:
                 addr.net = addr.NET_I2P

test/functional/rpc_net.py

@@ -7,11 +7,12 @@
 Tests correspond to code in rpc/net.cpp.
 """
 
-from test_framework.p2p import P2PInterface
 import test_framework.messages
 from test_framework.messages import (
     MAX_PROTOCOL_MESSAGE_LENGTH,
-    NODE_NETWORK,
+)
+from test_framework.p2p import (
+    P2PInterface,
 )
 
 from itertools import product
@@ -270,7 +271,6 @@ def test_service_flags(self):
     def test_getnodeaddresses(self):
         self.log.info("Test getnodeaddresses")
         self.nodes[0].add_p2p_connection(P2PInterface())
-        services = NODE_NETWORK
 
         # Add an IPv6 address to the address manager.
         ipv6_addr = "1233:3432:2434:2343:3234:2345:6546:4534"
@@ -298,7 +298,7 @@ def test_getnodeaddresses(self):
         assert_greater_than(10000, len(node_addresses))
         for a in node_addresses:
             assert_equal(a["time"], self.mocktime)
-            assert_equal(a["services"], services)
+            assert_equal(a["services"], 1)
             assert a["address"] in imported_addrs
             assert_equal(a["port"], 8333)
             assert_equal(a["network"], "ipv4")
@@ -309,7 +309,7 @@ def test_getnodeaddresses(self):
         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"], 1)
 
         # Test for the absence of onion, I2P and CJDNS addresses.
         for network in ["onion", "i2p", "cjdns"]:

test/functional/test_framework/p2p.py

@@ -540,7 +540,7 @@ def peer_connect(self, *, services=P2P_SERVICES, send_version, **kwargs):
 
         return create_conn
 
-    def peer_accept_connection(self, *args, services=NODE_NETWORK | NODE_HEADERS_COMPRESSED, **kwargs):
+    def peer_accept_connection(self, *args, services=P2P_SERVICES, **kwargs):
         create_conn = super().peer_accept_connection(*args, **kwargs)
         self.peer_connect_send_version(services)