Skip to content

Commit e753eae

Browse files
committed
Merge #8505: Trivial: Fix typos in various files
1aacfc2 various typos (leijurv)
2 parents 65e6444 + 1aacfc2 commit e753eae

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

src/blockencodings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
7575
}
7676
prefilled_count = cmpctblock.prefilledtxn.size();
7777

78-
// Calculate map of txids -> positions and check mempool to see what we have (or dont)
78+
// Calculate map of txids -> positions and check mempool to see what we have (or don't)
7979
// Because well-formed cmpctblock messages will have a (relatively) uniform distribution
8080
// of short IDs, any highly-uneven distribution of elements can be safely treated as a
8181
// READ_STATUS_FAILED.

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
12701270
// cache size calculations
12711271
int64_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20);
12721272
nTotalCache = std::max(nTotalCache, nMinDbCache << 20); // total cache cannot be less than nMinDbCache
1273-
nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greated than nMaxDbcache
1273+
nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greater than nMaxDbcache
12741274
int64_t nBlockTreeDBCache = nTotalCache / 8;
12751275
nBlockTreeDBCache = std::min(nBlockTreeDBCache, (GetBoolArg("-txindex", DEFAULT_TXINDEX) ? nMaxBlockDBAndTxIndexCache : nMaxBlockDBCache) << 20);
12761276
nTotalCache -= nBlockTreeDBCache;

src/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
11741174
// nSequence >= maxint-1 on all inputs.
11751175
//
11761176
// maxint-1 is picked to still allow use of nLockTime by
1177-
// non-replacable transactions. All inputs rather than just one
1177+
// non-replaceable transactions. All inputs rather than just one
11781178
// is for the sake of multi-party protocols, where we don't
11791179
// want a single party to be able to disable replacement.
11801180
//
@@ -1988,7 +1988,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
19881988
// is safe because block merkle hashes are still computed and checked,
19891989
// and any change will be caught at the next checkpoint. Of course, if
19901990
// the checkpoint is for a chain that's invalid due to false scriptSigs
1991-
// this optimisation would allow an invalid chain to be accepted.
1991+
// this optimization would allow an invalid chain to be accepted.
19921992
if (fScriptChecks) {
19931993
for (unsigned int i = 0; i < tx.vin.size(); i++) {
19941994
const COutPoint &prevout = tx.vin[i].prevout;
@@ -4801,7 +4801,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
48014801
{
48024802
// If a peer is asking for old blocks, we're almost guaranteed
48034803
// they wont have a useful mempool to match against a compact block,
4804-
// and we dont feel like constructing the object for them, so
4804+
// and we don't feel like constructing the object for them, so
48054805
// instead we respond with the full, non-compact block.
48064806
if (mi->second->nHeight >= chainActive.Height() - 10) {
48074807
CBlockHeaderAndShortTxIDs cmpctblock(block);

src/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals);
214214
* block is made active. Note that it does not, however, guarantee that the
215215
* specific block passed to it has been checked for validity!
216216
*
217-
* @param[out] state This may be set to an Error state if any error occurred processing it, including during validation/connection/etc of otherwise unrelated blocks during reorganisation; or it may be set to an Invalid state if pblock is itself invalid (but this is not guaranteed even when the block is checked). If you want to *possibly* get feedback on whether pblock is valid, you must also install a CValidationInterface (see validationinterface.h) - this will have its BlockChecked method called whenever *any* block completes validation.
217+
* @param[out] state This may be set to an Error state if any error occurred processing it, including during validation/connection/etc of otherwise unrelated blocks during reorganization; or it may be set to an Invalid state if pblock is itself invalid (but this is not guaranteed even when the block is checked). If you want to *possibly* get feedback on whether pblock is valid, you must also install a CValidationInterface (see validationinterface.h) - this will have its BlockChecked method called whenever *any* block completes validation.
218218
* @param[in] pfrom The node which we are receiving the block from; it is added to mapBlockSource and may be penalised if the block is invalid.
219219
* @param[in] pblock The block we want to process.
220220
* @param[in] fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.

src/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,7 @@ void ThreadOpenConnections()
16821682
if (nANow - addr.nLastTry < 600 && nTries < 30)
16831683
continue;
16841684

1685-
// only consider nodes missing relevant services after 40 failed attemps
1685+
// only consider nodes missing relevant services after 40 failed attempts
16861686
if ((addr.nServices & nRelevantServices) != nRelevantServices && nTries < 40)
16871687
continue;
16881688

src/rpc/mining.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
650650

651651
if (nMaxVersionPreVB >= 2) {
652652
// If VB is supported by the client, nMaxVersionPreVB is -1, so we won't get here
653-
// Because BIP 34 changed how the generation transaction is serialised, we can only use version/force back to v2 blocks
653+
// Because BIP 34 changed how the generation transaction is serialized, we can only use version/force back to v2 blocks
654654
// This is safe to do [otherwise-]unconditionally only because we are throwing an exception above if a non-force deployment gets activated
655655
// Note that this can probably also be removed entirely after the first BIP9 non-force deployment (ie, probably segwit) gets activated
656656
aMutable.push_back("version/force");

src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3133,7 +3133,7 @@ void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const {
31333133
mapKeyBirth[it->first] = it->second.nCreateTime;
31343134

31353135
// map in which we'll infer heights of other keys
3136-
CBlockIndex *pindexMax = chainActive[std::max(0, chainActive.Height() - 144)]; // the tip can be reorganised; use a 144-block safety margin
3136+
CBlockIndex *pindexMax = chainActive[std::max(0, chainActive.Height() - 144)]; // the tip can be reorganized; use a 144-block safety margin
31373137
std::map<CKeyID, CBlockIndex*> mapKeyFirstBlock;
31383138
std::set<CKeyID> setKeys;
31393139
GetKeys(setKeys);

0 commit comments

Comments
 (0)