@@ -270,8 +270,9 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
270
270
{
271
271
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain .get (), " " , CreateMockWalletDatabase ());
272
272
wallet->LoadWallet ();
273
- wallet->SetupLegacyScriptPubKeyMan ();
274
273
LOCK (wallet->cs_wallet );
274
+ wallet->SetWalletFlag (WALLET_FLAG_DESCRIPTORS);
275
+ wallet->SetupDescriptorScriptPubKeyMans ();
275
276
276
277
std::vector<COutput> coins;
277
278
CoinSet setCoinsRet;
@@ -293,8 +294,9 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
293
294
{
294
295
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain .get (), " " , CreateMockWalletDatabase ());
295
296
wallet->LoadWallet ();
296
- wallet->SetupLegacyScriptPubKeyMan ();
297
297
LOCK (wallet->cs_wallet );
298
+ wallet->SetWalletFlag (WALLET_FLAG_DESCRIPTORS);
299
+ wallet->SetupDescriptorScriptPubKeyMans ();
298
300
299
301
std::vector<COutput> coins;
300
302
CoinSet setCoinsRet;
@@ -315,8 +317,9 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
315
317
{
316
318
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain .get (), " " , CreateMockWalletDatabase ());
317
319
wallet->LoadWallet ();
318
- wallet->SetupLegacyScriptPubKeyMan ();
319
320
LOCK (wallet->cs_wallet );
321
+ wallet->SetWalletFlag (WALLET_FLAG_DESCRIPTORS);
322
+ wallet->SetupDescriptorScriptPubKeyMans ();
320
323
321
324
CoinSet setCoinsRet, setCoinsRet2;
322
325
CAmount nValueRet;
@@ -595,8 +598,9 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset)
595
598
{
596
599
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain .get (), " " , CreateMockWalletDatabase ());
597
600
wallet->LoadWallet ();
598
- wallet->SetupLegacyScriptPubKeyMan ();
599
601
LOCK (wallet->cs_wallet );
602
+ wallet->SetWalletFlag (WALLET_FLAG_DESCRIPTORS);
603
+ wallet->SetupDescriptorScriptPubKeyMans ();
600
604
601
605
CoinSet setCoinsRet;
602
606
CAmount nValueRet;
@@ -617,8 +621,9 @@ BOOST_AUTO_TEST_CASE(SelectCoins_test)
617
621
{
618
622
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain .get (), " " , CreateMockWalletDatabase ());
619
623
wallet->LoadWallet ();
620
- wallet->SetupLegacyScriptPubKeyMan ();
621
624
LOCK (wallet->cs_wallet );
625
+ wallet->SetWalletFlag (WALLET_FLAG_DESCRIPTORS);
626
+ wallet->SetupDescriptorScriptPubKeyMans ();
622
627
623
628
// Random generator stuff
624
629
std::default_random_engine generator;
0 commit comments