diff options
| author | jtimon <jtimon@monetize.io> | 2014-03-09 18:35:41 -0700 |
|---|---|---|
| committer | jtimon <jtimon@monetize.io> | 2014-06-04 13:29:35 +0200 |
| commit | cb9bd83bba86e73e3720110ce47600b6f895573c (patch) | |
| tree | d6f699d3c76567b88d38e772ce7407ffc2bc90cb /src | |
| parent | 2595b9ac23735649f4601c27924821641611696e (diff) | |
Add DefaultCheckMemPool chain parameter
Diffstat (limited to 'src')
| -rw-r--r-- | src/chainparams.cpp | 1 | ||||
| -rw-r--r-- | src/chainparams.h | 2 | ||||
| -rw-r--r-- | src/init.cpp | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 64723978bb..75a14c6013 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -250,6 +250,7 @@ public: virtual bool RequireRPCPassword() const { return false; } virtual bool MiningRequiresPeers() const { return false; } virtual bool MineBlocksOnDemand() const { return true; } + virtual bool DefaultCheckMemPool() const { return true; } virtual Network NetworkID() const { return CChainParams::REGTEST; } }; static CRegTestParams regTestParams; diff --git a/src/chainparams.h b/src/chainparams.h index f331d956fe..bc982ee040 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -63,6 +63,8 @@ public: virtual bool RequireRPCPassword() const { return true; } /* Make miner wait to have peers to avoid wasting work */ virtual bool MiningRequiresPeers() const { return true; } + /* Default value for -checkmempool argument */ + virtual bool DefaultCheckMemPool() const { return false; } const string& DataDir() const { return strDataDir; } /* Make miner stop after a block is found. In RPC, don't return * until nGenProcLimit blocks are generated */ diff --git a/src/init.cpp b/src/init.cpp index 840a07d610..a225c3f964 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -517,7 +517,8 @@ bool AppInit2(boost::thread_group& threadGroup) InitWarning(_("Warning: Deprecated argument -debugnet ignored, use -debug=net")); fBenchmark = GetBoolArg("-benchmark", false); - mempool.setSanityCheck(GetBoolArg("-checkmempool", RegTest())); + // Checkmempool defaults to true in regtest mode + mempool.setSanityCheck(GetBoolArg("-checkmempool", Params().DefaultCheckMemPool())); Checkpoints::fEnabled = GetBoolArg("-checkpoints", true); // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency |