Fix patrial rebase

firoorg · Jan 29, 2024 · 54529b8 · 54529b8
1 parent b8e6a46
commit 54529b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
@@ -6,6 +6,8 @@
 #define BITCOIN_WALLET_COINCONTROL_H
 
 #include "primitives/transaction.h"
+#include "script/standard.h"
+#include <optional>
 
 enum class CoinType
 {

diff --git a/src/wallet/test/createtransaction_tests.cpp b/src/wallet/test/createtransaction_tests.cpp
@@ -320,7 +320,6 @@ BOOST_FIXTURE_TEST_SUITE(createtransaction_tests, WalletTestingSetup)
         vTxouts.at(0)._mockupDepthInMainChain = 0;
 
         CCoinControl coinControl;
-        coinControl.fAllowUnconfirmedIsSet = true;
         coinControl.fAllowUnconfirmed = false;
 
         {
@@ -428,7 +427,6 @@ BOOST_FIXTURE_TEST_SUITE(createtransaction_tests, WalletTestingSetup)
         vTxouts.at(0)._mockupDepthInMainChain = 0;
 
         CCoinControl coinControl;
-        coinControl.fAllowUnconfirmedIsSet = true;
         coinControl.fAllowUnconfirmed = false;
 
         {