Skip to content

Commit 92c8273

Browse files
FuzzbawlsFuzzbawls
committed
scripted-diff: Use UniValue.pushKV instead of push_back(Pair())
-BEGIN VERIFY SCRIPT- git grep -l "push_back(Pair" | xargs sed -i "s/push_back(Pair(\(.*\)));/pushKV(\1);/g" -END VERIFY SCRIPT-
1 parent da34931 commit 92c8273

File tree

12 files changed

+687
-687
lines changed

12 files changed

+687
-687
lines changed

‎src/masternode-budget.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,11 +1689,11 @@ std::string CBudgetVote::GetStrMessage() const
16891689
UniValue CBudgetVote::ToJSON() const
16901690
{
16911691
UniValue bObj(UniValue::VOBJ);
1692-
bObj.push_back(Pair("mnId", vin.prevout.hash.ToString()));
1693-
bObj.push_back(Pair("nHash", vin.prevout.GetHash().ToString()));
1694-
bObj.push_back(Pair("Vote", GetVoteString()));
1695-
bObj.push_back(Pair("nTime", nTime));
1696-
bObj.push_back(Pair("fValid", fValid));
1692+
bObj.pushKV("mnId", vin.prevout.hash.ToString());
1693+
bObj.pushKV("nHash", vin.prevout.GetHash().ToString());
1694+
bObj.pushKV("Vote", GetVoteString());
1695+
bObj.pushKV("nTime", nTime);
1696+
bObj.pushKV("fValid", fValid);
16971697
return bObj;
16981698
}
16991699

@@ -2251,9 +2251,9 @@ uint256 CFinalizedBudgetVote::GetHash() const
22512251
UniValue CFinalizedBudgetVote::ToJSON() const
22522252
{
22532253
UniValue bObj(UniValue::VOBJ);
2254-
bObj.push_back(Pair("nHash", vin.prevout.GetHash().ToString()));
2255-
bObj.push_back(Pair("nTime", (int64_t) nTime));
2256-
bObj.push_back(Pair("fValid", fValid));
2254+
bObj.pushKV("nHash", vin.prevout.GetHash().ToString());
2255+
bObj.pushKV("nTime", (int64_t) nTime);
2256+
bObj.pushKV("fValid", fValid);
22572257
return bObj;
22582258
}
22592259

‎src/rest.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -549,23 +549,23 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
549549

550550
// pack in some essentials
551551
// use more or less the same output as mentioned in Bip64
552-
objGetUTXOResponse.push_back(Pair("chainHeight", chainActive.Height()));
553-
objGetUTXOResponse.push_back(Pair("chaintipHash", chainActive.Tip()->GetBlockHash().GetHex()));
554-
objGetUTXOResponse.push_back(Pair("bitmap", bitmapStringRepresentation));
552+
objGetUTXOResponse.pushKV("chainHeight", chainActive.Height());
553+
objGetUTXOResponse.pushKV("chaintipHash", chainActive.Tip()->GetBlockHash().GetHex());
554+
objGetUTXOResponse.pushKV("bitmap", bitmapStringRepresentation);
555555

556556
UniValue utxos(UniValue::VARR);
557557
for (const CCoin& coin : outs) {
558558
UniValue utxo(UniValue::VOBJ);
559-
utxo.push_back(Pair("height", (int32_t)coin.nHeight));
560-
utxo.push_back(Pair("value", ValueFromAmount(coin.out.nValue)));
559+
utxo.pushKV("height", (int32_t)coin.nHeight);
560+
utxo.pushKV("value", ValueFromAmount(coin.out.nValue));
561561

562562
// include the script in a json output
563563
UniValue o(UniValue::VOBJ);
564564
ScriptPubKeyToJSON(coin.out.scriptPubKey, o, true);
565-
utxo.push_back(Pair("scriptPubKey", o));
565+
utxo.pushKV("scriptPubKey", o);
566566
utxos.push_back(utxo);
567567
}
568-
objGetUTXOResponse.push_back(Pair("utxos", utxos));
568+
objGetUTXOResponse.pushKV("utxos", utxos);
569569

570570
// return json string
571571
std::string strJSON = objGetUTXOResponse.write() + "\n";

‎src/rpc/blockchain.cpp‎

Lines changed: 110 additions & 110 deletions
Large diffs are not rendered by default.

‎src/rpc/budget.cpp‎

Lines changed: 95 additions & 95 deletions
Large diffs are not rendered by default.

‎src/rpc/masternode.cpp‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ UniValue listmasternodes(const JSONRPCRequest& request)
7979
LookupHost(strHost.c_str(), node, false);
8080
std::string strNetwork = GetNetworkName(node.GetNetwork());
8181

82-
obj.push_back(Pair("rank", (strStatus == "ENABLED" ? s.first : 0)));
83-
obj.push_back(Pair("network", strNetwork));
84-
obj.push_back(Pair("txhash", strTxHash));
85-
obj.push_back(Pair("outidx", (uint64_t)oIdx));
86-
obj.push_back(Pair("pubkey", HexStr(mn->pubKeyMasternode)));
87-
obj.push_back(Pair("status", strStatus));
88-
obj.push_back(Pair("addr", EncodeDestination(mn->pubKeyCollateralAddress.GetID())));
89-
obj.push_back(Pair("version", mn->protocolVersion));
90-
obj.push_back(Pair("lastseen", (int64_t)mn->lastPing.sigTime));
91-
obj.push_back(Pair("activetime", (int64_t)(mn->lastPing.sigTime - mn->sigTime)));
92-
obj.push_back(Pair("lastpaid", (int64_t)mn->GetLastPaid()));
82+
obj.pushKV("rank", (strStatus == "ENABLED" ? s.first : 0));
83+
obj.pushKV("network", strNetwork);
84+
obj.pushKV("txhash", strTxHash);
85+
obj.pushKV("outidx", (uint64_t)oIdx);
86+
obj.pushKV("pubkey", HexStr(mn->pubKeyMasternode));
87+
obj.pushKV("status", strStatus);
88+
obj.pushKV("addr", EncodeDestination(mn->pubKeyCollateralAddress.GetID()));
89+
obj.pushKV("version", mn->protocolVersion);
90+
obj.pushKV("lastseen", (int64_t)mn->lastPing.sigTime);
91+
obj.pushKV("activetime", (int64_t)(mn->lastPing.sigTime - mn->sigTime));
92+
obj.pushKV("lastpaid", (int64_t)mn->GetLastPaid());
9393

9494
ret.push_back(obj);
9595
}
@@ -126,13 +126,13 @@ UniValue getmasternodecount (const JSONRPCRequest& request)
126126
mnodeman.GetNextMasternodeInQueueForPayment(nChainHeight, true, nCount);
127127
mnodeman.CountNetworks(ActiveProtocol(), ipv4, ipv6, onion);
128128

129-
obj.push_back(Pair("total", mnodeman.size()));
130-
obj.push_back(Pair("stable", mnodeman.stable_size()));
131-
obj.push_back(Pair("enabled", mnodeman.CountEnabled()));
132-
obj.push_back(Pair("inqueue", nCount));
133-
obj.push_back(Pair("ipv4", ipv4));
134-
obj.push_back(Pair("ipv6", ipv6));
135-
obj.push_back(Pair("onion", onion));
129+
obj.pushKV("total", mnodeman.size());
130+
obj.pushKV("stable", mnodeman.stable_size());
131+
obj.pushKV("enabled", mnodeman.CountEnabled());
132+
obj.pushKV("inqueue", nCount);
133+
obj.pushKV("ipv4", ipv4);
134+
obj.pushKV("ipv6", ipv6);
135+
obj.pushKV("onion", onion);
136136

137137
return obj;
138138
}
@@ -161,11 +161,11 @@ UniValue masternodecurrent (const JSONRPCRequest& request)
161161
CMasternode* winner = mnodeman.GetNextMasternodeInQueueForPayment(nHeight, true, nCount);
162162
if (winner) {
163163
UniValue obj(UniValue::VOBJ);
164-
obj.push_back(Pair("protocol", (int64_t)winner->protocolVersion));
165-
obj.push_back(Pair("txhash", winner->vin.prevout.hash.ToString()));
166-
obj.push_back(Pair("pubkey", EncodeDestination(winner->pubKeyCollateralAddress.GetID())));
167-
obj.push_back(Pair("lastseen", winner->lastPing.IsNull() ? winner->sigTime : (int64_t)winner->lastPing.sigTime));
168-
obj.push_back(Pair("activeseconds", winner->lastPing.IsNull() ? 0 : (int64_t)(winner->lastPing.sigTime - winner->sigTime)));
164+
obj.pushKV("protocol", (int64_t)winner->protocolVersion);
165+
obj.pushKV("txhash", winner->vin.prevout.hash.ToString());
166+
obj.pushKV("pubkey", EncodeDestination(winner->pubKeyCollateralAddress.GetID()));
167+
obj.pushKV("lastseen", winner->lastPing.IsNull() ? winner->sigTime : (int64_t)winner->lastPing.sigTime);
168+
obj.pushKV("activeseconds", winner->lastPing.IsNull() ? 0 : (int64_t)(winner->lastPing.sigTime - winner->sigTime));
169169
return obj;
170170
}
171171

@@ -188,9 +188,9 @@ bool StartMasternodeEntry(UniValue& statusObjRet, CMasternodeBroadcast& mnbRet,
188188

189189
fSuccessRet = CMasternodeBroadcast::Create(mne.getIp(), mne.getPrivKey(), mne.getTxHash(), mne.getOutputIndex(), errorMessage, mnbRet);
190190

191-
statusObjRet.push_back(Pair("alias", mne.getAlias()));
192-
statusObjRet.push_back(Pair("result", fSuccessRet ? "success" : "failed"));
193-
statusObjRet.push_back(Pair("error", fSuccessRet ? "" : errorMessage));
191+
statusObjRet.pushKV("alias", mne.getAlias());
192+
statusObjRet.pushKV("result", fSuccessRet ? "success" : "failed");
193+
statusObjRet.pushKV("error", fSuccessRet ? "" : errorMessage);
194194

195195
return true;
196196
}
@@ -218,7 +218,7 @@ void SerializeMNB(UniValue& statusObjRet, const CMasternodeBroadcast& mnb, const
218218
successful++;
219219
CDataStream ssMnb(SER_NETWORK, PROTOCOL_VERSION);
220220
ssMnb << mnb;
221-
statusObjRet.push_back(Pair("hex", HexStr(ssMnb.begin(), ssMnb.end())));
221+
statusObjRet.pushKV("hex", HexStr(ssMnb.begin(), ssMnb.end()));
222222
} else {
223223
failed++;
224224
}
@@ -321,8 +321,8 @@ UniValue startmasternode (const JSONRPCRequest& request)
321321
pwalletMain->Lock();
322322

323323
UniValue returnObj(UniValue::VOBJ);
324-
returnObj.push_back(Pair("overall", strprintf("Successfully started %d masternodes, failed to start %d, total %d", successful, failed, successful + failed)));
325-
returnObj.push_back(Pair("detail", resultsObj));
324+
returnObj.pushKV("overall", strprintf("Successfully started %d masternodes, failed to start %d, total %d", successful, failed, successful + failed));
325+
returnObj.pushKV("detail", resultsObj);
326326

327327
return returnObj;
328328
}
@@ -352,8 +352,8 @@ UniValue startmasternode (const JSONRPCRequest& request)
352352
pwalletMain->Lock();
353353

354354
if(!found) {
355-
statusObj.push_back(Pair("success", false));
356-
statusObj.push_back(Pair("error_message", "Could not find alias in config. Verify with listmasternodeconf."));
355+
statusObj.pushKV("success", false);
356+
statusObj.pushKV("error_message", "Could not find alias in config. Verify with listmasternodeconf.");
357357
}
358358

359359
return statusObj;
@@ -406,8 +406,8 @@ UniValue getmasternodeoutputs (const JSONRPCRequest& request)
406406
UniValue ret(UniValue::VARR);
407407
for (COutput& out : possibleCoins) {
408408
UniValue obj(UniValue::VOBJ);
409-
obj.push_back(Pair("txhash", out.tx->GetHash().ToString()));
410-
obj.push_back(Pair("outputidx", out.i));
409+
obj.pushKV("txhash", out.tx->GetHash().ToString());
410+
obj.pushKV("outputidx", out.i);
411411
ret.push_back(obj);
412412
}
413413

@@ -464,12 +464,12 @@ UniValue listmasternodeconf (const JSONRPCRequest& request)
464464
strStatus.find(strFilter) == std::string::npos) continue;
465465

466466
UniValue mnObj(UniValue::VOBJ);
467-
mnObj.push_back(Pair("alias", mne.getAlias()));
468-
mnObj.push_back(Pair("address", mne.getIp()));
469-
mnObj.push_back(Pair("privateKey", mne.getPrivKey()));
470-
mnObj.push_back(Pair("txHash", mne.getTxHash()));
471-
mnObj.push_back(Pair("outputIndex", mne.getOutputIndex()));
472-
mnObj.push_back(Pair("status", strStatus));
467+
mnObj.pushKV("alias", mne.getAlias());
468+
mnObj.pushKV("address", mne.getIp());
469+
mnObj.pushKV("privateKey", mne.getPrivKey());
470+
mnObj.pushKV("txHash", mne.getTxHash());
471+
mnObj.pushKV("outputIndex", mne.getOutputIndex());
472+
mnObj.pushKV("status", strStatus);
473473
ret.push_back(mnObj);
474474
}
475475

@@ -506,12 +506,12 @@ UniValue getmasternodestatus (const JSONRPCRequest& request)
506506

507507
if (pmn) {
508508
UniValue mnObj(UniValue::VOBJ);
509-
mnObj.push_back(Pair("txhash", activeMasternode.vin->prevout.hash.ToString()));
510-
mnObj.push_back(Pair("outputidx", (uint64_t)activeMasternode.vin->prevout.n));
511-
mnObj.push_back(Pair("netaddr", activeMasternode.service.ToString()));
512-
mnObj.push_back(Pair("addr", EncodeDestination(pmn->pubKeyCollateralAddress.GetID())));
513-
mnObj.push_back(Pair("status", activeMasternode.GetStatus()));
514-
mnObj.push_back(Pair("message", activeMasternode.GetStatusMessage()));
509+
mnObj.pushKV("txhash", activeMasternode.vin->prevout.hash.ToString());
510+
mnObj.pushKV("outputidx", (uint64_t)activeMasternode.vin->prevout.n);
511+
mnObj.pushKV("netaddr", activeMasternode.service.ToString());
512+
mnObj.pushKV("addr", EncodeDestination(pmn->pubKeyCollateralAddress.GetID()));
513+
mnObj.pushKV("status", activeMasternode.GetStatus());
514+
mnObj.pushKV("message", activeMasternode.GetStatusMessage());
515515
return mnObj;
516516
}
517517
throw std::runtime_error("Masternode not found in the list of available masternodes. Current status: "
@@ -575,7 +575,7 @@ UniValue getmasternodewinners (const JSONRPCRequest& request)
575575

576576
for (int i = nHeight - nLast; i < nHeight + 20; i++) {
577577
UniValue obj(UniValue::VOBJ);
578-
obj.push_back(Pair("nHeight", i));
578+
obj.pushKV("nHeight", i);
579579

580580
std::string strPayment = GetRequiredPaymentsString(i);
581581
if (strFilter != "" && strPayment.find(strFilter) == std::string::npos) continue;
@@ -589,24 +589,24 @@ UniValue getmasternodewinners (const JSONRPCRequest& request)
589589
std::size_t pos = t.find(":");
590590
std::string strAddress = t.substr(0,pos);
591591
uint64_t nVotes = atoi(t.substr(pos+1));
592-
addr.push_back(Pair("address", strAddress));
593-
addr.push_back(Pair("nVotes", nVotes));
592+
addr.pushKV("address", strAddress);
593+
addr.pushKV("nVotes", nVotes);
594594
winner.push_back(addr);
595595
}
596-
obj.push_back(Pair("winner", winner));
596+
obj.pushKV("winner", winner);
597597
} else if (strPayment.find("Unknown") == std::string::npos) {
598598
UniValue winner(UniValue::VOBJ);
599599
std::size_t pos = strPayment.find(":");
600600
std::string strAddress = strPayment.substr(0,pos);
601601
uint64_t nVotes = atoi(strPayment.substr(pos+1));
602-
winner.push_back(Pair("address", strAddress));
603-
winner.push_back(Pair("nVotes", nVotes));
604-
obj.push_back(Pair("winner", winner));
602+
winner.pushKV("address", strAddress);
603+
winner.pushKV("nVotes", nVotes);
604+
obj.pushKV("winner", winner);
605605
} else {
606606
UniValue winner(UniValue::VOBJ);
607-
winner.push_back(Pair("address", strPayment));
608-
winner.push_back(Pair("nVotes", 0));
609-
obj.push_back(Pair("winner", winner));
607+
winner.pushKV("address", strPayment);
608+
winner.pushKV("nVotes", 0);
609+
obj.pushKV("winner", winner);
610610
}
611611

612612
ret.push_back(obj);
@@ -658,7 +658,7 @@ UniValue getmasternodescores (const JSONRPCRequest& request)
658658
}
659659
}
660660
if (pBestMasternode)
661-
obj.push_back(Pair(strprintf("%d", nHeight), pBestMasternode->vin.prevout.hash.ToString().c_str()));
661+
obj.pushKV(strprintf("%d", nHeight), pBestMasternode->vin.prevout.hash.ToString().c_str());
662662
}
663663

664664
return obj;
@@ -732,7 +732,7 @@ UniValue createmasternodebroadcast(const JSONRPCRequest& request)
732732
bool found = false;
733733

734734
UniValue statusObj(UniValue::VOBJ);
735-
statusObj.push_back(Pair("alias", alias));
735+
statusObj.pushKV("alias", alias);
736736

737737
for (CMasternodeConfig::CMasternodeEntry mne : masternodeConfig.getEntries()) {
738738
if(mne.getAlias() == alias) {
@@ -748,8 +748,8 @@ UniValue createmasternodebroadcast(const JSONRPCRequest& request)
748748
}
749749

750750
if(!found) {
751-
statusObj.push_back(Pair("success", false));
752-
statusObj.push_back(Pair("error_message", "Could not find alias in config. Verify with listmasternodeconf."));
751+
statusObj.pushKV("success", false);
752+
statusObj.pushKV("error_message", "Could not find alias in config. Verify with listmasternodeconf.");
753753
}
754754

755755
return statusObj;
@@ -781,8 +781,8 @@ UniValue createmasternodebroadcast(const JSONRPCRequest& request)
781781
}
782782

783783
UniValue returnObj(UniValue::VOBJ);
784-
returnObj.push_back(Pair("overall", strprintf("Successfully created broadcast messages for %d masternodes, failed to create %d, total %d", successful, failed, successful + failed)));
785-
returnObj.push_back(Pair("detail", resultsObj));
784+
returnObj.pushKV("overall", strprintf("Successfully created broadcast messages for %d masternodes, failed to create %d, total %d", successful, failed, successful + failed));
785+
returnObj.pushKV("detail", resultsObj);
786786

787787
return returnObj;
788788
}
@@ -831,26 +831,26 @@ UniValue decodemasternodebroadcast(const JSONRPCRequest& request)
831831

832832
UniValue resultObj(UniValue::VOBJ);
833833

834-
resultObj.push_back(Pair("vin", mnb.vin.prevout.ToString()));
835-
resultObj.push_back(Pair("addr", mnb.addr.ToString()));
836-
resultObj.push_back(Pair("pubkeycollateral", EncodeDestination(mnb.pubKeyCollateralAddress.GetID())));
837-
resultObj.push_back(Pair("pubkeymasternode", EncodeDestination(mnb.pubKeyMasternode.GetID())));
838-
resultObj.push_back(Pair("vchsig", mnb.GetSignatureBase64()));
839-
resultObj.push_back(Pair("sigtime", mnb.sigTime));
840-
resultObj.push_back(Pair("sigvalid", mnb.CheckSignature() ? "true" : "false"));
841-
resultObj.push_back(Pair("protocolversion", mnb.protocolVersion));
842-
resultObj.push_back(Pair("nlastdsq", mnb.nLastDsq));
843-
resultObj.push_back(Pair("nMessVersion", mnb.nMessVersion));
834+
resultObj.pushKV("vin", mnb.vin.prevout.ToString());
835+
resultObj.pushKV("addr", mnb.addr.ToString());
836+
resultObj.pushKV("pubkeycollateral", EncodeDestination(mnb.pubKeyCollateralAddress.GetID()));
837+
resultObj.pushKV("pubkeymasternode", EncodeDestination(mnb.pubKeyMasternode.GetID()));
838+
resultObj.pushKV("vchsig", mnb.GetSignatureBase64());
839+
resultObj.pushKV("sigtime", mnb.sigTime);
840+
resultObj.pushKV("sigvalid", mnb.CheckSignature() ? "true" : "false");
841+
resultObj.pushKV("protocolversion", mnb.protocolVersion);
842+
resultObj.pushKV("nlastdsq", mnb.nLastDsq);
843+
resultObj.pushKV("nMessVersion", mnb.nMessVersion);
844844

845845
UniValue lastPingObj(UniValue::VOBJ);
846-
lastPingObj.push_back(Pair("vin", mnb.lastPing.vin.prevout.ToString()));
847-
lastPingObj.push_back(Pair("blockhash", mnb.lastPing.blockHash.ToString()));
848-
lastPingObj.push_back(Pair("sigtime", mnb.lastPing.sigTime));
849-
lastPingObj.push_back(Pair("sigvalid", mnb.lastPing.CheckSignature(mnb.pubKeyMasternode) ? "true" : "false"));
850-
lastPingObj.push_back(Pair("vchsig", mnb.lastPing.GetSignatureBase64()));
851-
lastPingObj.push_back(Pair("nMessVersion", mnb.lastPing.nMessVersion));
852-
853-
resultObj.push_back(Pair("lastping", lastPingObj));
846+
lastPingObj.pushKV("vin", mnb.lastPing.vin.prevout.ToString());
847+
lastPingObj.pushKV("blockhash", mnb.lastPing.blockHash.ToString());
848+
lastPingObj.pushKV("sigtime", mnb.lastPing.sigTime);
849+
lastPingObj.pushKV("sigvalid", mnb.lastPing.CheckSignature(mnb.pubKeyMasternode) ? "true" : "false");
850+
lastPingObj.pushKV("vchsig", mnb.lastPing.GetSignatureBase64());
851+
lastPingObj.pushKV("nMessVersion", mnb.lastPing.nMessVersion);
852+
853+
resultObj.pushKV("lastping", lastPingObj);
854854

855855
return resultObj;
856856
}

0 commit comments

Comments
 (0)