diff options
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 10 | ||||
| -rw-r--r-- | src/main.h | 4 | ||||
| -rw-r--r-- | src/rpcrawtransaction.cpp | 2 | ||||
| -rw-r--r-- | src/test/DoS_tests.cpp | 5 | ||||
| -rw-r--r-- | src/test/script_tests.cpp | 4 |
6 files changed, 13 insertions, 14 deletions
diff --git a/src/init.cpp b/src/init.cpp index 4d5720306d..45658e49d0 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -639,7 +639,7 @@ bool AppInit2() BOOST_FOREACH(string strDest, mapMultiArgs["-seednode"]) AddOneShot(strDest); - // ********************************************************* Step 7: load blockchain + // ********************************************************* Step 7: load block chain if (!bitdb.Open(GetDataDir())) { diff --git a/src/main.cpp b/src/main.cpp index c9e1e163d2..ad5a7b0f19 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) diff --git a/src/main.h b/src/main.h index 75ee7a9be5..75950109da 100644 --- a/src/main.h +++ b/src/main.h @@ -777,7 +777,7 @@ public: // unspent transaction outputs; spent outputs are .IsNull(); spent outputs at the end of the array are dropped std::vector<CTxOut> vout; - // at which height this transaction was included in the active blockchain + // at which height this transaction was included in the active block chain int nHeight; // version of the CTransaction; accesses to this value should probably check for nHeight as well, @@ -798,7 +798,7 @@ public: // equality test friend bool operator==(const CCoins &a, const CCoins &b) { - return a.fCoinBase == b.fCoinBase && + return a.fCoinBase == b.fCoinBase && a.nHeight == b.nHeight && a.nVersion == b.nVersion && a.vout == b.vout; diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 72a89c08c1..4714bfdd20 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -299,7 +299,7 @@ Value signrawtransaction(const Array& params, bool fHelp) "signrawtransaction <hex string> [{\"txid\":txid,\"vout\":n,\"scriptPubKey\":hex},...] [<privatekey1>,...] [sighashtype=\"ALL\"]\n" "Sign inputs for raw transaction (serialized, hex-encoded).\n" "Second optional argument (may be null) is an array of previous transaction outputs that\n" - "this transaction depends on but may not yet be in the blockchain.\n" + "this transaction depends on but may not yet be in the block chain.\n" "Third optional argument (may be null) is an array of base58-encoded private\n" "keys that, if given, will be the only keys used to sign the transaction.\n" "Fourth optional argument is a string that is one of six values; ALL, NONE, SINGLE or\n" diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 8235b0bda7..0db33dcd05 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning) BOOST_CHECK(CNode::IsBanned(addr1)); // ... but 1 still should be dummyNode2.Misbehaving(50); BOOST_CHECK(CNode::IsBanned(addr2)); -} +} BOOST_AUTO_TEST_CASE(DoS_banscore) { @@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE(DoS_checknbits) { using namespace boost::assign; // for 'map_list_of()' - // Timestamps,nBits from the bitcoin blockchain. + // Timestamps,nBits from the bitcoin block chain. // These are the block-chain checkpoint blocks typedef std::map<int64, unsigned int> BlockData; BlockData chainData = @@ -129,7 +129,6 @@ BOOST_AUTO_TEST_CASE(DoS_checknbits) // ... but OK if enough time passed for difficulty to adjust downward: BOOST_CHECK(CheckNBits(firstcheck.second, lastcheck.first+60*60*24*365*4, lastcheck.second, lastcheck.first)); - } CTransaction RandomOrphan() diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index f8e4fa8a49..3f280ba947 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -79,7 +79,7 @@ ParseScript(string s) { BOOST_ERROR("Parse error: " << s); return CScript(); - } + } } return result; @@ -206,7 +206,7 @@ sign_multisig(CScript scriptPubKey, std::vector<CKey> keys, CTransaction transac // NOTE: CHECKMULTISIG has an unfortunate bug; it requires // one extra item on the stack, before the signatures. // Putting OP_0 on the stack is the workaround; - // fixing the bug would mean splitting the blockchain (old + // fixing the bug would mean splitting the block chain (old // clients would not accept new CHECKMULTISIG transactions, // and vice-versa) // |