DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #43 from VerusCoin/CI

Browse Source 
CI updates and Mikes last fix, some README tweaks.
This commit is contained in:
David Dawes
2018-06-03 18:13:45 -07:00
committed by GitHub
parent 3451a2984a f2fae18deb
commit 8b54d943ff
9 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpcmining.cpp
View File

@@ -32,7 +32,7 @@
using namespace std;
extern int32_t ASSETCHAINS_ALGO, ASSETCHAINS_EQUIHASH;
extern int32_t ASSETCHAINS_ALGO, ASSETCHAINS_EQUIHASH, ASSETCHAINS_LWMAPOS;
/**
* Return average network hashes per second based on the last 'lookup' blocks,
@@ -320,7 +320,7 @@ UniValue setgenerate(const UniValue& params, bool fHelp)
if (params.size() > 1)
{
nGenProcLimit = params[1].get_int();
if (nGenProcLimit == 0)
if (ASSETCHAINS_LWMAPOS == 0 && nGenProcLimit == 0)
fGenerate = false;
}
@@ -375,12 +375,12 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1)));
if (ASSETCHAINS_ALGO == ASSETCHAINS_EQUIHASH)
{
obj.push_back(Pair("localsolps" , getlocalsolps(params, false)));
obj.push_back(Pair("networksolps", getnetworksolps(params, false)));
obj.push_back(Pair("localsolps" , getlocalsolps(params, false)));
obj.push_back(Pair("networksolps", getnetworksolps(params, false)));
}
else
{
obj.push_back(Pair("localhashps" , getlocalsolps(params, false)));
obj.push_back(Pair("localhashps" , GetBoolArg("-gen", false) ? getlocalsolps(params, false) : (double)0.0));
}
obj.push_back(Pair("networkhashps", getnetworksolps(params, false)));
obj.push_back(Pair("pooledtx", (uint64_t)mempool.size()));