diff options
| author | Tom Harding <tomh@thinlink.com> | 2014-06-27 16:47:33 -0700 |
|---|---|---|
| committer | Tom Harding <tomh@thinlink.com> | 2014-06-27 16:47:33 -0700 |
| commit | 7a19efe04069d9a1e251cdc94b25184f76d9d901 (patch) | |
| tree | 9852770f0275fa00ce7510b8b77b745e611f9b3f /src/main.cpp | |
| parent | 9fa53dd3bdc6f62b16a7c2b970449c8c35f4c41b (diff) | |
| download | bitcoin-7a19efe04069d9a1e251cdc94b25184f76d9d901.tar.xz | |
Formatting, spelling, comment fixes.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 48237c1b54..df810f575f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -852,7 +852,6 @@ bool RateLimitExceeded(double& dCount, int64_t& nLastTime, int64_t nLimit, unsig LOCK(csLimiter); - // Use an exponentially decaying ~10-minute window: dCount *= pow(1.0 - 1.0/600.0, (double)(nNow - nLastTime)); nLastTime = nNow; if (dCount >= nLimit*10*1000) @@ -973,7 +972,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa static int64_t nLastFreeTime; static int64_t nFreeLimit = GetArg("-limitfreerelay", 15); - if (RateLimitExceeded(dFreeCount, nLastFreeTime, nFreeLimit, nSize)) + if (RateLimitExceeded(dFreeCount, nLastFreeTime, nFreeLimit, nSize)) return state.DoS(0, error("AcceptToMemoryPool : free transaction rejected by rate limiter"), REJECT_INSUFFICIENTFEE, "insufficient priority"); @@ -1000,8 +999,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa return true; } -static void -RelayDoubleSpend(const COutPoint& outPoint, const CTransaction& doubleSpend, bool fInBlock, CBloomFilter& filter) +static void RelayDoubleSpend(const COutPoint& outPoint, const CTransaction& doubleSpend, bool fInBlock, CBloomFilter& filter) { // Relaying double-spend attempts to our peers lets them detect when // somebody might be trying to cheat them. However, blindly relaying |