test: soft attachment to waku.test

src/env_vars.py

@@ -32,5 +32,21 @@ RLN_CREDENTIALS = get_env_var("RLN_CREDENTIALS")
 PG_USER = get_env_var("POSTGRES_USER", "postgres")
 PG_PASS = get_env_var("POSTGRES_PASSWORD", "test123")
 
+# ---------------------------------------------------------------------------
+# waku.test fleet node configuration - local+fleet
+# ---------------------------------------------------------------------------
+# Activate fleet bootstrap by passing --fleet to pytest or setting
+# FLEET_BOOTSTRAP=true. See tests/conftest.py for details.
+FLEET_NODES = [
+    # Amsterdam
+    "/dns4/node-01.do-ams3.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W",
+    # US Central
+    "/dns4/node-01.gc-us-central1-a.waku.test.status.im/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG",
+    # Hong Kong
+    "/dns4/node-01.ac-cn-hongkong-c.waku.test.status.im/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp",
+]
+FLEET_PRIMARY_MULTIADDR = FLEET_NODES[0]
+FLEET_DNS_DISCOVERY_URL = "enrtree://AOGYWMBYOUIMOENHXCHILPKY3ZRFEULMFI4DOM442QSZ73TT2A7VI@test.waku.nodes.status.im"
+
 # example for .env file
 # RLN_CREDENTIALS = {"rln-relay-cred-password": "password", "rln-relay-eth-client-address": "https://rpc.sepolia.linea.build",  "rln-relay-eth-contract-address": "0xB9cd878C90E49F797B4431fBF4fb333108CB90e6",  "rln-relay-eth-private-key-1": "",  "rln-relay-eth-private-key-2": "", "rln-relay-eth-private-key-3": "", "rln-relay-eth-private-key-4": "", "rln-relay-eth-private-key-5": ""}

tests/conftest.py

@@ -1,4 +1,31 @@
 # -*- coding: utf-8 -*-
+"""
+Root pytest configuration for the logos-delivery interop test suite.
+
+Fleet bootstrap – hybrid local+fleet
+--------------------------------------------------
+Every local Docker node spawned by a test is patched at start() time so
+that it:
+
+  1. Connects directly to node-01.do-ams3.waku.test.status.im:30303 as a
+     static peer (TCP reachability confirmed via ``nc -vz``).
+  2. Discovers all remaining waku.test fleet peers through the published ENR
+     DNS tree (dns-discovery-url).
+
+This makes each local nwaku container a genuine member of the live waku.test
+network for the duration of the test.  Local nodes still relay test messages
+among themselves (using their own cluster-id / shard topics), while fleet
+nodes participate in peer-exchange and discv5 routing.
+
+Fleet node information (addresses, peer IDs, ENR tree URL) is stored in
+``src/env_vars.py`` (FLEET_NODES, FLEET_PRIMARY_MULTIADDR,
+FLEET_DNS_DISCOVERY_URL)
+
+Activation (opt-in, disabled by default):
+  pytest <any-test-path> --fleet -v
+  FLEET_BOOTSTRAP=true pytest <any-test-path> -v
+
+"""
 import inspect
 import glob
 from src.libs.custom_logger import get_custom_logger
@@ -9,12 +36,96 @@ from time import time
 from uuid import uuid4
 from src.libs.common import attach_allure_file
 import src.env_vars as env_vars
+from src.env_vars import FLEET_PRIMARY_MULTIADDR, FLEET_DNS_DISCOVERY_URL
 from src.data_storage import DS
 from src.postgres_setup import start_postgres, stop_postgres
 
 logger = get_custom_logger(__name__)
 
 
+def pytest_addoption(parser):
+    """Register the --fleet command-line option."""
+    parser.addoption(
+        "--fleet",
+        action="store_true",
+        default=False,
+        help=(
+            "Bootstrap every local nwaku Docker node against the live waku.test "
+            "fleet (node-01.do-ams3 / gc-us-central1-a / ac-cn-hongkong-c). "
+            "Also activatable via FLEET_BOOTSTRAP=true env var."
+        ),
+    )
+
+
+def _fleet_bootstrap_enabled(config) -> bool:
+    """Return True when fleet bootstrap should be activated.
+
+    Activation priority (first match wins):
+      1. ``--fleet`` CLI flag passed to pytest
+      2. ``FLEET_BOOTSTRAP=true`` environment variable
+    """
+    if config.getoption("--fleet", default=False):
+        return True
+    return os.getenv("FLEET_BOOTSTRAP", "false").lower() == "true"
+
+
+def _append_fleet_kwarg(kwargs: dict, key: str, value: str) -> None:
+    """Add *value* to the kwargs entry *key*, creating a list when needed."""
+    existing = kwargs.get(key)
+    if existing is None:
+        kwargs[key] = value
+    elif isinstance(existing, list):
+        if value not in existing:
+            kwargs[key] = existing + [value]
+    else:
+        if existing != value:
+            kwargs[key] = [existing, value]
+
+
+@pytest.fixture(autouse=True)
+def patch_waku_node_start(request, monkeypatch):
+    """Monkey-patch WakuNode.start() to bootstrap every local node from the
+    waku.test fleet before the test body runs.
+
+    Active only when ``--fleet`` is passed to pytest or ``FLEET_BOOTSTRAP=true``
+    is set. By default the patch is a no-op so all existing tests are unaffected.
+
+    The patch is transparent to existing tests:
+    - Any ``staticnode`` kwarg already provided is preserved; the fleet
+      multiaddr is *appended* as an additional entry.
+    - ``dns_discovery`` and ``dns_discovery_url`` are set only if the caller
+      has not already supplied them (``setdefault`` semantics).
+    """
+    if not _fleet_bootstrap_enabled(request.config):
+        logger.info("Fleet bootstrap inactive – pass --fleet (or set FLEET_BOOTSTRAP=true) " "to connect local nodes to the waku.test fleet")
+        yield
+        return
+
+    from src.node.waku_node import WakuNode
+
+    original_start = WakuNode.start
+
+    def fleet_joined_start(self, wait_for_node_sec=20, use_wrapper=False, **kwargs):
+        logger.debug("fleet_joined_start: injecting waku.test bootstrap args into WakuNode.start()")
+        _append_fleet_kwarg(kwargs, "staticnode", FLEET_PRIMARY_MULTIADDR)
+        kwargs.setdefault("dns_discovery", "true")
+        kwargs.setdefault("dns_discovery_url", FLEET_DNS_DISCOVERY_URL)
+        logger.debug(
+            "fleet_joined_start: staticnode=%s  dns_discovery_url=%s",
+            kwargs.get("staticnode"),
+            kwargs.get("dns_discovery_url"),
+        )
+        return original_start(self, wait_for_node_sec=wait_for_node_sec, use_wrapper=use_wrapper, **kwargs)
+
+    monkeypatch.setattr(WakuNode, "start", fleet_joined_start)
+    logger.info(
+        "Fleet bootstrap patch active – local nodes will connect to %s and " "discover the full fleet via %s",
+        FLEET_PRIMARY_MULTIADDR,
+        FLEET_DNS_DISCOVERY_URL,
+    )
+    yield
+
+
 # See https://docs.pytest.org/en/latest/example/simple.html#making-test-result-information-available-in-fixtures
 @pytest.hookimpl(hookwrapper=True, tryfirst=True)
 def pytest_runtest_makereport(item):