aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet.h
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2018-03-15 11:25:50 -0400
committerAndrew Chow <achow101-github@achow101.com>2018-03-15 15:22:31 -0400
commit081bf54ee4a282eed72e7de409ad6b9ab97f2987 (patch)
tree09d971a675648ec35005201d315a0247215a37b7 /src/wallet/wallet.h
parent6ef99826b9ab2c9d95ed4b55403d22225bcf086a (diff)
downloadbitcoin-081bf54ee4a282eed72e7de409ad6b9ab97f2987.tar.xz
Test that BnB is not used when there are preset inputs
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r--src/wallet/wallet.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index a88da71f91..bb72eb168c 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -667,15 +667,6 @@ private:
std::mutex mutexScanning;
friend class WalletRescanReserver;
-
- /**
- * Select a set of coins such that nValueRet >= nTargetValue and at least
- * all coins from coinControl are selected; Never select unconfirmed coins
- * if they are not ours
- */
- bool SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet,
- const CCoinControl& coin_control, CoinSelectionParams& coin_selection_params, bool& bnb_used) const;
-
CWalletDB *pwalletdbEncryption;
//! the current wallet version: clients below this version are not able to load the wallet
@@ -768,6 +759,14 @@ public:
return *dbw;
}
+ /**
+ * Select a set of coins such that nValueRet >= nTargetValue and at least
+ * all coins from coinControl are selected; Never select unconfirmed coins
+ * if they are not ours
+ */
+ bool SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet,
+ const CCoinControl& coin_control, CoinSelectionParams& coin_selection_params, bool& bnb_used) const;
+
/** Get a name for this wallet for logging/debugging purposes.
*/
const std::string& GetName() const { return m_name; }