diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-02-16 14:01:00 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-02-16 14:01:14 +0100 |
| commit | 8743320d6cb31291c0786b33124209b76f6c1904 (patch) | |
| tree | 9d383afed19f5da6ecd0e90cf64550b86cb4f9d4 | |
| parent | Merge #9771: Add missing cs_wallet lock that triggers new lock held assertion (diff) | |
| parent | [Trivial] Update comments referencing main.cpp (diff) | |
| download | discoin-8743320d6cb31291c0786b33124209b76f6c1904.tar.xz discoin-8743320d6cb31291c0786b33124209b76f6c1904.zip | |
Merge #9763: [Trivial] Update comments referencing main.cpp
00e623d [Trivial] Update comments referencing main.cpp (CryptAxe)
| -rw-r--r-- | CONTRIBUTING.md | 4 | ||||
| -rw-r--r-- | src/test/DoS_tests.cpp | 2 | ||||
| -rw-r--r-- | src/txmempool.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47648cde2..b932b2dd8 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/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index a8f09ba6a..c62e6ae83 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -23,7 +23,7 @@ #include <boost/foreach.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 void EraseOrphansFor(NodeId peer); extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans); diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 236527a2b..5842dd88d 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -395,7 +395,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; |