Merge 63d0b930f8 into merged_master (Bitcoin PR bitcoin/bitcoin#29845)

This commit is contained in:
ivanlele 2026-02-19 16:04:33 +00:00
commit 18bbe9433f
No known key found for this signature in database
10 changed files with 71 additions and 36 deletions

View file

@ -47,6 +47,7 @@
#include <util/check.h>
#include <util/result.h>
#include <util/signalinterrupt.h>
#include <util/string.h>
#include <util/translation.h>
#include <validation.h>
#include <validationinterface.h>
@ -91,7 +92,7 @@ public:
explicit NodeImpl(NodeContext& context) { setContext(&context); }
void initLogging() override { InitLogging(args()); }
void initParameterInteraction() override { InitParameterInteraction(args()); }
bilingual_str getWarnings() override { return GetWarnings(true); }
bilingual_str getWarnings() override { return Join(GetWarnings(), Untranslated("<hr />")); }
int getExitStatus() override { return Assert(m_context)->exit_status.load(); }
uint32_t getLogCategories() override { return LogInstance().GetCategoryMask(); }
bool baseInitialize() override