Merge branch 'estimatesmartfee' of https://github.com/pranabp-bit/bit…

…coin into estimatesmartfee
bitcoin · Aug 17, 2021 · a549bd1 · a549bd1
2 parents 45b6f05 + 79aa255
commit a549bd1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -1097,7 +1097,7 @@ static RPCHelpMan estimatesmartfee()
     RPCTypeCheckArgument(request.params[0], UniValue::VNUM);
 
     CBlockPolicyEstimator& fee_estimator = EnsureAnyFeeEstimator(request.context);
-    NodeContext& node = EnsureAnyNodeContext(request.context);
+    const NodeContext& node = EnsureAnyNodeContext(request.context);
     const CTxMemPool& mempool = EnsureMemPool(node);
 
     unsigned int max_target = fee_estimator.HighestTargetTracked(FeeEstimateHorizon::LONG_HALFLIFE);

diff --git a/test/functional/feature_fee_estimation.py b/test/functional/feature_fee_estimation.py
@@ -283,7 +283,7 @@ def run_test(self):
         check_estimates(self.nodes[1], self.fees_per_kb)
 
         # check that the effective feerate is greater than or equal to the mempoolminfee even for high mempoolminfee
-        self.log.info("Estimates after restarting node with high MempoolMinFee")
+        self.log.info("Test fee rate estimation after restarting node with high MempoolMinFee")
         self.restart_node(1, extra_args=['-minrelaytxfee=0.0003'])
         check_estimates(self.nodes[1], self.fees_per_kb)