diff options
| author | Carl Dong <contact@carldong.me> | 2021-10-28 13:46:19 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2022-06-28 15:36:18 -0400 |
| commit | 82f00de7a6a60cbc9ad0c6e1d0ffb1bc70c49af5 (patch) | |
| tree | 1a034d8f11035bf508c82a9cac2c8d935c648d03 /src/policy | |
| parent | f1941e8bfd2eecc478c7660434b1ebf6a64095a0 (diff) | |
| download | bitcoin-82f00de7a6a60cbc9ad0c6e1d0ffb1bc70c49af5.tar.xz | |
mempool: Pass in -maxmempool instead of referencing gArgs
- Store the mempool size limit (-maxmempool) in CTxMemPool as a member.
- Remove the requirement to explicitly specify a mempool size limit for
CTxMemPool::GetMinFee(...) and LimitMempoolSize(...), just use the
stored mempool size limit where possible.
- Remove all now-unnecessary instances of:
gArgs.GetIntArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE_MB) * 1000000
The code change in CChainState::GetCoinsCacheSizeState() is correct
since the coinscache should not repurpose "extra" mempool memory
headroom for itself if the mempool doesn't even exist.
Diffstat (limited to 'src/policy')
| -rw-r--r-- | src/policy/policy.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/policy/policy.h b/src/policy/policy.h index 027b9c6a37..b3993b6a24 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -31,8 +31,6 @@ static constexpr unsigned int MIN_STANDARD_TX_NONWITNESS_SIZE{82}; static constexpr unsigned int MAX_P2SH_SIGOPS{15}; /** The maximum number of sigops we're willing to relay/mine in a single tx */ static constexpr unsigned int MAX_STANDARD_TX_SIGOPS_COST{MAX_BLOCK_SIGOPS_COST/5}; -/** Default for -maxmempool, maximum megabytes of mempool memory usage */ -static constexpr unsigned int DEFAULT_MAX_MEMPOOL_SIZE_MB{300}; /** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or BIP 125 replacement **/ static constexpr unsigned int DEFAULT_INCREMENTAL_RELAY_FEE{1000}; /** Default for -bytespersigop */ |