aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-04-21 10:14:06 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-04-21 10:14:06 +0200
commit27ce808fb546eba0204cdcb2d87b62efdf583c62 (patch)
treec39f7b6a288e88982bd5c3df595f371e7c3a19b9
parentb6ea3bcede1cbbf89486b9d67329e0110c4624ae (diff)
tests: Error when setgenerate is used on regtest
Ever since #5957 there has been the problem that older RPC test cases (as can be found plenty in open pulls) use setgenerate() on regtest, assuming a different interpretation of the arguments. Directly generating a number of blocks has been split off into a new method `generate` - however using `setgenerate` with the previous arguments will result in spawning an unreasonable number of threads, and well, simply not work as expected without clear indication of the error. Add an error to point the user at the right method.
-rw-r--r--src/rpcmining.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 851d113f3b..aba250ba49 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -196,6 +196,8 @@ Value setgenerate(const Array& params, bool fHelp)
if (pwalletMain == NULL)
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Method not found (disabled)");
+ if (Params().MineBlocksOnDemand())
+ throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Use the generate method instead of setgenerate on this network");
bool fGenerate = true;
if (params.size() > 0)