Merge #8505: Trivial: Fix typos in various files
1aacfc2
various typos (leijurv)
This commit is contained in:
commit
e753eaeb34
7 changed files with 9 additions and 9 deletions
|
@ -75,7 +75,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
|
||||||
}
|
}
|
||||||
prefilled_count = cmpctblock.prefilledtxn.size();
|
prefilled_count = cmpctblock.prefilledtxn.size();
|
||||||
|
|
||||||
// Calculate map of txids -> positions and check mempool to see what we have (or dont)
|
// Calculate map of txids -> positions and check mempool to see what we have (or don't)
|
||||||
// Because well-formed cmpctblock messages will have a (relatively) uniform distribution
|
// Because well-formed cmpctblock messages will have a (relatively) uniform distribution
|
||||||
// of short IDs, any highly-uneven distribution of elements can be safely treated as a
|
// of short IDs, any highly-uneven distribution of elements can be safely treated as a
|
||||||
// READ_STATUS_FAILED.
|
// READ_STATUS_FAILED.
|
||||||
|
|
|
@ -1270,7 +1270,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
// cache size calculations
|
// cache size calculations
|
||||||
int64_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20);
|
int64_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20);
|
||||||
nTotalCache = std::max(nTotalCache, nMinDbCache << 20); // total cache cannot be less than nMinDbCache
|
nTotalCache = std::max(nTotalCache, nMinDbCache << 20); // total cache cannot be less than nMinDbCache
|
||||||
nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greated than nMaxDbcache
|
nTotalCache = std::min(nTotalCache, nMaxDbCache << 20); // total cache cannot be greater than nMaxDbcache
|
||||||
int64_t nBlockTreeDBCache = nTotalCache / 8;
|
int64_t nBlockTreeDBCache = nTotalCache / 8;
|
||||||
nBlockTreeDBCache = std::min(nBlockTreeDBCache, (GetBoolArg("-txindex", DEFAULT_TXINDEX) ? nMaxBlockDBAndTxIndexCache : nMaxBlockDBCache) << 20);
|
nBlockTreeDBCache = std::min(nBlockTreeDBCache, (GetBoolArg("-txindex", DEFAULT_TXINDEX) ? nMaxBlockDBAndTxIndexCache : nMaxBlockDBCache) << 20);
|
||||||
nTotalCache -= nBlockTreeDBCache;
|
nTotalCache -= nBlockTreeDBCache;
|
||||||
|
|
|
@ -1174,7 +1174,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
|
||||||
// nSequence >= maxint-1 on all inputs.
|
// nSequence >= maxint-1 on all inputs.
|
||||||
//
|
//
|
||||||
// maxint-1 is picked to still allow use of nLockTime by
|
// maxint-1 is picked to still allow use of nLockTime by
|
||||||
// non-replacable transactions. All inputs rather than just one
|
// non-replaceable transactions. All inputs rather than just one
|
||||||
// is for the sake of multi-party protocols, where we don't
|
// is for the sake of multi-party protocols, where we don't
|
||||||
// want a single party to be able to disable replacement.
|
// want a single party to be able to disable replacement.
|
||||||
//
|
//
|
||||||
|
@ -1988,7 +1988,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
|
||||||
// is safe because block merkle hashes are still computed and checked,
|
// is safe because block merkle hashes are still computed and checked,
|
||||||
// and any change will be caught at the next checkpoint. Of course, if
|
// and any change will be caught at the next checkpoint. Of course, if
|
||||||
// the checkpoint is for a chain that's invalid due to false scriptSigs
|
// the checkpoint is for a chain that's invalid due to false scriptSigs
|
||||||
// this optimisation would allow an invalid chain to be accepted.
|
// this optimization would allow an invalid chain to be accepted.
|
||||||
if (fScriptChecks) {
|
if (fScriptChecks) {
|
||||||
for (unsigned int i = 0; i < tx.vin.size(); i++) {
|
for (unsigned int i = 0; i < tx.vin.size(); i++) {
|
||||||
const COutPoint &prevout = tx.vin[i].prevout;
|
const COutPoint &prevout = tx.vin[i].prevout;
|
||||||
|
@ -4801,7 +4801,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
|
||||||
{
|
{
|
||||||
// If a peer is asking for old blocks, we're almost guaranteed
|
// If a peer is asking for old blocks, we're almost guaranteed
|
||||||
// they wont have a useful mempool to match against a compact block,
|
// they wont have a useful mempool to match against a compact block,
|
||||||
// and we dont feel like constructing the object for them, so
|
// and we don't feel like constructing the object for them, so
|
||||||
// instead we respond with the full, non-compact block.
|
// instead we respond with the full, non-compact block.
|
||||||
if (mi->second->nHeight >= chainActive.Height() - 10) {
|
if (mi->second->nHeight >= chainActive.Height() - 10) {
|
||||||
CBlockHeaderAndShortTxIDs cmpctblock(block);
|
CBlockHeaderAndShortTxIDs cmpctblock(block);
|
||||||
|
|
|
@ -214,7 +214,7 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals);
|
||||||
* block is made active. Note that it does not, however, guarantee that the
|
* block is made active. Note that it does not, however, guarantee that the
|
||||||
* specific block passed to it has been checked for validity!
|
* specific block passed to it has been checked for validity!
|
||||||
*
|
*
|
||||||
* @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.
|
* @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.
|
||||||
* @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.
|
* @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.
|
||||||
* @param[in] pblock The block we want to process.
|
* @param[in] pblock The block we want to process.
|
||||||
* @param[in] fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.
|
* @param[in] fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.
|
||||||
|
|
|
@ -1682,7 +1682,7 @@ void ThreadOpenConnections()
|
||||||
if (nANow - addr.nLastTry < 600 && nTries < 30)
|
if (nANow - addr.nLastTry < 600 && nTries < 30)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// only consider nodes missing relevant services after 40 failed attemps
|
// only consider nodes missing relevant services after 40 failed attempts
|
||||||
if ((addr.nServices & nRelevantServices) != nRelevantServices && nTries < 40)
|
if ((addr.nServices & nRelevantServices) != nRelevantServices && nTries < 40)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
|
@ -650,7 +650,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
|
||||||
|
|
||||||
if (nMaxVersionPreVB >= 2) {
|
if (nMaxVersionPreVB >= 2) {
|
||||||
// If VB is supported by the client, nMaxVersionPreVB is -1, so we won't get here
|
// If VB is supported by the client, nMaxVersionPreVB is -1, so we won't get here
|
||||||
// Because BIP 34 changed how the generation transaction is serialised, we can only use version/force back to v2 blocks
|
// Because BIP 34 changed how the generation transaction is serialized, we can only use version/force back to v2 blocks
|
||||||
// This is safe to do [otherwise-]unconditionally only because we are throwing an exception above if a non-force deployment gets activated
|
// This is safe to do [otherwise-]unconditionally only because we are throwing an exception above if a non-force deployment gets activated
|
||||||
// Note that this can probably also be removed entirely after the first BIP9 non-force deployment (ie, probably segwit) gets activated
|
// Note that this can probably also be removed entirely after the first BIP9 non-force deployment (ie, probably segwit) gets activated
|
||||||
aMutable.push_back("version/force");
|
aMutable.push_back("version/force");
|
||||||
|
|
|
@ -3133,7 +3133,7 @@ void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const {
|
||||||
mapKeyBirth[it->first] = it->second.nCreateTime;
|
mapKeyBirth[it->first] = it->second.nCreateTime;
|
||||||
|
|
||||||
// map in which we'll infer heights of other keys
|
// map in which we'll infer heights of other keys
|
||||||
CBlockIndex *pindexMax = chainActive[std::max(0, chainActive.Height() - 144)]; // the tip can be reorganised; use a 144-block safety margin
|
CBlockIndex *pindexMax = chainActive[std::max(0, chainActive.Height() - 144)]; // the tip can be reorganized; use a 144-block safety margin
|
||||||
std::map<CKeyID, CBlockIndex*> mapKeyFirstBlock;
|
std::map<CKeyID, CBlockIndex*> mapKeyFirstBlock;
|
||||||
std::set<CKeyID> setKeys;
|
std::set<CKeyID> setKeys;
|
||||||
GetKeys(setKeys);
|
GetKeys(setKeys);
|
||||||
|
|
Loading…
Reference in a new issue