Use constants and minor fixes by luke-jr #6905

maflcko · 2015-10-29T18:28:32Z

Not sure if #6349 finds its way out of rebase hell anytime soon. Those three commits can be merged without rebase (I preserved the commit hashes)

They already got some sort of code review as part of #6349 so it's better to merge them without rebase, imo.

…hain method

…database, not memory pool)

…t; also show correct default in getmininginfo

jtimon · 2015-10-29T18:54:08Z

src/rpcmining.cpp

@@ -211,7 +211,7 @@ UniValue setgenerate(const UniValue& params, bool fHelp)
    if (params.size() > 0)
        fGenerate = params[0].get_bool();

-    int nGenProcLimit = -1;
+    int nGenProcLimit = GetArg("-genproclimit", DEFAULT_GENERATE_THREADS);


Why this changes from -1 to GetArg("-genproclimit", DEFAULT_GENERATE_THREADS) but in getmininginfo() the change is from -1 to DEFAULT_GENERATE_THREADS?

You still want to obey the command line arg if nothing is set via rpc.

Is it a bugfix or enhanced functionality? Again, why one uses GetArg() but the other doesn't?

Yes, it fixes one bug: If genproclimit is omitted to RPC setgenerate, don't change it; (copied from commit msg)

Making getmininginfo push back the "correct" value nGenProcLimit may involve some more work. But at least this PR did not introduce the issue. The PR is not perfect, but improves things considerably.

Thank you. Everything else was completely trivial to review, but I thought this deserved a more detailed explanation.

jonasschnelli · 2015-10-29T19:22:18Z

I think this is a good idea.
utACK.

Miner and Wallet init help strings could also slowly migrate into wallet/ miner/ classes. I once did this for the wallet, but it requires rebase and maybe more small, reviewable PRs: #5990

dcousens · 2015-10-30T05:55:23Z

utACK

jtimon · 2015-10-30T10:32:11Z

utACK besides my nit/question.

laanwj · 2015-11-04T10:39:32Z

src/init.cpp

@@ -404,12 +404,16 @@ std::string HelpMessage(HelpMessageMode mode)
    if (showDebug)
    {
        strUsage += HelpMessageOpt("-checkpoints", strprintf("Disable expensive verification for known chain history (default: %u)", 1));
-        strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush database activity from memory pool to disk log every <n> megabytes (default: %u)", 100));
+#ifdef ENABLE_WALLET
+        strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DEFAULT_WALLET_DBLOGSIZE));


Good find on missing ENABLE_WALLET here

All credit goes to @luke-jr ;)

laanwj · 2015-11-04T10:40:00Z

utACK

a6efc01 Bugfix: Omit wallet-related options from -help when wallet is disabled (Luke Dashjr) 5f9260f Bugfix: If genproclimit is omitted to RPC setgenerate, don't change it; also show correct default in getmininginfo (Luke Dashjr) 420a82f Bugfix: Describe dblogsize option correctly (it refers to the wallet database, not memory pool) (Luke Dashjr) caa3d42 Bugfix: RPC: blockchain: Display correct defaults in help for verifychain method (Luke Dashjr)

…hain method Github-Pull: bitcoin#6905 Rebased-From: caa3d42

…database, not memory pool) Github-Pull: bitcoin#6905 Rebased-From: 420a82f

…t; also show correct default in getmininginfo Github-Pull: bitcoin#6905 Rebased-From: 5f9260f

Github-Pull: bitcoin#6905 Rebased-From: a6efc01

…hain method Github-Pull: bitcoin#6905 Rebased-From: caa3d42

…database, not memory pool) Github-Pull: bitcoin#6905 Rebased-From: 420a82f

…t; also show correct default in getmininginfo Github-Pull: bitcoin#6905 Rebased-From: 5f9260f

Github-Pull: bitcoin#6905 Rebased-From: a6efc01

Misc upstream PRs Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6077 - Second commit only (first was already applied to 0.11.X and then reverted) - bitcoin/bitcoin#6284 - bitcoin/bitcoin#6489 - bitcoin/bitcoin#6462 - bitcoin/bitcoin#6647 - bitcoin/bitcoin#6235 - bitcoin/bitcoin#6905 - bitcoin/bitcoin#6780 - Excluding second commit (QT) and third commit (requires bitcoin/bitcoin#6993) - bitcoin/bitcoin#6961 - Excluding QT parts, and a small `src/policy/policy.cpp` change which depends on a bunch of other PRs, which we'll have to remember to come back to. - bitcoin/bitcoin#7044 - bitcoin/bitcoin#8856 - bitcoin/bitcoin#9002 Part of #2074 and #2132.

Misc upstream PRs Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6077 - Second commit only (first was already applied to 0.11.X and then reverted) - bitcoin/bitcoin#6284 - bitcoin/bitcoin#6489 - bitcoin/bitcoin#6235 - bitcoin/bitcoin#6905 - bitcoin/bitcoin#6780 - Excluding second commit (QT) and third commit (requires bitcoin/bitcoin#6993) - bitcoin/bitcoin#6961 - Excluding QT parts, and a small `src/policy/policy.cpp` change which depends on a bunch of other PRs, which we'll have to remember to come back to. - bitcoin/bitcoin#7044 - bitcoin/bitcoin#8856 - bitcoin/bitcoin#9002 Part of #2074 and #2132.

luke-jr added 3 commits October 1, 2015 23:16

Bugfix: RPC: blockchain: Display correct defaults in help for verifyc…

caa3d42

…hain method

Bugfix: Describe dblogsize option correctly (it refers to the wallet …

420a82f

…database, not memory pool)

Bugfix: If genproclimit is omitted to RPC setgenerate, don't change i…

5f9260f

…t; also show correct default in getmininginfo

maflcko closed this Oct 29, 2015

maflcko deleted the lukejr-constants-no-mergeConf branch October 29, 2015 18:52

jtimon reviewed Oct 29, 2015
View reviewed changes

maflcko reopened this Oct 29, 2015

Bugfix: Omit wallet-related options from -help when wallet is disabled

a6efc01

maflcko force-pushed the lukejr-constants-no-mergeConf branch from 693de4d to a6efc01 Compare October 29, 2015 23:32

laanwj added the Refactoring label Oct 30, 2015

laanwj reviewed Nov 4, 2015
View reviewed changes

laanwj merged commit a6efc01 into bitcoin:master Nov 4, 2015

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Nov 18, 2015

Bugfix: RPC: blockchain: Display correct defaults in help for verifyc…

f7b8ee5

…hain method Github-Pull: bitcoin#6905 Rebased-From: caa3d42

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Nov 18, 2015

Bugfix: Describe dblogsize option correctly (it refers to the wallet …

d67c116

…database, not memory pool) Github-Pull: bitcoin#6905 Rebased-From: 420a82f

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Nov 18, 2015

Bugfix: If genproclimit is omitted to RPC setgenerate, don't change i…

965269d

…t; also show correct default in getmininginfo Github-Pull: bitcoin#6905 Rebased-From: 5f9260f

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Nov 18, 2015

Bugfix: Omit wallet-related options from -help when wallet is disabled

6f6b1d4

Github-Pull: bitcoin#6905 Rebased-From: a6efc01

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015

Bugfix: RPC: blockchain: Display correct defaults in help for verifyc…

45f2e9d

…hain method Github-Pull: bitcoin#6905 Rebased-From: caa3d42

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015

Bugfix: Describe dblogsize option correctly (it refers to the wallet …

20b079b

…database, not memory pool) Github-Pull: bitcoin#6905 Rebased-From: 420a82f

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015

Bugfix: If genproclimit is omitted to RPC setgenerate, don't change i…

b049e29

…t; also show correct default in getmininginfo Github-Pull: bitcoin#6905 Rebased-From: 5f9260f

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Dec 8, 2015

Bugfix: Omit wallet-related options from -help when wallet is disabled

ab99a5b

Github-Pull: bitcoin#6905 Rebased-From: a6efc01

This was referenced May 18, 2017

mapArgs is modified by setgenerate RPC without locking zcash/zcash#2132

Open

Misc upstream PRs zcash/zcash#2390

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Use constants and minor fixes by luke-jr #6905

Use constants and minor fixes by luke-jr #6905

Uh oh!

maflcko commented Oct 29, 2015

Uh oh!

jtimon Oct 29, 2015

Uh oh!

maflcko Oct 29, 2015

Uh oh!

jtimon Oct 30, 2015

Uh oh!

maflcko Oct 30, 2015

Uh oh!

maflcko Oct 30, 2015

Uh oh!

jtimon Oct 30, 2015

Uh oh!

jonasschnelli commented Oct 29, 2015

Uh oh!

dcousens commented Oct 30, 2015

Uh oh!

jtimon commented Oct 30, 2015

Uh oh!

laanwj Nov 4, 2015

Uh oh!

maflcko Nov 4, 2015

Uh oh!

laanwj commented Nov 4, 2015

Uh oh!

Uh oh!

Use constants and minor fixes by luke-jr #6905

Use constants and minor fixes by luke-jr #6905

Uh oh!

Conversation

maflcko commented Oct 29, 2015

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jonasschnelli commented Oct 29, 2015

Uh oh!

dcousens commented Oct 30, 2015

Uh oh!

jtimon commented Oct 30, 2015

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

laanwj commented Nov 4, 2015

Uh oh!

Uh oh!