diff --git a/src/test/interfaces_tests.cpp b/src/test/interfaces_tests.cpp --- a/src/test/interfaces_tests.cpp +++ b/src/test/interfaces_tests.cpp @@ -17,7 +17,7 @@ BOOST_FIXTURE_TEST_SUITE(interfaces_tests, TestChain100Setup) BOOST_AUTO_TEST_CASE(findBlock) { - auto chain = interfaces::MakeChain(m_node, Params()); + auto &chain = m_node.chain; const CChain &active = Assert(m_node.chainman)->ActiveChain(); BlockHash hash; @@ -75,7 +75,7 @@ } BOOST_AUTO_TEST_CASE(findFirstBlockWithTimeAndHeight) { - auto chain = interfaces::MakeChain(m_node, Params()); + auto &chain = m_node.chain; const CChain &active = Assert(m_node.chainman)->ActiveChain(); BlockHash hash; int height; @@ -90,7 +90,7 @@ } BOOST_AUTO_TEST_CASE(findAncestorByHeight) { - auto chain = interfaces::MakeChain(m_node, Params()); + auto &chain = m_node.chain; const CChain &active = Assert(m_node.chainman)->ActiveChain(); BlockHash hash; BOOST_CHECK(chain->findAncestorByHeight(active[20]->GetBlockHash(), 10, @@ -100,7 +100,7 @@ } BOOST_AUTO_TEST_CASE(findAncestorByHash) { - auto chain = interfaces::MakeChain(m_node, Params()); + auto &chain = m_node.chain; const CChain &active = Assert(m_node.chainman)->ActiveChain(); int height = -1; BOOST_CHECK(chain->findAncestorByHash(active[20]->GetBlockHash(), @@ -112,7 +112,7 @@ } BOOST_AUTO_TEST_CASE(findCommonAncestor) { - auto chain = interfaces::MakeChain(m_node, Params()); + auto &chain = m_node.chain; const CChain &active = Assert(m_node.chainman)->ActiveChain(); auto *orig_tip = active.Tip(); for (int i = 0; i < 10; ++i) { @@ -149,7 +149,7 @@ } BOOST_AUTO_TEST_CASE(hasBlocks) { - auto chain = interfaces::MakeChain(m_node, Params()); + auto &chain = m_node.chain; const CChain &active = Assert(m_node.chainman)->ActiveChain(); // Test ranges diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp --- a/src/wallet/test/coinselector_tests.cpp +++ b/src/wallet/test/coinselector_tests.cpp @@ -325,7 +325,7 @@ // Make sure that can use BnB when there are preset inputs empty_wallet(); { - auto wallet = std::make_unique(m_chain.get(), "", + auto wallet = std::make_unique(m_node.chain.get(), "", CreateMockWalletDatabase()); bool firstRun; wallet->LoadWallet(firstRun); diff --git a/src/wallet/test/init_test_fixture.h b/src/wallet/test/init_test_fixture.h --- a/src/wallet/test/init_test_fixture.h +++ b/src/wallet/test/init_test_fixture.h @@ -19,7 +19,6 @@ fs::path m_datadir; fs::path m_cwd; std::map m_walletdir_path_cases; - std::unique_ptr m_chain; std::unique_ptr m_wallet_client; }; diff --git a/src/wallet/test/init_test_fixture.cpp b/src/wallet/test/init_test_fixture.cpp --- a/src/wallet/test/init_test_fixture.cpp +++ b/src/wallet/test/init_test_fixture.cpp @@ -12,8 +12,7 @@ InitWalletDirTestingSetup::InitWalletDirTestingSetup( const std::string &chainName) : BasicTestingSetup(chainName) { - m_chain = interfaces::MakeChain(m_node, Params()); - m_wallet_client = MakeWalletClient(*m_chain, *Assert(m_node.args)); + m_wallet_client = MakeWalletClient(*m_node.chain, *Assert(m_node.args)); std::string sep; sep += fs::path::preferred_separator; diff --git a/src/wallet/test/ismine_tests.cpp b/src/wallet/test/ismine_tests.cpp --- a/src/wallet/test/ismine_tests.cpp +++ b/src/wallet/test/ismine_tests.cpp @@ -28,9 +28,7 @@ CKey uncompressedKey; uncompressedKey.MakeNewKey(false); CPubKey uncompressedPubkey = uncompressedKey.GetPubKey(); - NodeContext node; - std::unique_ptr chain = - interfaces::MakeChain(node, Params()); + std::unique_ptr &chain = m_node.chain; CScript scriptPubKey; isminetype result; diff --git a/src/wallet/test/scriptpubkeyman_tests.cpp b/src/wallet/test/scriptpubkeyman_tests.cpp --- a/src/wallet/test/scriptpubkeyman_tests.cpp +++ b/src/wallet/test/scriptpubkeyman_tests.cpp @@ -17,10 +17,7 @@ // for recognized scripts even when keys may not be available for signing. BOOST_AUTO_TEST_CASE(CanProvide) { // Set up wallet and keyman variables. - NodeContext node; - std::unique_ptr chain = - interfaces::MakeChain(node, Params()); - CWallet wallet(chain.get(), "", CreateDummyWalletDatabase()); + CWallet wallet(m_node.chain.get(), "", CreateDummyWalletDatabase()); LegacyScriptPubKeyMan &keyman = *wallet.GetOrCreateLegacyScriptPubKeyMan(); // Make a 1 of 2 multisig script diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h --- a/src/wallet/test/wallet_test_fixture.h +++ b/src/wallet/test/wallet_test_fixture.h @@ -23,9 +23,8 @@ const std::string &chainName = CBaseChainParams::MAIN); ~WalletTestingSetup(); - std::unique_ptr m_chain; std::unique_ptr m_wallet_client = - interfaces::MakeWalletClient(*m_chain, *Assert(m_node.args)); + interfaces::MakeWalletClient(*m_node.chain, *Assert(m_node.args)); CWallet m_wallet; std::unique_ptr m_chain_notifications_handler; }; diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp --- a/src/wallet/test/wallet_test_fixture.cpp +++ b/src/wallet/test/wallet_test_fixture.cpp @@ -10,12 +10,12 @@ #include WalletTestingSetup::WalletTestingSetup(const std::string &chainName) - : TestingSetup(chainName), m_chain(interfaces::MakeChain(m_node, Params())), - m_wallet(m_chain.get(), "", CreateMockWalletDatabase()) { + : TestingSetup(chainName), + m_wallet(m_node.chain.get(), "", CreateMockWalletDatabase()) { bool fFirstRun; m_wallet.LoadWallet(fFirstRun); m_chain_notifications_handler = - m_chain->handleNotifications({&m_wallet, [](CWallet *) {}}); + 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 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -855,8 +855,7 @@ } BOOST_FIXTURE_TEST_CASE(ZapSelectTx, TestChain100Setup) { - auto chain = interfaces::MakeChain(m_node, Params()); - auto wallet = TestLoadWallet(*chain); + auto wallet = TestLoadWallet(*m_node.chain); CKey key; key.MakeNewKey(true); AddKey(*wallet, key);