Skip to content

Commit 8c841a3

Browse files
committed
Merge #10626: doc: Remove outdated minrelaytxfee comment
fab9b60 doc: Remove outdated minrelaytxfee comment (MarcoFalke) Tree-SHA512: e36c5a554a9773f034c2d358c52a772688009a5a71dfd3f664d9b5566c98378f44ef7c6dc0902b42d69ab5fd54b60d4850a2903823d0b2309c7ae063d1923f7f
2 parents e292140 + fab9b60 commit 8c841a3

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

contrib/devtools/check-doc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
2222
REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
2323
# list unsupported, deprecated and duplicate args as they need no documentation
24-
SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions'])
24+
SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize'])
2525

2626
def main():
2727
used = check_output(CMD_GREP_ARGS, shell=True)

src/init.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,14 +1028,7 @@ bool AppInitParameterInteraction()
10281028
if (nConnectTimeout <= 0)
10291029
nConnectTimeout = DEFAULT_CONNECT_TIMEOUT;
10301030

1031-
// Fee-per-kilobyte amount required for mempool acceptance and relay
1032-
// If you are mining, be careful setting this:
1033-
// if you set it to zero then
1034-
// a transaction spammer can cheaply fill blocks using
1035-
// 0-fee transactions. It should be set above the real
1036-
// cost to you of processing a transaction.
1037-
if (IsArgSet("-minrelaytxfee"))
1038-
{
1031+
if (IsArgSet("-minrelaytxfee")) {
10391032
CAmount n = 0;
10401033
if (!ParseMoney(GetArg("-minrelaytxfee", ""), n)) {
10411034
return InitError(AmountErrMsg("minrelaytxfee", GetArg("-minrelaytxfee", "")));

0 commit comments

Comments
 (0)