diff options
| author | Ivan Metlushko <metlushko@gmail.com> | 2020-12-18 17:45:11 +0100 |
|---|---|---|
| committer | Ivan Metlushko <metlushko@gmail.com> | 2021-05-19 08:50:16 +0200 |
| commit | e2a47ce08528dfb39c0340145c6977f6afd587f6 (patch) | |
| tree | f945e6ef156bfc81e97d47059c3725da9b66088d /src/wallet/test | |
| parent | 2fa3f30050f2db665605c8371b1fd131f39a2f9b (diff) | |
| download | bitcoin-e2a47ce08528dfb39c0340145c6977f6afd587f6.tar.xz | |
refactor: move first run detection to client code
Diffstat (limited to 'src/wallet/test')
| -rw-r--r-- | src/wallet/test/coinselector_tests.cpp | 3 | ||||
| -rw-r--r-- | src/wallet/test/wallet_test_fixture.cpp | 3 | ||||
| -rw-r--r-- | src/wallet/test/wallet_tests.cpp | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp index 7eff6e592d..7bca385deb 100644 --- a/src/wallet/test/coinselector_tests.cpp +++ b/src/wallet/test/coinselector_tests.cpp @@ -297,8 +297,7 @@ BOOST_AUTO_TEST_CASE(bnb_search_test) empty_wallet(); { std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain.get(), "", CreateMockWalletDatabase()); - bool firstRun; - wallet->LoadWallet(firstRun); + wallet->LoadWallet(); wallet->SetupLegacyScriptPubKeyMan(); LOCK(wallet->cs_wallet); add_coin(*wallet, 5 * CENT, 6 * 24, false, 0, true); diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp index badf2eb459..fc744ebe5b 100644 --- a/src/wallet/test/wallet_test_fixture.cpp +++ b/src/wallet/test/wallet_test_fixture.cpp @@ -8,8 +8,7 @@ WalletTestingSetup::WalletTestingSetup(const std::string& chainName) : TestingSetup(chainName), m_wallet(m_node.chain.get(), "", CreateMockWalletDatabase()) { - bool fFirstRun; - m_wallet.LoadWallet(fFirstRun); + m_wallet.LoadWallet(); m_chain_notifications_handler = m_node.chain->handleNotifications({ &m_wallet, [](CWallet*) {} }); m_wallet_client->registerRpcs(); } diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index c8e3c8f819..171fa67b85 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -483,8 +483,7 @@ public: LOCK2(wallet->cs_wallet, ::cs_main); wallet->SetLastBlockProcessed(::ChainActive().Height(), ::ChainActive().Tip()->GetBlockHash()); } - bool firstRun; - wallet->LoadWallet(firstRun); + wallet->LoadWallet(); AddKey(*wallet, coinbaseKey); WalletRescanReserver reserver(*wallet); reserver.reserve(); |