merge bitcoin#29347: enable v2transport by default

This commit is contained in:
Kittywhiskers Van Gogh 2024-12-10 03:33:16 +00:00
parent 7dcf561306
commit c53cd93aee
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
2 changed files with 10 additions and 3 deletions

View File

@ -117,7 +117,7 @@ static const 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};
#if defined USE_KQUEUE
#define DEFAULT_SOCKETEVENTS "kqueue"

View File

@ -131,8 +131,15 @@ class TestNode():
# 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.default_to_v2:
if self.version_is_at_least(22000000):
# 22.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)
self.use_cli = use_cli