diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2019-11-19 19:39:50 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2019-11-23 08:30:03 +0200 |
| commit | 3ed5e6819a50434449d92cb96b9d8d141e8c7d2b (patch) | |
| tree | 1a0c6614e275c53e743f2fb16e9877527d50e6be /src | |
| parent | 0b79caf658019de2c65a53c9e11fd1d2f4c369b6 (diff) | |
| download | bitcoin-3ed5e6819a50434449d92cb96b9d8d141e8c7d2b.tar.xz | |
refactor: Nuke coincontrol circular dependency
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/coincontrol.h | 6 | ||||
| -rw-r--r-- | src/wallet/init.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index c3d00fa38e..9c4c9dbb17 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -27,6 +27,7 @@ #include <wallet/coincontrol.h> #include <wallet/fees.h> #include <wallet/psbtwallet.h> +#include <wallet/wallet.h> #include <QFontMetrics> #include <QScrollBar> diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h index fca4b75c45..2893d0ab3d 100644 --- a/src/wallet/coincontrol.h +++ b/src/wallet/coincontrol.h @@ -6,14 +6,18 @@ #define BITCOIN_WALLET_COINCONTROL_H #include <optional.h> +#include <outputtype.h> #include <policy/feerate.h> #include <policy/fees.h> #include <primitives/transaction.h> -#include <wallet/wallet.h> +#include <script/standard.h> const int DEFAULT_MIN_DEPTH = 0; const int DEFAULT_MAX_DEPTH = 9999999; +//! Default for -avoidpartialspends +static constexpr bool DEFAULT_AVOIDPARTIALSPENDS = false; + /** Coin Control Features. */ class CCoinControl { diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 8b09dc9ad0..dd0d2ffbd7 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -8,9 +8,11 @@ #include <net.h> #include <node/context.h> #include <outputtype.h> +#include <ui_interface.h> #include <util/moneystr.h> #include <util/system.h> #include <util/translation.h> +#include <wallet/coincontrol.h> #include <wallet/wallet.h> #include <walletinitinterface.h> diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index fce49ec56c..51df4a9a8b 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -71,8 +71,6 @@ static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000; static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true; //! Default for -walletrejectlongchains static const bool DEFAULT_WALLET_REJECT_LONG_CHAINS = false; -//! Default for -avoidpartialspends -static const bool DEFAULT_AVOIDPARTIALSPENDS = false; //! -txconfirmtarget default static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 6; //! -walletrbf default |