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

consistent JSON return value for failed vote (#1001)

Browse Source 
* consistent JSON return value for failed vote

* make JSON output for voting results consistent

* result should be either 'success' or 'failed'
* error message belongs in 'errorMessage' field
This commit is contained in:
Nathan Marley 2016-09-11 20:17:41 -05:00 committed by UdjinM6
parent b31ee8441a
commit 1043252d43
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rpcgovernance.cpp
View File

@ -245,6 +245,7 @@ UniValue gobject(const UniValue& params, bool fHelp)
std::string strMasterNodeSignMessage; std::string strMasterNodeSignMessage;
UniValue statusObj(UniValue::VOBJ); UniValue statusObj(UniValue::VOBJ);
UniValue returnObj(UniValue::VOBJ);
CMasternode* pmn = mnodeman.Find(activeMasternode.pubKeyMasternode); CMasternode* pmn = mnodeman.Find(activeMasternode.pubKeyMasternode);
if(pmn == NULL) if(pmn == NULL)
@ -253,7 +254,10 @@ UniValue gobject(const UniValue& params, bool fHelp)
statusObj.push_back(Pair("result", "failed")); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", "Can't find masternode by pubkey")); statusObj.push_back(Pair("errorMessage", "Can't find masternode by pubkey"));
resultsObj.push_back(Pair("dash.conf", statusObj)); resultsObj.push_back(Pair("dash.conf", statusObj));
return "Can't find masternode by pubkey";
returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", success, failed)));
returnObj.push_back(Pair("detail", resultsObj));
return returnObj;
} }
CGovernanceVote vote(pmn->vin, hash, eVoteSignal, eVoteOutcome); CGovernanceVote vote(pmn->vin, hash, eVoteSignal, eVoteOutcome);
@ -262,7 +266,9 @@ UniValue gobject(const UniValue& params, bool fHelp)
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));
return "Failure to sign."; returnObj.push_back(Pair("overall", strprintf("Voted successfully %d time(s) and failed %d time(s).", success, failed)));
returnObj.push_back(Pair("detail", resultsObj));
return returnObj;
} }
std::string strError = ""; std::string strError = "";
@ -273,12 +279,12 @@ UniValue gobject(const UniValue& params, bool fHelp)
statusObj.push_back(Pair("result", "success")); statusObj.push_back(Pair("result", "success"));
} else { } else {
failed++; failed++;
statusObj.push_back(Pair("result", strError.c_str())); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", strError.c_str()));
} }
resultsObj.push_back(Pair("dash.conf", statusObj)); resultsObj.push_back(Pair("dash.conf", statusObj));
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).", success, failed)));
returnObj.push_back(Pair("detail", resultsObj)); returnObj.push_back(Pair("detail", resultsObj));
@ -480,7 +486,8 @@ UniValue gobject(const UniValue& params, bool fHelp)
statusObj.push_back(Pair("result", "success")); statusObj.push_back(Pair("result", "success"));
} else { } else {
failed++; failed++;
statusObj.push_back(Pair("result", strError.c_str())); statusObj.push_back(Pair("result", "failed"));
statusObj.push_back(Pair("errorMessage", strError.c_str()));
} }
resultsObj.push_back(Pair(mne.getAlias(), statusObj)); resultsObj.push_back(Pair(mne.getAlias(), statusObj));