From 2fffaa97381f741786fff2e6ff25f4b9a74037fe Mon Sep 17 00:00:00 2001
From: Alex Morcos <morcos@chaincode.com>
Date: Thu, 29 Jun 2017 11:29:34 -0400
Subject: 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.
---
 src/wallet/coincontrol.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/wallet/coincontrol.h')

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;
     }
-- 
cgit v1.2.3