aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorPieter Wuille <[email protected]>2012-10-21 12:36:01 -0700
committerPieter Wuille <[email protected]>2012-10-21 12:36:01 -0700
commitef0ae25c2be04340cc34b0f1807cb75ca09fbd32 (patch)
tree0e1e735343dcac684129e7026fc3c6e80e2ab40a /src/main.cpp
parentMerge pull request #1941 from Diapolo/rem_initMsg_main (diff)
parentchange blockchain -> block chain (spelling) (diff)
downloaddiscoin-ef0ae25c2be04340cc34b0f1807cb75ca09fbd32.tar.xz
discoin-ef0ae25c2be04340cc34b0f1807cb75ca09fbd32.zip
Merge pull request #1910 from Diapolo/block_chain_typo
change blockchain -> block chain (spelling)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index c9e1e163d..ad5a7b0f1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1291,7 +1291,7 @@ bool CTransaction::UpdateCoins(CCoinsViewCache &inputs, CTxUndo &txundo, int nHe
bool CTransaction::HaveInputs(CCoinsViewCache &inputs) const
{
- if (!IsCoinBase()) {
+ if (!IsCoinBase()) {
// first check whether information about the prevout hash is available
for (unsigned int i = 0; i < vin.size(); i++) {
const COutPoint &prevout = vin[i].prevout;
@@ -1356,9 +1356,9 @@ bool CTransaction::CheckInputs(CCoinsViewCache &inputs, enum CheckSig_mode csmod
// Helps prevent CPU exhaustion attacks.
// Skip ECDSA signature verification when connecting blocks
- // before the last blockchain checkpoint. This is safe because block merkle hashes are
+ // before the last block chain checkpoint. This is safe because block merkle hashes are
// still computed and checked, and any change will be caught at the next checkpoint.
- if (csmode == CS_ALWAYS ||
+ if (csmode == CS_ALWAYS ||
(csmode == CS_AFTER_CHECKPOINT && inputs.GetBestBlock()->nHeight >= Checkpoints::GetTotalBlocksEstimate())) {
for (unsigned int i = 0; i < vin.size(); i++) {
const COutPoint &prevout = vin[i].prevout;
@@ -1620,7 +1620,7 @@ bool CBlock::ConnectBlock(CBlockIndex* pindex, CCoinsViewCache &view, bool fJust
return error("ConnectBlock() : WriteBlockIndex failed");
}
- // add this block to the view's blockchain
+ // add this block to the view's block chain
if (!view.SetBestBlock(pindex))
return false;
@@ -2258,7 +2258,7 @@ bool static LoadBlockIndexDB()
printf("LoadBlockIndex(): last block file = %i\n", nLastBlockFile);
if (pblocktree->ReadBlockFileInfo(nLastBlockFile, infoLastBlockFile))
printf("LoadBlockIndex(): last block file: %s\n", infoLastBlockFile.ToString().c_str());
-
+
// Load hashBestChain pointer to end of best chain
pindexBest = pcoinsTip->GetBestBlock();
if (pindexBest == NULL)