From 77210e48d242ae582d71df9a5d1a10bb6482c14c Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Mon, 29 Jan 2024 14:12:14 -0500 Subject: [PATCH] net: enable v2transport by default --- src/net.h | 2 +- test/functional/test_framework/test_node.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/net.h b/src/net.h index 7b5d85d888..9fd4f68854 100644 --- a/src/net.h +++ b/src/net.h @@ -94,7 +94,7 @@ static constexpr bool DEFAULT_FIXEDSEEDS{true}; static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000; static const size_t DEFAULT_MAXSENDBUFFER = 1 * 1000; -static constexpr bool DEFAULT_V2_TRANSPORT{false}; +static constexpr bool DEFAULT_V2_TRANSPORT{true}; typedef int64_t NodeId; diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 821aaedfb5..be48851ad8 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -126,6 +126,19 @@ def __init__(self, i, datadir_path, *, chain, rpchost, timewait, timeout_factor, if self.version_is_at_least(239000): self.args.append("-loglevel=trace") + # Default behavior from global -v2transport flag is added to args to persist it over restarts. + # May be overwritten in individual tests, using extra_args. + self.default_to_v2 = v2transport + if self.version_is_at_least(260000): + # 26.0 and later support v2transport + if v2transport: + self.args.append("-v2transport=1") + else: + self.args.append("-v2transport=0") + else: + # v2transport requested but not supported for node + assert not v2transport + self.cli = TestNodeCLI(bitcoin_cli, self.datadir_path) self.use_cli = use_cli self.start_perf = start_perf @@ -198,6 +211,8 @@ def start(self, extra_args=None, *, cwd=None, stdout=None, stderr=None, env=None if extra_args is None: extra_args = self.extra_args + self.use_v2transport = "-v2transport=1" in extra_args or (self.default_to_v2 and "-v2transport=0" not in extra_args) + # Add a new stdout and stderr file each time blackmored is started if stderr is None: stderr = tempfile.NamedTemporaryFile(dir=self.stderr_dir, delete=False)