Skip to content

Commit fd2814e

Browse files
committed
Merge #10862: Remove unused variable int64_t nEnd. Fix typo: "conditon" → "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
2 parents adf170d + 5a6671c commit fd2814e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/policy/fees.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, FeeCalculation
840840

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

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

855-
if (confTarget <= 1) return CFeeRate(0); // error conditon
855+
if (confTarget <= 1) return CFeeRate(0); // error condition
856856

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

902-
if (median < 0) return CFeeRate(0); // error conditon
902+
if (median < 0) return CFeeRate(0); // error condition
903903

904904
return CFeeRate(median);
905905
}

src/wallet/wallet.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3222,7 +3222,6 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
32223222
CWalletDB walletdb(*dbw);
32233223
for (int64_t i = missingInternal + missingExternal; i--;)
32243224
{
3225-
int64_t nEnd = 1;
32263225
if (i < missingInternal) {
32273226
internal = true;
32283227
}

0 commit comments

Comments
 (0)