diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-03 13:02:23 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-03 13:12:12 +0100 |
| commit | e5f1f5a26399c7d36fa8e2c29ec411eea49b0a4c (patch) | |
| tree | 400528ae4094e50ac6db7b49671ec43d7a8f16b0 /src/main.cpp | |
| parent | 6ee87f9bc5d8a4a9f9cac24d8ba85f6769e8f312 (diff) | |
| parent | 1371e6f5db88941c3b3c70d7a13b0cbf150ebf66 (diff) | |
| download | bitcoin-e5f1f5a26399c7d36fa8e2c29ec411eea49b0a4c.tar.xz | |
Merge pull request #5732
1371e6f Change "insane" to "absurd" (referring to high fees) in text strings and identifiers. (Daira Hopwood)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 38a22e4297..27c427f7cd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -904,7 +904,7 @@ CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowF bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree, - bool* pfMissingInputs, bool fRejectInsaneFee) + bool* pfMissingInputs, bool fRejectAbsurdFee) { AssertLockHeld(cs_main); if (pfMissingInputs) @@ -1063,8 +1063,8 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa dFreeCount += nSize; } - if (fRejectInsaneFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000) - return error("AcceptToMemoryPool: insane fees %s, %d > %d", + if (fRejectAbsurdFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000) + return error("AcceptToMemoryPool: absurdly high fees %s, %d > %d", hash.ToString(), nFees, ::minRelayTxFee.GetFee(nSize) * 10000); |