mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
merge bitcoin#29347: enable v2transport by default
This commit is contained in:
parent
7dcf561306
commit
c53cd93aee
@ -117,7 +117,7 @@ static const bool DEFAULT_FIXEDSEEDS = true;
|
|||||||
static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;
|
static const size_t DEFAULT_MAXRECEIVEBUFFER = 5 * 1000;
|
||||||
static const size_t DEFAULT_MAXSENDBUFFER = 1 * 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
|
#if defined USE_KQUEUE
|
||||||
#define DEFAULT_SOCKETEVENTS "kqueue"
|
#define DEFAULT_SOCKETEVENTS "kqueue"
|
||||||
|
@ -131,8 +131,15 @@ class TestNode():
|
|||||||
# Default behavior from global -v2transport flag is added to args to persist it over restarts.
|
# Default behavior from global -v2transport flag is added to args to persist it over restarts.
|
||||||
# May be overwritten in individual tests, using extra_args.
|
# May be overwritten in individual tests, using extra_args.
|
||||||
self.default_to_v2 = v2transport
|
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")
|
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.cli = TestNodeCLI(bitcoin_cli, self.datadir)
|
||||||
self.use_cli = use_cli
|
self.use_cli = use_cli
|
||||||
|
Loading…
Reference in New Issue
Block a user