sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #17518: refactor, wallet: Nuke coincontrol circular dependency

Browse Source 
3ed5e6819a50434449d92cb96b9d8d141e8c7d2b refactor: Nuke coincontrol circular dependency (Hennadii Stepanov)

Pull request description:

  This PR gets rid of `wallet/coincontrol` -> `wallet/wallet` -> `wallet/coincontrol` circular dependency.

ACKs for top commit:
  Sjors:
    re-ACK 3ed5e6819a50434449d92cb96b9d8d141e8c7d2b
  meshcollider:
    utACK 3ed5e6819a50434449d92cb96b9d8d141e8c7d2b

Tree-SHA512: 7fbceb74a9cd04157170df158d2deb979cf397df818376b478224d2423f1d8504a8688e3a9b8fc527da73e4a34ab6bc4a98be0cc2937e102a063ab2ac553e86d
This commit is contained in:
Samuel Dobson 2019-11-24 18:26:03 +13:00 committed by PastaPastaPasta
parent 9fafe3391e
commit 613c287762
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wallet/coincontrol.cpp
View File

@ -3,7 +3,6 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <wallet/coincontrol.h>
#include <wallet/wallet.h>
#include <util/system.h>

3
src/wallet/coincontrol.h
View File

@ -26,6 +26,9 @@ enum class CoinType
MAX_COIN_TYPE = ONLY_COINJOIN_COLLATERAL,
};
//! Default for -avoidpartialspends
static constexpr bool DEFAULT_AVOIDPARTIALSPENDS = false;
/** Coin Control Features. */
class CCoinControl
{

2
src/wallet/init.cpp
View File

@ -10,6 +10,7 @@
#include <net.h>
#include <node/context.h>
#include <univalue.h>
#include <ui_interface.h>
#include <util/check.h>
#include <util/error.h>
#include <util/system.h>
@ -17,6 +18,7 @@
#include <util/translation.h>
#include <validation.h>
#include <walletinitinterface.h>
#include <wallet/coincontrol.h>
#include <wallet/wallet.h>
#include <coinjoin/client.h>

2
src/wallet/wallet.h
View File

@ -76,8 +76,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;
static const bool DEFAULT_WALLETBROADCAST = true;

1
test/lint/lint-circular-dependencies.sh
View File

@ -21,7 +21,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"txmempool -> validation -> txmempool"
"wallet/fees -> wallet/wallet -> wallet/fees"
"wallet/wallet -> wallet/walletdb -> wallet/wallet"
"wallet/coincontrol -> wallet/wallet -> wallet/coincontrol"
"txmempool -> validation -> validationinterface -> txmempool"
"wallet/scriptpubkeyman -> wallet/wallet -> wallet/scriptpubkeyman"
# Dash