GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 3c63c2f324 into merged_master (Bitcoin PR bitcoin/bitcoin#29347)

Browse source
This commit is contained in:
Byron Hambly 2025-11-29 13:55:04 +02:00
commit 2bf22ab5fd
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/net.h
View file

@ -97,7 +97,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;

11
test/functional/test_framework/test_node.py
View file

@ -130,8 +130,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:
self.args.append("-v2transport=1")
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.chain)
self.use_cli = use_cli