Merge pull request #6039

27ce808 tests: Error when setgenerate is used on regtest (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan
2015-04-23 18:03:34 +02:00

View File

@ -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)