sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

wallet: Add HasWallets

Browse Source
This commit is contained in:
João Barbosa 2018-04-18 13:46:11 +01:00
parent 373aee26c3
commit 3c058fdcc8
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/misc.cpp
View File

@ -69,7 +69,7 @@ UniValue validateaddress(const JSONRPCRequest& request)
{
#ifdef ENABLE_WALLET
if (!GetWallets().empty() && IsDeprecatedRPCEnabled("validateaddress")) {
if (HasWallets() && IsDeprecatedRPCEnabled("validateaddress")) {
ret.pushKVs(getaddressinfo(request));
}
#endif

2
src/wallet/rpcwallet.cpp
View File

@ -66,7 +66,7 @@ bool EnsureWalletIsAvailable(CWallet * const pwallet, bool avoidException)
{
if (pwallet) return true;
if (avoidException) return false;
if (GetWallets().empty()) {
if (!HasWallets()) {
// Note: It isn't currently possible to trigger this error because
// wallet RPC methods aren't registered unless a wallet is loaded. But
// this error is being kept as a precaution, because it's possible in

5
src/wallet/wallet.cpp
View File

@ -54,6 +54,11 @@ bool RemoveWallet(CWallet* wallet)
return true;
}
bool HasWallets()
{
return !vpwallets.empty();
}
std::vector<CWallet*> GetWallets()
{
return vpwallets;

1
src/wallet/wallet.h
View File

@ -34,6 +34,7 @@
bool AddWallet(CWallet* wallet);
bool RemoveWallet(CWallet* wallet);
bool HasWallets();
std::vector<CWallet*> GetWallets();
CWallet* GetWallet(const std::string& name);