GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 371a73e940 into merged_master (Bitcoin PR #19233)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:02 +00:00
commit 440e85cbdb
13 changed files with 57 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/interfaces/node.cpp
View file

@ -71,7 +71,7 @@ public:
std::string getNetwork() override { return Params().NetworkIDString(); }
void initLogging() override { InitLogging(); }
void initParameterInteraction() override { InitParameterInteraction(); }
std::string getWarnings() override { return GetWarnings(true); }
bilingual_str getWarnings() override { return GetWarnings(true); }
uint32_t getLogCategories() override { return LogInstance().GetCategoryMask(); }
bool baseInitialize() override
{