diff options
| author | John Newbery <john@johnnewbery.com> | 2018-03-22 10:28:52 -0400 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2018-04-26 23:43:54 +0800 |
| commit | e802c2294718f1e1128f2736842595c3b84a2882 (patch) | |
| tree | f0160eec1bc11a1534d8789e6d4911e00d97574f /src | |
| parent | f118a7a35b8c880740d5ebf6230498a5951bd889 (diff) | |
| download | bitcoin-e802c2294718f1e1128f2736842595c3b84a2882.tar.xz | |
[config] Remove blockmaxsize option
The blockmaxsize option was marked as deprecated in V0.15.1, and code
was added to convert provided blockmaxsize into blockmaxweight. However,
this code was incorrectly implemented, and blockmaxsize was silently
ignored.
No users have complained about blockmaxsize being ignored, so just
remove it in V0.17.
GitHub-Pull: #12756
Rebased-From: 4757c04
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 9 | ||||
| -rw-r--r-- | src/miner.cpp | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/init.cpp b/src/init.cpp index 2a37ae780f..f873abd455 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -794,15 +794,6 @@ void InitParameterInteraction() if (gArgs.SoftSetBoolArg("-whitelistrelay", true)) LogPrintf("%s: parameter interaction: -whitelistforcerelay=1 -> setting -whitelistrelay=1\n", __func__); } - - if (gArgs.IsArgSet("-blockmaxsize")) { - unsigned int max_size = gArgs.GetArg("-blockmaxsize", 0); - if (gArgs.SoftSetArg("blockmaxweight", strprintf("%d", max_size * WITNESS_SCALE_FACTOR))) { - LogPrintf("%s: parameter interaction: -blockmaxsize=%d -> setting -blockmaxweight=%d (-blockmaxsize is deprecated!)\n", __func__, max_size, max_size * WITNESS_SCALE_FACTOR); - } else { - LogPrintf("%s: Ignoring blockmaxsize setting which is overridden by blockmaxweight", __func__); - } - } } static std::string ResolveErrMsg(const char * const optname, const std::string& strBind) diff --git a/src/miner.cpp b/src/miner.cpp index dda52790c6..298ea066fd 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -74,9 +74,7 @@ BlockAssembler::BlockAssembler(const CChainParams& params, const Options& option static BlockAssembler::Options DefaultOptions(const CChainParams& params) { // Block resource limits - // If neither -blockmaxsize or -blockmaxweight is given, limit to DEFAULT_BLOCK_MAX_* - // If only one is given, only restrict the specified resource. - // If both are given, restrict both. + // If -blockmaxweight is not given, limit to DEFAULT_BLOCK_MAX_WEIGHT BlockAssembler::Options options; options.nBlockMaxWeight = gArgs.GetArg("-blockmaxweight", DEFAULT_BLOCK_MAX_WEIGHT); if (gArgs.IsArgSet("-blockmintxfee")) { |