wallet: Add AddWallet, RemoveWallet, GetWallet and GetWallets
With these new functions all vpwallets usage are removed and vpwallets is now a static variable (no external linkage).
This commit is contained in:
parent
6efd9644cf
commit
373aee26c3
|
@ -239,7 +239,7 @@ class NodeImpl : public Node
|
|||
{
|
||||
#ifdef ENABLE_WALLET
|
||||
std::vector<std::unique_ptr<Wallet>> wallets;
|
||||
for (CWallet* wallet : ::vpwallets) {
|
||||
for (CWallet* wallet : GetWallets()) {
|
||||
wallets.emplace_back(MakeWallet(*wallet));
|
||||
}
|
||||
return wallets;
|
||||
|
|
|
@ -180,9 +180,9 @@ void TestGUI()
|
|||
TransactionView transactionView(platformStyle.get());
|
||||
auto node = interfaces::MakeNode();
|
||||
OptionsModel optionsModel(*node);
|
||||
vpwallets.insert(vpwallets.begin(), &wallet);
|
||||
WalletModel walletModel(std::move(node->getWallets()[0]), *node, platformStyle.get(), &optionsModel);
|
||||
vpwallets.erase(vpwallets.begin());
|
||||
AddWallet(&wallet);
|
||||
WalletModel walletModel(std::move(node->getWallets().back()), *node, platformStyle.get(), &optionsModel);
|
||||
RemoveWallet(&wallet);
|
||||
sendCoinsDialog.setModel(&walletModel);
|
||||
transactionView.setModel(&walletModel);
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ UniValue validateaddress(const JSONRPCRequest& request)
|
|||
{
|
||||
|
||||
#ifdef ENABLE_WALLET
|
||||
if (!::vpwallets.empty() && IsDeprecatedRPCEnabled("validateaddress")) {
|
||||
if (!GetWallets().empty() && IsDeprecatedRPCEnabled("validateaddress")) {
|
||||
ret.pushKVs(getaddressinfo(request));
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -315,7 +315,7 @@ bool WalletInit::Open() const
|
|||
if (!pwallet) {
|
||||
return false;
|
||||
}
|
||||
vpwallets.push_back(pwallet);
|
||||
AddWallet(pwallet);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
@ -323,29 +323,29 @@ bool WalletInit::Open() const
|
|||
|
||||
void WalletInit::Start(CScheduler& scheduler) const
|
||||
{
|
||||
for (CWallet* pwallet : vpwallets) {
|
||||
for (CWallet* pwallet : GetWallets()) {
|
||||
pwallet->postInitProcess(scheduler);
|
||||
}
|
||||
}
|
||||
|
||||
void WalletInit::Flush() const
|
||||
{
|
||||
for (CWallet* pwallet : vpwallets) {
|
||||
for (CWallet* pwallet : GetWallets()) {
|
||||
pwallet->Flush(false);
|
||||
}
|
||||
}
|
||||
|
||||
void WalletInit::Stop() const
|
||||
{
|
||||
for (CWallet* pwallet : vpwallets) {
|
||||
for (CWallet* pwallet : GetWallets()) {
|
||||
pwallet->Flush(true);
|
||||
}
|
||||
}
|
||||
|
||||
void WalletInit::Close() const
|
||||
{
|
||||
for (CWallet* pwallet : vpwallets) {
|
||||
for (CWallet* pwallet : GetWallets()) {
|
||||
RemoveWallet(pwallet);
|
||||
delete pwallet;
|
||||
}
|
||||
vpwallets.clear();
|
||||
}
|
||||
|
|
|
@ -46,14 +46,13 @@ CWallet *GetWalletForJSONRPCRequest(const JSONRPCRequest& request)
|
|||
if (request.URI.substr(0, WALLET_ENDPOINT_BASE.size()) == WALLET_ENDPOINT_BASE) {
|
||||
// wallet endpoint was used
|
||||
std::string requestedWallet = urlDecode(request.URI.substr(WALLET_ENDPOINT_BASE.size()));
|
||||
for (CWallet* pwallet : ::vpwallets) {
|
||||
if (pwallet->GetName() == requestedWallet) {
|
||||
CWallet* pwallet = GetWallet(requestedWallet);
|
||||
if (!pwallet) throw JSONRPCError(RPC_WALLET_NOT_FOUND, "Requested wallet does not exist or is not loaded");
|
||||
return pwallet;
|
||||
}
|
||||
}
|
||||
throw JSONRPCError(RPC_WALLET_NOT_FOUND, "Requested wallet does not exist or is not loaded");
|
||||
}
|
||||
return ::vpwallets.size() == 1 || (request.fHelp && ::vpwallets.size() > 0) ? ::vpwallets[0] : nullptr;
|
||||
|
||||
std::vector<CWallet*> wallets = GetWallets();
|
||||
return wallets.size() == 1 || (request.fHelp && wallets.size() > 0) ? wallets[0] : nullptr;
|
||||
}
|
||||
|
||||
std::string HelpRequiringPassphrase(CWallet * const pwallet)
|
||||
|
@ -67,7 +66,7 @@ bool EnsureWalletIsAvailable(CWallet * const pwallet, bool avoidException)
|
|||
{
|
||||
if (pwallet) return true;
|
||||
if (avoidException) return false;
|
||||
if (::vpwallets.empty()) {
|
||||
if (GetWallets().empty()) {
|
||||
// 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
|
||||
|
@ -2862,8 +2861,7 @@ UniValue listwallets(const JSONRPCRequest& request)
|
|||
|
||||
UniValue obj(UniValue::VARR);
|
||||
|
||||
for (CWallet* pwallet : vpwallets) {
|
||||
|
||||
for (CWallet* pwallet : GetWallets()) {
|
||||
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
|
||||
return NullUniValue;
|
||||
}
|
||||
|
|
|
@ -74,7 +74,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
|
|||
// after.
|
||||
{
|
||||
CWallet wallet("dummy", WalletDatabase::CreateDummy());
|
||||
vpwallets.insert(vpwallets.begin(), &wallet);
|
||||
AddWallet(&wallet);
|
||||
UniValue keys;
|
||||
keys.setArray();
|
||||
UniValue key;
|
||||
|
@ -105,7 +105,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
|
|||
"downloading and rescanning the relevant blocks (see -reindex and -rescan "
|
||||
"options).\"}},{\"success\":true}]",
|
||||
0, oldTip->GetBlockTimeMax(), TIMESTAMP_WINDOW));
|
||||
vpwallets.erase(vpwallets.begin());
|
||||
RemoveWallet(&wallet);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -140,9 +140,9 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
|
|||
JSONRPCRequest request;
|
||||
request.params.setArray();
|
||||
request.params.push_back((pathTemp / "wallet.backup").string());
|
||||
vpwallets.insert(vpwallets.begin(), &wallet);
|
||||
AddWallet(&wallet);
|
||||
::dumpwallet(request);
|
||||
vpwallets.erase(vpwallets.begin());
|
||||
RemoveWallet(&wallet);
|
||||
}
|
||||
|
||||
// Call importwallet RPC and verify all blocks with timestamps >= BLOCK_TIME
|
||||
|
@ -153,9 +153,9 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
|
|||
JSONRPCRequest request;
|
||||
request.params.setArray();
|
||||
request.params.push_back((pathTemp / "wallet.backup").string());
|
||||
vpwallets.insert(vpwallets.begin(), &wallet);
|
||||
AddWallet(&wallet);
|
||||
::importwallet(request);
|
||||
vpwallets.erase(vpwallets.begin());
|
||||
RemoveWallet(&wallet);
|
||||
|
||||
LOCK(wallet.cs_wallet);
|
||||
BOOST_CHECK_EQUAL(wallet.mapWallet.size(), 3U);
|
||||
|
|
|
@ -28,12 +28,45 @@
|
|||
#include <utilmoneystr.h>
|
||||
#include <wallet/fees.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <assert.h>
|
||||
#include <future>
|
||||
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
|
||||
std::vector<CWallet*> vpwallets;
|
||||
static std::vector<CWallet*> vpwallets;
|
||||
|
||||
bool AddWallet(CWallet* wallet)
|
||||
{
|
||||
assert(wallet);
|
||||
std::vector<CWallet*>::const_iterator i = std::find(vpwallets.begin(), vpwallets.end(), wallet);
|
||||
if (i != vpwallets.end()) return false;
|
||||
vpwallets.push_back(wallet);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool RemoveWallet(CWallet* wallet)
|
||||
{
|
||||
assert(wallet);
|
||||
std::vector<CWallet*>::iterator i = std::find(vpwallets.begin(), vpwallets.end(), wallet);
|
||||
if (i == vpwallets.end()) return false;
|
||||
vpwallets.erase(i);
|
||||
return true;
|
||||
}
|
||||
|
||||
std::vector<CWallet*> GetWallets()
|
||||
{
|
||||
return vpwallets;
|
||||
}
|
||||
|
||||
CWallet* GetWallet(const std::string& name)
|
||||
{
|
||||
for (CWallet* wallet : vpwallets) {
|
||||
if (wallet->GetName() == name) return wallet;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
/** Transaction fee set by the user */
|
||||
CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
|
||||
unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;
|
||||
|
|
|
@ -32,7 +32,10 @@
|
|||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
extern std::vector<CWallet*> vpwallets;
|
||||
bool AddWallet(CWallet* wallet);
|
||||
bool RemoveWallet(CWallet* wallet);
|
||||
std::vector<CWallet*> GetWallets();
|
||||
CWallet* GetWallet(const std::string& name);
|
||||
|
||||
/**
|
||||
* Settings
|
||||
|
|
|
@ -756,7 +756,7 @@ void MaybeCompactWalletDB()
|
|||
return;
|
||||
}
|
||||
|
||||
for (CWallet* pwallet : vpwallets) {
|
||||
for (CWallet* pwallet : GetWallets()) {
|
||||
WalletDatabase& dbh = pwallet->GetDBHandle();
|
||||
|
||||
unsigned int nUpdateCounter = dbh.nUpdateCounter;
|
||||
|
|
Loading…
Reference in New Issue