Browse Source

Merge #10419: [trivial] Fix three recently introduced typos

efc2e3302 [trivial] Fix three recently introduced typos (practicalswift)

Tree-SHA512: 99e97f3c1350299dfce9c0c35547d480f25c0b877da311d9120f113afd3089eda31b88b2378e2370f288b0c41bb69cee0fd3abca661cd93d5a56982f90709f91
0.15
Pieter Wuille 8 years ago
parent
commit
b40ceed98a
No known key found for this signature in database
GPG Key ID: A636E97631F767E0
  1. 2
      src/policy/fees.cpp
  2. 2
      src/policy/fees.h
  3. 2
      src/wallet/feebumper.cpp

2
src/policy/fees.cpp

@ -786,7 +786,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, int *answerFoun
* This is necessary to preserve monotonically increasing estimates. * This is necessary to preserve monotonically increasing estimates.
* For non-conservative estimates we do the same thing for 2*target, but * For non-conservative estimates we do the same thing for 2*target, but
* for conservative estimates we want to skip these shorter horizons * for conservative estimates we want to skip these shorter horizons
* checks for 2*target becuase we are taking the max over all time * checks for 2*target because we are taking the max over all time
* horizons so we already have monotonically increasing estimates and * horizons so we already have monotonically increasing estimates and
* the purpose of conservative estimates is not to let short term * the purpose of conservative estimates is not to let short term
* fluctuations lower our estimates by too much. * fluctuations lower our estimates by too much.

2
src/policy/fees.h

@ -51,7 +51,7 @@ class TxConfirmStats;
* blocks. This is is tracked in 3 different data sets each up to a maximum * blocks. This is is tracked in 3 different data sets each up to a maximum
* number of periods. Within each data set we have an array of counters in each * number of periods. Within each data set we have an array of counters in each
* feerate bucket and we increment all the counters from Y' up to max periods * feerate bucket and we increment all the counters from Y' up to max periods
* representing that a tx was successfullly confirmed in less than or equal to * representing that a tx was successfully confirmed in less than or equal to
* that many periods. We want to save a history of this information, so at any * that many periods. We want to save a history of this information, so at any
* time we have a counter of the total number of transactions that happened in a * time we have a counter of the total number of transactions that happened in a
* given feerate bucket and the total number that were confirmed in each of the * given feerate bucket and the total number that were confirmed in each of the

2
src/wallet/feebumper.cpp

@ -255,7 +255,7 @@ bool CFeeBumper::commit(CWallet *pWallet)
} }
CWalletTx& oldWtx = pWallet->mapWallet[txid]; CWalletTx& oldWtx = pWallet->mapWallet[txid];
// make sure the transaction still has no descendants and hasen't been mined in the meantime // make sure the transaction still has no descendants and hasn't been mined in the meantime
if (!preconditionChecks(pWallet, oldWtx)) { if (!preconditionChecks(pWallet, oldWtx)) {
return false; return false;
} }

Loading…
Cancel
Save