diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-08 12:37:56 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-08 12:38:10 +0100 |
commit | c8183bf8ea75608987a00c7c8a1450d89e9ca43a (patch) | |
tree | a2114829d9aea7c4da4432f3b6b049f8a2c1cde3 /src/main.cpp | |
parent | c5e0aef5c4a6beaf9869b942e0671dfb31196533 (diff) | |
parent | 23f3435962f0cfa57a95b293094fe9d0fe9d968c (diff) | |
download | bitcoin-c8183bf8ea75608987a00c7c8a1450d89e9ca43a.tar.xz |
Merge pull request #5589
23f3435 Rename MAX_TX_SIGOPS to MAX_STANDARD_TX_SIGOPS to match similar policy constant MAX_STANDARD_TX_SIZE (Luke Dashjr)
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 e1a0973352..2e9d954458 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1002,15 +1002,15 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa // Check that the transaction doesn't have an excessive number of // sigops, making it impossible to mine. Since the coinbase transaction - // itself can contain sigops MAX_TX_SIGOPS is less than + // itself can contain sigops MAX_STANDARD_TX_SIGOPS is less than // MAX_BLOCK_SIGOPS; we still consider this an invalid rather than // merely non-standard transaction. unsigned int nSigOps = GetLegacySigOpCount(tx); nSigOps += GetP2SHSigOpCount(tx, view); - if (nSigOps > MAX_TX_SIGOPS) + if (nSigOps > MAX_STANDARD_TX_SIGOPS) return state.DoS(0, error("AcceptToMemoryPool : too many sigops %s, %d > %d", - hash.ToString(), nSigOps, MAX_TX_SIGOPS), + hash.ToString(), nSigOps, MAX_STANDARD_TX_SIGOPS), REJECT_NONSTANDARD, "bad-txns-too-many-sigops"); CAmount nValueOut = tx.GetValueOut(); |