diff options
| author | Suhas Daftuar <sdaftuar@chaincode.com> | 2016-07-05 15:50:48 -0400 |
|---|---|---|
| committer | Suhas Daftuar <sdaftuar@chaincode.com> | 2016-07-05 19:57:45 -0400 |
| commit | c1d61fbd080bcc29589b8d467df98efb7e89d231 (patch) | |
| tree | aa9fc656d5f107f80f664ac614f6895cc1faf6ca | |
| parent | 27362dda4d583a43ebf687ae097d2f45ba1c4c32 (diff) | |
| download | bitcoin-c1d61fbd080bcc29589b8d467df98efb7e89d231.tar.xz | |
Add warning if -blockminsize is used.
| -rwxr-xr-x | contrib/devtools/check-doc.py | 2 | ||||
| -rw-r--r-- | src/init.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py index 06c9551ceb..9ea0131ac3 100755 --- a/contrib/devtools/check-doc.py +++ b/contrib/devtools/check-doc.py @@ -21,7 +21,7 @@ CMD_GREP_DOCS = r"egrep -r -I 'HelpMessageOpt\(\"\-[^\"=]+?(=|\")' %s" % (CMD_RO REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"') REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")') # list unsupported, deprecated and duplicate args as they need no documentation -SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags']) +SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize']) def main(): used = check_output(CMD_GREP_ARGS, shell=True) diff --git a/src/init.cpp b/src/init.cpp index fdf6301d2a..7f82893286 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -876,6 +876,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) if (GetBoolArg("-whitelistalwaysrelay", false)) InitWarning(_("Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.")); + if (mapArgs.count("-blockminsize")) + InitWarning("Unsupported argument -blockminsize ignored."); + // Checkmempool and checkblockindex default to true in regtest mode int ratio = std::min<int>(std::max<int>(GetArg("-checkmempool", chainparams.DefaultConsistencyChecks() ? 1 : 0), 0), 1000000); if (ratio != 0) { |