aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/coincontrol.h
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2017-06-29 11:29:34 -0400
committerAlex Morcos <morcos@chaincode.com>2017-07-14 23:41:37 -0400
commit2fffaa97381f741786fff2e6ff25f4b9a74037fe (patch)
treef6163fb7a56b3f73bc8858ad1c336db9efb77aac /src/wallet/coincontrol.h
parent1983ca6cb3d6e741191206b57585a4b88d9ab86e (diff)
Make QT fee displays use GetMinimumFee instead of estimateSmartFee
Remove helper function (CalculateEstimateType) for determining whether estimates should be conservative or not, now that this is only called once from GetMinimumFee and incorporate the logic directly there.
Diffstat (limited to 'src/wallet/coincontrol.h')
-rw-r--r--src/wallet/coincontrol.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index 40c8b764b9..fc0e7c519e 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -43,9 +43,9 @@ public:
fAllowOtherInputs = false;
fAllowWatchOnly = false;
setSelected.clear();
- m_feerate = boost::none;
+ m_feerate.reset();
fOverrideFeeRate = false;
- m_confirm_target = boost::none;
+ m_confirm_target.reset();
signalRbf = fWalletRbf;
m_fee_mode = FeeEstimateMode::UNSET;
}