diff options
author | Alex Morcos <morcos@chaincode.com> | 2017-04-26 15:54:23 -0400 |
---|---|---|
committer | Alex Morcos <morcos@chaincode.com> | 2017-04-26 15:54:23 -0400 |
commit | 3edbd79a65334bbb99e11ac68532421ee2930a8a (patch) | |
tree | 0f537a9d7f613a0ced4f563059d458e3880c2f3f /src/wallet/wallet.h | |
parent | cf5782508a3fd3c398dc01dbebb5a230efe0ae66 (diff) | |
download | bitcoin-3edbd79a65334bbb99e11ac68532421ee2930a8a.tar.xz |
cleanup: reduce to one GetMinimumFee call signature
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r-- | src/wallet/wallet.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 6710c39ce2..8015cc8492 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -945,12 +945,7 @@ public: * Estimate the minimum fee considering user set parameters * and the required fee */ - static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, const CBlockPolicyEstimator& estimator); - /** - * Estimate the minimum fee considering required fee and targetFee or if 0 - * then fee estimation for nConfirmTarget - */ - static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, const CBlockPolicyEstimator& estimator, CAmount targetFee); + static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, const CBlockPolicyEstimator& estimator, bool ignoreUserSetFee = false); /** * Return the minimum required fee taking into account the * floating relay fee and user set minimum transaction fee |