diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-11-19 11:18:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-11-19 11:21:51 +0100 |
| commit | 9cdd2bcf6794794667acd4eced127dda25aabf4c (patch) | |
| tree | af3c61f8bcf6a76f64c4a808368a8faddc148ae2 /src/wallet/test/wallet_test_fixture.h | |
| parent | 0d89fa0877930c6c8a539a656c1009ad8ab6755b (diff) | |
| parent | 49bd6590feb83ee422e489fd3930e8b700c5b4a7 (diff) | |
| download | bitcoin-9cdd2bcf6794794667acd4eced127dda25aabf4c.tar.xz | |
Merge #11718: tests: move pwalletMain to wallet test fixture
49bd659 tests: move pwalletMain to wallet test fixture (Wladimir J. van der Laan)
Pull request description:
Scope the variable instead of using an external global; this is how test fixtures are intended to be used.
Followup to #11713.
Tree-SHA512: 7d5bda93cdfe1329c8fe39bd72965906e36dad72fbb5d344ebedf26e66b1857510d01a3c2872d7f718fdeb23365e6ba71991aafe68e82781c6767a086b6d1590
Diffstat (limited to 'src/wallet/test/wallet_test_fixture.h')
| -rw-r--r-- | src/wallet/test/wallet_test_fixture.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h index a341bc698a..292d654438 100644 --- a/src/wallet/test/wallet_test_fixture.h +++ b/src/wallet/test/wallet_test_fixture.h @@ -7,11 +7,15 @@ #include <test/test_bitcoin.h> +#include <wallet/wallet.h> + /** Testing setup and teardown for wallet. */ struct WalletTestingSetup: public TestingSetup { explicit WalletTestingSetup(const std::string& chainName = CBaseChainParams::MAIN); ~WalletTestingSetup(); + + std::unique_ptr<CWallet> pwalletMain; }; #endif |