aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/test/wallet_test_fixture.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-11-18 14:11:34 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2017-11-18 14:16:38 +0100
commit49bd6590feb83ee422e489fd3930e8b700c5b4a7 (patch)
tree92f638c4d4a9bb48bfd81b1a543367f24b47bc04 /src/wallet/test/wallet_test_fixture.cpp
parent49667a77e76aa709717a09916b55ff671e9c6704 (diff)
downloadbitcoin-49bd6590feb83ee422e489fd3930e8b700c5b4a7.tar.xz
tests: move pwalletMain to wallet test fixture
Scope the variable instead of using an external global; this is how test fixtures are intended to be used. Followup to #11713.
Diffstat (limited to 'src/wallet/test/wallet_test_fixture.cpp')
-rw-r--r--src/wallet/test/wallet_test_fixture.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp
index 995ec640b1..3ee83d2d7c 100644
--- a/src/wallet/test/wallet_test_fixture.cpp
+++ b/src/wallet/test/wallet_test_fixture.cpp
@@ -6,9 +6,6 @@
#include <rpc/server.h>
#include <wallet/db.h>
-#include <wallet/wallet.h>
-
-std::unique_ptr<CWallet> pwalletMain;
WalletTestingSetup::WalletTestingSetup(const std::string& chainName):
TestingSetup(chainName)
@@ -27,7 +24,6 @@ WalletTestingSetup::WalletTestingSetup(const std::string& chainName):
WalletTestingSetup::~WalletTestingSetup()
{
UnregisterValidationInterface(pwalletMain.get());
- pwalletMain.reset();
bitdb.Flush(true);
bitdb.Reset();