Navigation Menu

Skip to content

Commit

Permalink
Merge #10862: Remove unused variable int64_t nEnd. Fix typo: "condito…
Browse files Browse the repository at this point in the history
…n" → "condition".

5a6671c Fix typo: "conditon" → "condition" (practicalswift)
35aff43 Remove unused variable int64_t nEnd (practicalswift)

Pull request description:

  * Remove unused variable `int64_t nEnd`. Last use of `nEnd` removed in commit 1fc8c3d.
  * Fix typo: "conditon" → "condition". Typo introduced in commit 439c4e8.

Tree-SHA512: 61624e6f70828c485fe46dbe00df76f1a07b7a5849d41bf7d279323b687420e60e9b85192f611a37211f17f3dea8eb3f6f6dc65d90c92e5516404fd81d37785a
  • Loading branch information
laanwj committed Jul 20, 2017
2 parents adf170d + 5a6671c commit fd2814e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/policy/fees.cpp
Expand Up @@ -840,7 +840,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, FeeCalculation

// Return failure if trying to analyze a target we're not tracking
if (confTarget <= 0 || (unsigned int)confTarget > longStats->GetMaxConfirms()) {
return CFeeRate(0); // error conditon
return CFeeRate(0); // error condition
}

// It's not possible to get reasonable estimates for confTarget of 1
Expand All @@ -852,7 +852,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, FeeCalculation
}
if (feeCalc) feeCalc->returnedTarget = confTarget;

if (confTarget <= 1) return CFeeRate(0); // error conditon
if (confTarget <= 1) return CFeeRate(0); // error condition

assert(confTarget > 0); //estimateCombinedFee and estimateConservativeFee take unsigned ints
/** true is passed to estimateCombined fee for target/2 and target so
Expand Down Expand Up @@ -899,7 +899,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, FeeCalculation
}
}

if (median < 0) return CFeeRate(0); // error conditon
if (median < 0) return CFeeRate(0); // error condition

return CFeeRate(median);
}
Expand Down
1 change: 0 additions & 1 deletion src/wallet/wallet.cpp
Expand Up @@ -3222,7 +3222,6 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
CWalletDB walletdb(*dbw);
for (int64_t i = missingInternal + missingExternal; i--;)
{
int64_t nEnd = 1;
if (i < missingInternal) {
internal = true;
}
Expand Down

0 comments on commit fd2814e

Please sign in to comment.