remove default argument from GetMinimumFee

morcos · morcos · commit cfaef69ace6c · 2017-07-06T22:20:23.000-04:00
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -510,7 +510,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
                 nBytes -= 34;
 
         // Fee
-        nPayFee = CWallet::GetMinimumFee(nBytes, coinControl->nConfirmTarget, ::mempool, ::feeEstimator);
+        nPayFee = CWallet::GetMinimumFee(nBytes, coinControl->nConfirmTarget, ::mempool, ::feeEstimator, nullptr /* FeeCalculation */, false /* ignoreGlobalPayTxFee */);
 
         if (nPayAmount > 0)
         {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2724,7 +2724,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT
                 if (coinControl && coinControl->nConfirmTarget > 0)
                     currentConfirmationTarget = coinControl->nConfirmTarget;
 
-                CAmount nFeeNeeded = GetMinimumFee(nBytes, currentConfirmationTarget, ::mempool, ::feeEstimator, &feeCalc);
+                CAmount nFeeNeeded = GetMinimumFee(nBytes, currentConfirmationTarget, ::mempool, ::feeEstimator, &feeCalc, false /* ignoreGlobalPayTxFee */);
                 if (coinControl && coinControl->fOverrideFeeRate)
                     nFeeNeeded = coinControl->nFeeRate.GetFee(nBytes);
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -963,7 +963,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * 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, FeeCalculation *feeCalc = nullptr, bool ignoreGlobalPayTxFee = false);
+    static CAmount GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarget, const CTxMemPool& pool, const CBlockPolicyEstimator& estimator, FeeCalculation *feeCalc, bool ignoreGlobalPayTxFee);
     /**
      * Return the minimum required fee taking into account the
      * floating relay fee and user set minimum transaction fee

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ void CoinControlDialog::updateLabels(WalletModel model, QDialog dialog)`
`510`	`510`	`nBytes -= 34;`
`511`	`511`
`512`	`512`	`// Fee`
`513`		`- nPayFee = CWallet::GetMinimumFee(nBytes, coinControl->nConfirmTarget, ::mempool, ::feeEstimator);`
	`513`	`+ nPayFee = CWallet::GetMinimumFee(nBytes, coinControl->nConfirmTarget, ::mempool, ::feeEstimator, nullptr /* FeeCalculation /, false / ignoreGlobalPayTxFee */);`
`514`	`514`
`515`	`515`	`if (nPayAmount > 0)`
`516`	`516`	`{`