diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-10-20 21:17:51 -0300 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-10-20 21:17:53 -0300 |
| commit | 75795603dd2f0fe7dcdac19d4a76bc1f73735cdc (patch) | |
| tree | ce8a6eda840cdb7fc86d8a04e1ca1c7d23ea33ac | |
| parent | 96c409c919b97c8c645f7e42b35c6e5c2d2e2160 (diff) | |
| parent | 97ddc6026b4e14ee0bb4c5b04a7824ac0a7e23ab (diff) | |
Merge #13909: validation: Pass chainparams in AcceptToMemoryPoolWorker(...)
97ddc6026b validation: Pass chainparams in AcceptToMemoryPoolWorker(...) (practicalswift)
Pull request description:
Remove unused `CChainParams` argument in `AcceptToMemoryPoolWorker(...)`.
After the merge of #13527 ("policy: Remove promiscuousmempoolflags") yesterday the `CChainParams` argument is no longer used in `AcceptToMemoryPoolWorker(...)`.
Tree-SHA512: f1bab4498b64f0ab5230b8172f860df8fa8a302e4ee7385be4ba9c65a37cbc3ef640df78348c477169b9414e5c6a160a0b6471a11f4bb27921500ec208ef5340
| -rw-r--r-- | src/validation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 458458d85d..80ae2428dc 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -918,7 +918,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool // There is a similar check in CreateNewBlock() to prevent creating // invalid blocks (using TestBlockValidity), however allowing such // transactions into the mempool can be exploited as a DoS attack. - unsigned int currentBlockScriptVerifyFlags = GetBlockScriptFlags(chainActive.Tip(), Params().GetConsensus()); + unsigned int currentBlockScriptVerifyFlags = GetBlockScriptFlags(chainActive.Tip(), chainparams.GetConsensus()); if (!CheckInputsFromMempoolAndCache(tx, state, view, pool, currentBlockScriptVerifyFlags, true, txdata)) { return error("%s: BUG! PLEASE REPORT THIS! CheckInputs failed against latest-block but not STANDARD flags %s, %s", __func__, hash.ToString(), FormatStateMessage(state)); |