neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up rpcgovernance (#1213)

Browse Source
This commit is contained in:
UdjinM6 2016-12-20 03:06:06 +04:00 committed by GitHub
parent b04f67546d
commit ff12698ed5
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/rpcgovernance.cpp
View File

@ -159,12 +159,12 @@ UniValue gobject(const UniValue& params, bool fHelp)
} }
CMasternode mn; CMasternode mn;
bool mnFound = mnodeman.Get(activeMasternode.vin, mn); bool fMnFound = mnodeman.Get(activeMasternode.vin, mn);
DBG( cout << "gobject: submit activeMasternode.pubKeyMasternode = " << activeMasternode.pubKeyMasternode.GetHash().ToString() DBG( cout << "gobject: submit activeMasternode.pubKeyMasternode = " << activeMasternode.pubKeyMasternode.GetHash().ToString()
<< ", vin = " << activeMasternode.vin.prevout.ToStringShort() << ", vin = " << activeMasternode.vin.prevout.ToStringShort()
<< ", params.size() = " << params.size() << ", params.size() = " << params.size()
<< ", mnFound = " << mnFound << endl; ); << ", fMnFound = " << fMnFound << endl; );
// ASSEMBLE NEW GOVERNANCE OBJECT FROM USER PARAMETERS // ASSEMBLE NEW GOVERNANCE OBJECT FROM USER PARAMETERS
@ -205,7 +205,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
// Attempt to sign triggers if we are a MN // Attempt to sign triggers if we are a MN
if((govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) || if((govobj.GetObjectType() == GOVERNANCE_OBJECT_TRIGGER) ||
(govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG)) { (govobj.GetObjectType() == GOVERNANCE_OBJECT_WATCHDOG)) {
if(mnFound) { if(fMnFound) {
govobj.SetMasternodeInfo(mn.vin); govobj.SetMasternodeInfo(mn.vin);
govobj.Sign(activeMasternode.keyMasternode, activeMasternode.pubKeyMasternode); govobj.Sign(activeMasternode.keyMasternode, activeMasternode.pubKeyMasternode);
} }
@ -259,8 +259,8 @@ UniValue gobject(const UniValue& params, bool fHelp)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
} }
int success = 0; int nSuccessful = 0;
int failed = 0; int nFailed = 0;
UniValue resultsObj(UniValue::VOBJ); UniValue resultsObj(UniValue::VOBJ);
@ -271,43 +271,43 @@ UniValue gobject(const UniValue& params, bool fHelp)
UniValue returnObj(UniValue::VOBJ); UniValue returnObj(UniValue::VOBJ);
CMasternode mn; CMasternode mn;
bool mnFound = mnodeman.Get(activeMasternode.vin, mn); bool fMnFound = mnodeman.Get(activeMasternode.vin, mn);
if(!mnFound) { if(!fMnFound) {
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output")); statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
resultsObj.push_back(Pair("dash.conf", statusObj)); resultsObj.push_back(Pair("dash.conf", statusObj));
returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", success, failed))); returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
returnObj.push_back(Pair("detail", resultsObj)); returnObj.push_back(Pair("detail", resultsObj));
return returnObj; return returnObj;
} }
CGovernanceVote vote(mn.vin, hash, eVoteSignal, eVoteOutcome); CGovernanceVote vote(mn.vin, hash, eVoteSignal, eVoteOutcome);
if(!vote.Sign(activeMasternode.keyMasternode, activeMasternode.pubKeyMasternode)) { if(!vote.Sign(activeMasternode.keyMasternode, activeMasternode.pubKeyMasternode)) {
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Failure to sign.")); statusObj.push_back(Pair("errorMessage", "Failure to sign."));
resultsObj.push_back(Pair("dash.conf", statusObj)); resultsObj.push_back(Pair("dash.conf", statusObj));
returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", success, failed))); returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
returnObj.push_back(Pair("detail", resultsObj)); returnObj.push_back(Pair("detail", resultsObj));
return returnObj; return returnObj;
} }
CGovernanceException exception; CGovernanceException exception;
if(governance.ProcessVoteAndRelay(vote, exception)) { if(governance.ProcessVoteAndRelay(vote, exception)) {
success++; nSuccessful++;
statusObj.push_back(Pair("result", "success")); statusObj.push_back(Pair("result", "success"));
} }
else { else {
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", exception.GetMessage())); statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
} }
resultsObj.push_back(Pair("dash.conf", statusObj)); resultsObj.push_back(Pair("dash.conf", statusObj));
returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", success, failed))); returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
returnObj.push_back(Pair("detail", resultsObj)); returnObj.push_back(Pair("detail", resultsObj));
return returnObj; return returnObj;
@ -338,8 +338,8 @@ UniValue gobject(const UniValue& params, bool fHelp)
throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'"); throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid vote outcome. Please use one of the following: 'yes', 'no' or 'abstain'");
} }
int success = 0; int nSuccessful = 0;
int failed = 0; int nFailed = 0;
std::vector<CMasternodeConfig::CMasternodeEntry> mnEntries; std::vector<CMasternodeConfig::CMasternodeEntry> mnEntries;
mnEntries = masternodeConfig.getEntries(); mnEntries = masternodeConfig.getEntries();
@ -359,7 +359,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
UniValue statusObj(UniValue::VOBJ); UniValue statusObj(UniValue::VOBJ);
if(!darkSendSigner.GetKeysFromSecret(mne.getPrivKey(), keyMasternode, pubKeyMasternode)){ if(!darkSendSigner.GetKeysFromSecret(mne.getPrivKey(), keyMasternode, pubKeyMasternode)){
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Masternode signing error, could not set key correctly")); statusObj.push_back(Pair("errorMessage", "Masternode signing error, could not set key correctly"));
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(mne.getAlias(), statusObj));
@ -377,10 +377,10 @@ UniValue gobject(const UniValue& params, bool fHelp)
CTxIn vin(COutPoint(nTxHash, nOutputIndex)); CTxIn vin(COutPoint(nTxHash, nOutputIndex));
CMasternode mn; CMasternode mn;
bool mnFound = mnodeman.Get(vin, mn); bool fMnFound = mnodeman.Get(vin, mn);
if(!mnFound) { if(!fMnFound) {
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output")); statusObj.push_back(Pair("errorMessage", "Can't find masternode by collateral output"));
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(mne.getAlias(), statusObj));
@ -389,7 +389,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
CGovernanceVote vote(mn.vin, hash, eVoteSignal, eVoteOutcome); CGovernanceVote vote(mn.vin, hash, eVoteSignal, eVoteOutcome);
if(!vote.Sign(keyMasternode, pubKeyMasternode)){ if(!vote.Sign(keyMasternode, pubKeyMasternode)){
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Failure to sign.")); statusObj.push_back(Pair("errorMessage", "Failure to sign."));
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(mne.getAlias(), statusObj));
@ -398,11 +398,11 @@ UniValue gobject(const UniValue& params, bool fHelp)
CGovernanceException exception; CGovernanceException exception;
if(governance.ProcessVoteAndRelay(vote, exception)) { if(governance.ProcessVoteAndRelay(vote, exception)) {
success++; nSuccessful++;
statusObj.push_back(Pair("result", "success")); statusObj.push_back(Pair("result", "success"));
} }
else { else {
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", exception.GetMessage())); statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
} }
@ -411,7 +411,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
} }
UniValue returnObj(UniValue::VOBJ); UniValue returnObj(UniValue::VOBJ);
returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", success, failed))); returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
returnObj.push_back(Pair("detail", resultsObj)); returnObj.push_back(Pair("detail", resultsObj));
return returnObj; return returnObj;
@ -450,8 +450,8 @@ UniValue gobject(const UniValue& params, bool fHelp)
// EXECUTE VOTE FOR EACH MASTERNODE, COUNT SUCCESSES VS FAILURES // EXECUTE VOTE FOR EACH MASTERNODE, COUNT SUCCESSES VS FAILURES
int success = 0; int nSuccessful = 0;
int failed = 0; int nFailed = 0;
std::vector<CMasternodeConfig::CMasternodeEntry> mnEntries; std::vector<CMasternodeConfig::CMasternodeEntry> mnEntries;
mnEntries = masternodeConfig.getEntries(); mnEntries = masternodeConfig.getEntries();
@ -478,7 +478,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
UniValue statusObj(UniValue::VOBJ); UniValue statusObj(UniValue::VOBJ);
if(!darkSendSigner.GetKeysFromSecret(mne.getPrivKey(), keyMasternode, pubKeyMasternode)) { if(!darkSendSigner.GetKeysFromSecret(mne.getPrivKey(), keyMasternode, pubKeyMasternode)) {
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", strprintf("Invalid masternode key %s.", mne.getPrivKey()))); statusObj.push_back(Pair("errorMessage", strprintf("Invalid masternode key %s.", mne.getPrivKey())));
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(mne.getAlias(), statusObj));
@ -498,10 +498,10 @@ UniValue gobject(const UniValue& params, bool fHelp)
CTxIn vin(COutPoint(nTxHash, nOutputIndex)); CTxIn vin(COutPoint(nTxHash, nOutputIndex));
CMasternode mn; CMasternode mn;
bool mnFound = mnodeman.Get(vin, mn); bool fMnFound = mnodeman.Get(vin, mn);
if(!mnFound) { if(!fMnFound) {
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Masternode must be publically available on network to vote. Masternode not found.")); statusObj.push_back(Pair("errorMessage", "Masternode must be publically available on network to vote. Masternode not found."));
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(mne.getAlias(), statusObj));
@ -512,7 +512,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
CGovernanceVote vote(vin, hash, eVoteSignal, eVoteOutcome); CGovernanceVote vote(vin, hash, eVoteSignal, eVoteOutcome);
if(!vote.Sign(keyMasternode, pubKeyMasternode)) { if(!vote.Sign(keyMasternode, pubKeyMasternode)) {
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Failure to sign.")); statusObj.push_back(Pair("errorMessage", "Failure to sign."));
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(mne.getAlias(), statusObj));
@ -523,11 +523,11 @@ UniValue gobject(const UniValue& params, bool fHelp)
CGovernanceException exception; CGovernanceException exception;
if(governance.ProcessVoteAndRelay(vote, exception)) { if(governance.ProcessVoteAndRelay(vote, exception)) {
success++; nSuccessful++;
statusObj.push_back(Pair("result", "success")); statusObj.push_back(Pair("result", "success"));
} }
else { else {
failed++; nFailed++;
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", exception.GetMessage())); statusObj.push_back(Pair("errorMessage", exception.GetMessage()));
} }
@ -538,7 +538,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
// REPORT STATS TO THE USER // REPORT STATS TO THE USER
UniValue returnObj(UniValue::VOBJ); UniValue returnObj(UniValue::VOBJ);
returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", success, failed))); returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", nSuccessful, nFailed)));
returnObj.push_back(Pair("detail", resultsObj)); returnObj.push_back(Pair("detail", resultsObj));
return returnObj; return returnObj;
@ -730,7 +730,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
// GETVOTES FOR SPECIFIC GOVERNANCE OBJECT // GETVOTES FOR SPECIFIC GOVERNANCE OBJECT
if(strCommand == "getcurrentvotes") if(strCommand == "getcurrentvotes")
{ {
if (params.size() < 2 || params.size() == 3 || params.size() > 4) if (params.size() != 2 && params.size() != 4)
throw std::runtime_error( throw std::runtime_error(
"Correct usage is 'gobject getcurrentvotes <governance-hash> [txid vout_index]'" "Correct usage is 'gobject getcurrentvotes <governance-hash> [txid vout_index]'"
); );
@ -812,10 +812,10 @@ UniValue voteraw(const UniValue& params, bool fHelp)
} }
CMasternode mn; CMasternode mn;
bool mnFound = mnodeman.Get(vin, mn); bool fMnFound = mnodeman.Get(vin, mn);
if(!mnFound) { if(!fMnFound) {
throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to find masternode in list : " + vin.ToString()); throw JSONRPCError(RPC_INTERNAL_ERROR, "Failure to find masternode in list : " + vin.prevout.ToStringShort());
} }
CGovernanceVote vote(vin, hashGovObj, eVoteSignal, eVoteOutcome); CGovernanceVote vote(vin, hashGovObj, eVoteSignal, eVoteOutcome);
@ -898,11 +898,11 @@ UniValue getsuperblockbudget(const UniValue& params, bool fHelp)
if (fHelp || params.size() != 1) { if (fHelp || params.size() != 1) {
throw std::runtime_error( throw std::runtime_error(
"getsuperblockbudget index\n" "getsuperblockbudget index\n"
"\nReturns the absolute minimum number of votes needed to trigger a governance action.\n" "\nReturns the absolute maximum sum of superblock payments allowed.\n"
"\nArguments:\n" "\nArguments:\n"
"1. index (numeric, required) The block index\n" "1. index (numeric, required) The block index\n"
"\nResult:\n" "\nResult:\n"
"n (numeric) The current minimum governance quorum\n" "n (numeric) The absolute maximum sum of superblock payments allowed, in " + CURRENCY_UNIT + "\n"
"\nExamples:\n" "\nExamples:\n"
+ HelpExampleCli("getsuperblockbudget", "1000") + HelpExampleCli("getsuperblockbudget", "1000")
+ HelpExampleRpc("getsuperblockbudget", "1000") + HelpExampleRpc("getsuperblockbudget", "1000")