mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge 2d3056751b into merged_master (Bitcoin PR bitcoin/bitcoin#29906)
This commit is contained in:
commit
660a2b7f06
11 changed files with 63 additions and 50 deletions
|
|
@ -1042,10 +1042,8 @@ bool AppInitParameterInteraction(const ArgsManager& args)
|
|||
InitWarning(strprintf(_("Reducing -maxconnections from %d to %d, because of system limitations."), nUserMaxConnections, nMaxConnections));
|
||||
|
||||
// ********************************************************* Step 3: parameter-to-internal-flags
|
||||
auto result = init::SetLoggingCategories(args);
|
||||
if (!result) return InitError(util::ErrorString(result));
|
||||
result = init::SetLoggingLevel(args);
|
||||
if (!result) return InitError(util::ErrorString(result));
|
||||
if (auto result{init::SetLoggingCategories(args)}; !result) return InitError(util::ErrorString(result));
|
||||
if (auto result{init::SetLoggingLevel(args)}; !result) return InitError(util::ErrorString(result));
|
||||
|
||||
// ELEMENTS: epoch length and trim headers
|
||||
uint32_t epoch_length = chainparams.GetConsensus().dynamic_epoch_length;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue