highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-09 22:28:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make GetWarnings() return bilingual_str

Browse Source
This commit is contained in:
Hennadii Stepanov
2020-06-10 11:44:48 +03:00
parent 38e33aa481
commit d1ae7c0355
10 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/rpc/blockchain.cpp
View File

@@ -32,6 +32,7 @@
#include <util/ref.h>
#include <util/strencodings.h>
#include <util/system.h>
#include <util/translation.h>
#include <validation.h>
#include <validationinterface.h>
#include <warnings.h>
@@ -1278,7 +1279,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
BIP9SoftForkDescPushBack(softforks, "testdummy", consensusParams, Consensus::DEPLOYMENT_TESTDUMMY);
obj.pushKV("softforks", softforks);
obj.pushKV("warnings", GetWarnings(false));
obj.pushKV("warnings", GetWarnings(false).original);
return obj;
}

3
src/rpc/mining.cpp
View File

@@ -29,6 +29,7 @@
#include <util/strencodings.h>
#include <util/string.h>
#include <util/system.h>
#include <util/translation.h>
#include <validation.h>
#include <validationinterface.h>
#include <versionbitsinfo.h>
@@ -416,7 +417,7 @@ static UniValue getmininginfo(const JSONRPCRequest& request)
obj.pushKV("networkhashps", getnetworkhashps(request));
obj.pushKV("pooledtx", (uint64_t)mempool.size());
obj.pushKV("chain", Params().NetworkIDString());
obj.pushKV("warnings", GetWarnings(false));
obj.pushKV("warnings", GetWarnings(false).original);
return obj;
}

3
src/rpc/net.cpp
View File

@@ -22,6 +22,7 @@
#include <util/strencodings.h>
#include <util/string.h>
#include <util/system.h>
#include <util/translation.h>
#include <validation.h>
#include <version.h>
#include <warnings.h>
@@ -548,7 +549,7 @@ static UniValue getnetworkinfo(const JSONRPCRequest& request)
}
}
obj.pushKV("localaddresses", localAddresses);
obj.pushKV("warnings", GetWarnings(false));
obj.pushKV("warnings", GetWarnings(false).original);
return obj;
}