highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 06:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

rpc: return warnings as an array instead of just a single one

Browse Source 
The RPC documentation for `getblockchaininfo`, `getmininginfo` and
`getnetworkinfo` states that "warnings" returns "any network and
blockchain warnings". In practice, only a single warning is returned.

Fix that by returning all warnings as an array.

As a side benefit, cleans up the GetWarnings() logic.
This commit is contained in:
stickies-v
2024-04-10 12:16:21 +02:00
parent 842f7fdf78
commit 42fb5311b1
10 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/warnings.cpp
View File

@@ -11,7 +11,6 @@
#include <common/system.h>
#include <sync.h>
#include <util/string.h>
#include <util/translation.h>
#include <optional>
@@ -39,37 +38,30 @@ void SetMedianTimeOffsetWarning(std::optional<bilingual_str> warning)
LOCK(g_warnings_mutex);
g_timeoffset_warning = warning;
}
bilingual_str GetWarnings(bool verbose)
std::vector<bilingual_str> GetWarnings()
{
bilingual_str warnings_concise;
std::vector<bilingual_str> warnings_verbose;
std::vector<bilingual_str> warnings;
LOCK(g_warnings_mutex);
// Pre-release build warning
if (!CLIENT_VERSION_IS_RELEASE) {
warnings_concise = _("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications");
warnings_verbose.emplace_back(warnings_concise);
warnings.emplace_back(_("This is a pre-release test build - use at your own risk - do not use for mining or merchant applications"));
}
// Misc warnings like out of disk space and clock is wrong
if (!g_misc_warnings.empty()) {
warnings_concise = g_misc_warnings;
warnings_verbose.emplace_back(warnings_concise);
warnings.emplace_back(g_misc_warnings);
}
if (fLargeWorkInvalidChainFound) {
warnings_concise = _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
warnings_verbose.emplace_back(warnings_concise);
warnings.emplace_back(_("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade."));
}
if (g_timeoffset_warning) {
warnings_verbose.emplace_back(g_timeoffset_warning.value());
warnings.emplace_back(g_timeoffset_warning.value());
}
if (verbose) {
return Join(warnings_verbose, Untranslated("<hr />"));
}
return warnings_concise;
return warnings;
}