diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-27 16:59:41 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-27 16:59:44 +0100 |
| commit | 8284feb3c91f91505c66d5c3b7ef8349b7d79862 (patch) | |
| tree | 9085ad53cbf619f8420d87da346559b3e25670c4 | |
| parent | 93e0514fd083971dcef1fea8d107895244270f4c (diff) | |
| parent | a64d7b4e4246cbb56bba08bf87b6696c03d6972a (diff) | |
| download | bitcoin-8284feb3c91f91505c66d5c3b7ef8349b7d79862.tar.xz | |
Merge pull request #7117
a64d7b4 Print correct minimum mempool size in MB (paveljanik)
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 3e46958afc..12999668b5 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -902,7 +902,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) int64_t nMempoolSizeMax = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000; int64_t nMempoolSizeMin = GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) * 1000 * 40; if (nMempoolSizeMax < 0 || nMempoolSizeMax < nMempoolSizeMin) - return InitError(strprintf(_("-maxmempool must be at least %d MB"), std::ceil(nMempoolSizeMin / 1000.0))); + return InitError(strprintf(_("-maxmempool must be at least %d MB"), std::ceil(nMempoolSizeMin / 1000000.0))); // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency nScriptCheckThreads = GetArg("-par", DEFAULT_SCRIPTCHECK_THREADS); |