diff options
| author | Karl-Johan Alm <karljohan-alm@garage.co.jp> | 2018-07-19 11:40:13 +0900 |
|---|---|---|
| committer | Karl-Johan Alm <karljohan-alm@garage.co.jp> | 2018-07-24 15:05:36 +0900 |
| commit | a443d7a0ca333b0bae63e04b5d476f9ad9c7aeac (patch) | |
| tree | f8639a75168aee037612510b6ba1c7d4f23dc083 /src | |
| parent | 173e18a289088c6087ba6fac708e322aa63b7a94 (diff) | |
| download | bitcoin-a443d7a0ca333b0bae63e04b5d476f9ad9c7aeac.tar.xz | |
moveonly: CoinElegibilityFilter into coinselection.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/coinselection.h | 11 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h index 2b185879c6..64111f3939 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -47,6 +47,17 @@ public: } }; +struct CoinEligibilityFilter +{ + const int conf_mine; + const int conf_theirs; + const uint64_t max_ancestors; + const uint64_t max_descendants; + + CoinEligibilityFilter(int conf_mine, int conf_theirs, uint64_t max_ancestors) : conf_mine(conf_mine), conf_theirs(conf_theirs), max_ancestors(max_ancestors), max_descendants(max_ancestors) {} + CoinEligibilityFilter(int conf_mine, int conf_theirs, uint64_t max_ancestors, uint64_t max_descendants) : conf_mine(conf_mine), conf_theirs(conf_theirs), max_ancestors(max_ancestors), max_descendants(max_descendants) {} +}; + bool SelectCoinsBnB(std::vector<CInputCoin>& utxo_pool, const CAmount& target_value, const CAmount& cost_of_change, std::set<CInputCoin>& out_set, CAmount& value_ret, CAmount not_input_fees); // Original coin selection algorithm as a fallback diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 85d7209a1d..173ebec537 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -652,17 +652,6 @@ struct CoinSelectionParams CoinSelectionParams() {} }; -struct CoinEligibilityFilter -{ - const int conf_mine; - const int conf_theirs; - const uint64_t max_ancestors; - const uint64_t max_descendants; - - CoinEligibilityFilter(int conf_mine, int conf_theirs, uint64_t max_ancestors) : conf_mine(conf_mine), conf_theirs(conf_theirs), max_ancestors(max_ancestors), max_descendants(max_ancestors) {} - CoinEligibilityFilter(int conf_mine, int conf_theirs, uint64_t max_ancestors, uint64_t max_descendants) : conf_mine(conf_mine), conf_theirs(conf_theirs), max_ancestors(max_ancestors), max_descendants(max_descendants) {} -}; - class WalletRescanReserver; //forward declarations for ScanForWalletTransactions/RescanFromTime /** * A CWallet is an extension of a keystore, which also maintains a set of transactions and balances, |