Use pushKV in some new PSBT RPCs.

Most of the code uses UniValue::pushKV where appropriate, but some new
RPC code related to PSBTs did not.
This commit is contained in:
Daniel Kraft 2018-08-09 18:08:45 +02:00
parent 3e3a50aeb8
commit 227d27e70c
2 changed files with 5 additions and 5 deletions

View file

@ -1662,12 +1662,12 @@ UniValue finalizepsbt(const JSONRPCRequest& request)
mtx.vin[i].scriptWitness = psbtx.inputs[i].final_script_witness; mtx.vin[i].scriptWitness = psbtx.inputs[i].final_script_witness;
} }
ssTx << mtx; ssTx << mtx;
result.push_back(Pair("hex", HexStr(ssTx.begin(), ssTx.end()))); result.pushKV("hex", HexStr(ssTx.begin(), ssTx.end()));
} else { } else {
ssTx << psbtx; ssTx << psbtx;
result.push_back(Pair("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()))); result.pushKV("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()));
} }
result.push_back(Pair("complete", complete)); result.pushKV("complete", complete);
return result; return result;
} }

View file

@ -4630,8 +4630,8 @@ UniValue walletprocesspsbt(const JSONRPCRequest& request)
UniValue result(UniValue::VOBJ); UniValue result(UniValue::VOBJ);
CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
ssTx << psbtx; ssTx << psbtx;
result.push_back(Pair("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()))); result.pushKV("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()));
result.push_back(Pair("complete", complete)); result.pushKV("complete", complete);
return result; return result;
} }