diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-02 16:04:32 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-02 16:28:13 +0100 |
| commit | aeedd8a53b2df0ca2bf0429ce37f97cd45b35ba6 (patch) | |
| tree | dc61d3413311eb0977d1bf436f87b8650767f214 /src/main.cpp | |
| parent | df2ced5c8325b84557f185b687e6c014de84cecf (diff) | |
| parent | fabd10a9c9c713696b4dd7a9ff6b72f38022bc68 (diff) | |
Merge pull request #7157
fabd10a Fix typo in wallet.cpp (MarcoFalke)
fad2460 Update contrib/devtools/README.md (MarcoFalke)
5e151a8 PartitionCheck: remove useless spaces (paveljanik)
fad0088 TRIVIAL: Chainparams: Remove unused CBaseUnitTestParams (Jorge Timón)
74f7341 Update miner.cpp: Fix typo in comment (antonio-fr)
e69bad1 [trivial] Fix typo in peertablemodel.cpp (MarcoFalke)
8a03727 Fix various typos (paveljanik)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp index c41dd58d11..cb3f8f39f8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -134,9 +134,9 @@ namespace { set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexCandidates; /** Number of nodes with fSyncStarted. */ int nSyncStarted = 0; - /** All pairs A->B, where A (or one if its ancestors) misses transactions, but B has transactions. - * Pruned nodes may have entries where B is missing data. - */ + /** All pairs A->B, where A (or one of its ancestors) misses transactions, but B has transactions. + * Pruned nodes may have entries where B is missing data. + */ multimap<CBlockIndex*, CBlockIndex*> mapBlocksUnlinked; CCriticalSection cs_LastBlockFile; @@ -1945,8 +1945,8 @@ void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const // How likely is it to find that many by chance? double p = boost::math::pdf(poisson, nBlocks); - LogPrint("partitioncheck", "%s : Found %d blocks in the last %d hours\n", __func__, nBlocks, SPAN_HOURS); - LogPrint("partitioncheck", "%s : likelihood: %g\n", __func__, p); + LogPrint("partitioncheck", "%s: Found %d blocks in the last %d hours\n", __func__, nBlocks, SPAN_HOURS); + LogPrint("partitioncheck", "%s: likelihood: %g\n", __func__, p); // Aim for one false-positive about every fifty years of normal running: const int FIFTY_YEARS = 50*365*24*60*60; @@ -3047,7 +3047,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta // Reject block.nVersion=2 blocks when 95% (75% on testnet) of the network has upgraded: if (block.nVersion < 3 && IsSuperMajority(3, pindexPrev, consensusParams.nMajorityRejectBlockOutdated, consensusParams)) - return state.Invalid(error("%s : rejected nVersion=2 block", __func__), + return state.Invalid(error("%s: rejected nVersion=2 block", __func__), REJECT_OBSOLETE, "bad-version"); // Reject block.nVersion=3 blocks when 95% (75% on testnet) of the network has upgraded: |