Merge #9763: [Trivial] Update comments referencing main.cpp

00e623d [Trivial] Update comments referencing main.cpp (CryptAxe)
This commit is contained in:
Wladimir J. van der Laan 2017-02-16 14:01:00 +01:00 committed by Alexander Block
parent bb2c1624c9
commit 52819ca9b9
5 changed files with 6 additions and 6 deletions

View File

@ -38,7 +38,7 @@ fixes or code moves with actual code changes.
Commit messages should be verbose by default consisting of a short subject line Commit messages should be verbose by default consisting of a short subject line
(50 chars max), a blank line and detailed explanatory text as separate (50 chars max), a blank line and detailed explanatory text as separate
paragraph(s); unless the title alone is self-explanatory (like "Corrected typo paragraph(s); unless the title alone is self-explanatory (like "Corrected typo
in main.cpp") then a single title line is sufficient. Commit messages should be in init.cpp") then a single title line is sufficient. Commit messages should be
helpful to people reading your code in the future, so explain the reasoning for helpful to people reading your code in the future, so explain the reasoning for
your decisions. Further explanation [here](http://chris.beams.io/posts/git-commit/). your decisions. Further explanation [here](http://chris.beams.io/posts/git-commit/).
@ -79,7 +79,7 @@ Examples:
Consensus: Add new opcode for BIP-XXXX OP_CHECKAWESOMESIG Consensus: Add new opcode for BIP-XXXX OP_CHECKAWESOMESIG
Net: Automatically create hidden service, listen on Tor Net: Automatically create hidden service, listen on Tor
Qt: Add feed bump button Qt: Add feed bump button
Trivial: Fix typo in main.cpp Trivial: Fix typo in init.cpp
If a pull request is specifically not to be considered for merging (yet) please If a pull request is specifically not to be considered for merging (yet) please
prefix the title with [WIP] or use [Tasks Lists](https://help.github.com/articles/basic-writing-and-formatting-syntax/#task-lists) prefix the title with [WIP] or use [Tasks Lists](https://help.github.com/articles/basic-writing-and-formatting-syntax/#task-lists)

View File

@ -293,7 +293,7 @@ public:
virtual ~CGovernanceManager() {} virtual ~CGovernanceManager() {}
/** /**
* This is called by AlreadyHave in main.cpp as part of the inventory * This is called by AlreadyHave in net_processing.cpp as part of the inventory
* retrieval process. Returns true if we want to retrieve the object, otherwise * retrieval process. Returns true if we want to retrieve the object, otherwise
* false. (Note logic is inverted in AlreadyHave). * false. (Note logic is inverted in AlreadyHave).
*/ */

View File

@ -52,7 +52,7 @@ void CInstantSend::ProcessMessage(CNode* pfrom, const std::string& strCommand, C
if(fLiteMode) return; // disable all Dash specific functionality if(fLiteMode) return; // disable all Dash specific functionality
if(!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return; if(!sporkManager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED)) return;
// NOTE: NetMsgType::TXLOCKREQUEST is handled via ProcessMessage() in main.cpp // NOTE: NetMsgType::TXLOCKREQUEST is handled via ProcessMessage() in net_processing.cpp
if (strCommand == NetMsgType::TXLOCKVOTE) // InstantSend Transaction Lock Consensus Votes if (strCommand == NetMsgType::TXLOCKVOTE) // InstantSend Transaction Lock Consensus Votes
{ {

View File

@ -23,7 +23,7 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
// Tests this internal-to-main.cpp method: // Tests these internal-to-net_processing.cpp methods:
extern bool AddOrphanTx(const CTransactionRef& tx, NodeId peer); extern bool AddOrphanTx(const CTransactionRef& tx, NodeId peer);
extern void EraseOrphansFor(NodeId peer); extern void EraseOrphansFor(NodeId peer);
extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans); extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans);

View File

@ -385,7 +385,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
{ {
NotifyEntryAdded(entry.GetSharedTx()); NotifyEntryAdded(entry.GetSharedTx());
// Add to memory pool without checking anything. // Add to memory pool without checking anything.
// Used by main.cpp AcceptToMemoryPool(), which DOES do // Used by AcceptToMemoryPool(), which DOES do
// all the appropriate checks. // all the appropriate checks.
LOCK(cs); LOCK(cs);
indexed_transaction_set::iterator newit = mapTx.insert(entry).first; indexed_transaction_set::iterator newit = mapTx.insert(entry).first;