aboutsummaryrefslogtreecommitdiff
path: root/src/miner.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-02-02 11:55:42 +0100
committerWladimir J. van der Laan <[email protected]>2015-02-02 11:56:23 +0100
commita62649731fb1babaedff10b7c0baec4c50c90d60 (patch)
treecca272581d2cb6b9bf39283f3e4ab26da032a4fc /src/miner.cpp
parentMerge pull request #5707 (diff)
parentChanged pronouns for correctness and inclusivity (diff)
downloaddiscoin-a62649731fb1babaedff10b7c0baec4c50c90d60.tar.xz
discoin-a62649731fb1babaedff10b7c0baec4c50c90d60.zip
Merge pull request #5731
ee93202 Changed pronouns for correctness and inclusivity (bikinibabe) 1fa89a5 fix _code_ snippet in gitian-building.md (UdjinM6) 34c6181 Fix README link from util.sh -> util.py. (Matt Bogosian) faf0af4 Suggest --disable-wallet when libdb_cxx headers are missing (Luke Dashjr) 5a809ef depends: fix typos (Michael Ford) bd2b73b TRIVIAL: fix misleading comment (Vitalii Demianets) 5262fde Remove whitespaces before double colon in errors and logs (Pavel Janík) 3800135 Fix typo (Pavel Janík) 91a9fe0 Fix typo - sentence starts with capital letter (Pavel Janík) bfc29dc Improve gitian build guide (Michael Ford) d6bed15 remove sig_canonical.json and sig_noncanonical.json (Manuel Araoz) 8673160 Remove bootstrap.md (Michael Ford)
Diffstat (limited to 'src/miner.cpp')
-rw-r--r--src/miner.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/miner.cpp b/src/miner.cpp
index 5cc4a9279..e359654d7 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -332,7 +332,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
CValidationState state;
if (!TestBlockValidity(state, *pblock, pindexPrev, false, false))
- throw std::runtime_error("CreateNewBlock() : TestBlockValidity failed");
+ throw std::runtime_error("CreateNewBlock(): TestBlockValidity failed");
}
return pblocktemplate.release();
@@ -415,7 +415,7 @@ static bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& rese
{
LOCK(cs_main);
if (pblock->hashPrevBlock != chainActive.Tip()->GetBlockHash())
- return error("BitcoinMiner : generated block is stale");
+ return error("BitcoinMiner: generated block is stale");
}
// Remove key from key pool
@@ -430,7 +430,7 @@ static bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& rese
// Process this block the same as if we had received it from another node
CValidationState state;
if (!ProcessNewBlock(state, NULL, pblock))
- return error("BitcoinMiner : ProcessNewBlock, block not accepted");
+ return error("BitcoinMiner: ProcessNewBlock, block not accepted");
return true;
}