Bugfix: RPC: Return all warnings in get{blockchain,mining,network}info (even in deprecated String mode)

luke-jr · luke-jr · commit e4e4a81317c2 · 2024-09-02T20:10:40.000Z
diff --git a/src/node/warnings.cpp b/src/node/warnings.cpp
@@ -11,6 +11,7 @@
 #include <node/interface_ui.h>
 #include <sync.h>
 #include <univalue.h>
+#include <util/string.h>
 #include <util/translation.h>
 
 #include <utility>
@@ -55,7 +56,7 @@ UniValue GetWarningsForRpc(const Warnings& warnings, bool use_deprecated)
 {
     if (use_deprecated) {
         const auto all_messages{warnings.GetMessages()};
-        return all_messages.empty() ? "" : all_messages.back().original;
+        return all_messages.empty() ? "" : util::Join(all_messages, Untranslated("\n")).original;
     }
 
     UniValue messages{UniValue::VARR};

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`#include <node/interface_ui.h>`
`12`	`12`	`#include <sync.h>`
`13`	`13`	`#include <univalue.h>`
	`14`	`+#include <util/string.h>`
`14`	`15`	`#include <util/translation.h>`
`15`	`16`
`16`	`17`	`#include <utility>`
`@@ -55,7 +56,7 @@ UniValue GetWarningsForRpc(const Warnings& warnings, bool use_deprecated)`
`55`	`56`	`{`
`56`	`57`	`if (use_deprecated) {`
`57`	`58`	`const auto all_messages{warnings.GetMessages()};`
`58`		`- return all_messages.empty() ? "" : all_messages.back().original;`
	`59`	`+ return all_messages.empty() ? "" : util::Join(all_messages, Untranslated("\n")).original;`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`UniValue messages{UniValue::VARR};`