From 52819ca9b9e87f1e5ab56f3809e8c004d80406db Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 16 Feb 2017 14:01:00 +0100 Subject: [PATCH] Merge #9763: [Trivial] Update comments referencing main.cpp 00e623d [Trivial] Update comments referencing main.cpp (CryptAxe) --- CONTRIBUTING.md | 4 ++-- src/governance.h | 2 +- src/instantx.cpp | 2 +- src/test/DoS_tests.cpp | 2 +- src/txmempool.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eac2894164..e28d554513 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 (50 chars max), a blank line and detailed explanatory text as separate 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 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 Net: Automatically create hidden service, listen on Tor 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 prefix the title with [WIP] or use [Tasks Lists](https://help.github.com/articles/basic-writing-and-formatting-syntax/#task-lists) diff --git a/src/governance.h b/src/governance.h index 1b38cd123b..6574dc43e7 100644 --- a/src/governance.h +++ b/src/governance.h @@ -293,7 +293,7 @@ public: 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 * false. (Note logic is inverted in AlreadyHave). */ diff --git a/src/instantx.cpp b/src/instantx.cpp index 3a34a94b1e..3dd4deedc3 100644 --- a/src/instantx.cpp +++ b/src/instantx.cpp @@ -52,7 +52,7 @@ void CInstantSend::ProcessMessage(CNode* pfrom, const std::string& strCommand, C if(fLiteMode) return; // disable all Dash specific functionality 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 { diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 84c9a962f7..275b403566 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -23,7 +23,7 @@ #include #include -// Tests this internal-to-main.cpp method: +// Tests these internal-to-net_processing.cpp methods: extern bool AddOrphanTx(const CTransactionRef& tx, NodeId peer); extern void EraseOrphansFor(NodeId peer); extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans); diff --git a/src/txmempool.cpp b/src/txmempool.cpp index b343faccc7..405258533f 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -385,7 +385,7 @@ bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, { NotifyEntryAdded(entry.GetSharedTx()); // 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. LOCK(cs); indexed_transaction_set::iterator newit = mapTx.insert(entry).first;