Skip to content

Commit 4b1588c

Browse files
committed
tests: Use DescriptorScriptPubKeyMan in coinselector_tests
1 parent 811319f commit 4b1588c

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/wallet/test/coinselector_tests.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,9 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
270270
{
271271
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain.get(), "", CreateMockWalletDatabase());
272272
wallet->LoadWallet();
273-
wallet->SetupLegacyScriptPubKeyMan();
274273
LOCK(wallet->cs_wallet);
274+
wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
275+
wallet->SetupDescriptorScriptPubKeyMans();
275276

276277
std::vector<COutput> coins;
277278
CoinSet setCoinsRet;
@@ -293,8 +294,9 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
293294
{
294295
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain.get(), "", CreateMockWalletDatabase());
295296
wallet->LoadWallet();
296-
wallet->SetupLegacyScriptPubKeyMan();
297297
LOCK(wallet->cs_wallet);
298+
wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
299+
wallet->SetupDescriptorScriptPubKeyMans();
298300

299301
std::vector<COutput> coins;
300302
CoinSet setCoinsRet;
@@ -315,8 +317,9 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
315317
{
316318
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain.get(), "", CreateMockWalletDatabase());
317319
wallet->LoadWallet();
318-
wallet->SetupLegacyScriptPubKeyMan();
319320
LOCK(wallet->cs_wallet);
321+
wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
322+
wallet->SetupDescriptorScriptPubKeyMans();
320323

321324
CoinSet setCoinsRet, setCoinsRet2;
322325
CAmount nValueRet;
@@ -595,8 +598,9 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset)
595598
{
596599
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain.get(), "", CreateMockWalletDatabase());
597600
wallet->LoadWallet();
598-
wallet->SetupLegacyScriptPubKeyMan();
599601
LOCK(wallet->cs_wallet);
602+
wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
603+
wallet->SetupDescriptorScriptPubKeyMans();
600604

601605
CoinSet setCoinsRet;
602606
CAmount nValueRet;
@@ -617,8 +621,9 @@ BOOST_AUTO_TEST_CASE(SelectCoins_test)
617621
{
618622
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain.get(), "", CreateMockWalletDatabase());
619623
wallet->LoadWallet();
620-
wallet->SetupLegacyScriptPubKeyMan();
621624
LOCK(wallet->cs_wallet);
625+
wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
626+
wallet->SetupDescriptorScriptPubKeyMans();
622627

623628
// Random generator stuff
624629
std::default_random_engine generator;

0 commit comments

Comments
 (0)