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

Rename some usage of 'pour'.

Browse Source
This commit is contained in:
Sean Bowe
2016-07-14 16:10:41 -06:00
parent bb64be52fe
commit b7e4abd6f7
13 changed files with 156 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/rpcrawtransaction.cpp
View File

@@ -92,43 +92,43 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry)
Array vjoinsplit;
for (unsigned int i = 0; i < tx.vjoinsplit.size(); i++) {
const JSDescription& pourtx = tx.vjoinsplit[i];
Object pour;
const JSDescription& jsdescription = tx.vjoinsplit[i];
Object joinsplit;
pour.push_back(Pair("anchor", pourtx.anchor.GetHex()));
joinsplit.push_back(Pair("anchor", jsdescription.anchor.GetHex()));
{
Array nullifiers;
BOOST_FOREACH(const uint256 serial, pourtx.nullifiers) {
BOOST_FOREACH(const uint256 serial, jsdescription.nullifiers) {
nullifiers.push_back(serial.GetHex());
}
pour.push_back(Pair("nullifiers", nullifiers));
joinsplit.push_back(Pair("nullifiers", nullifiers));
}
{
Array commitments;
BOOST_FOREACH(const uint256 commitment, pourtx.commitments) {
BOOST_FOREACH(const uint256 commitment, jsdescription.commitments) {
commitments.push_back(commitment.GetHex());
}
pour.push_back(Pair("commitments", commitments));
joinsplit.push_back(Pair("commitments", commitments));
}
{
Array macs;
BOOST_FOREACH(const uint256 mac, pourtx.macs) {
BOOST_FOREACH(const uint256 mac, jsdescription.macs) {
macs.push_back(mac.GetHex());
}
pour.push_back(Pair("macs", macs));
joinsplit.push_back(Pair("macs", macs));
}
pour.push_back(Pair("vpub_old", ValueFromAmount(pourtx.vpub_old)));
pour.push_back(Pair("vpub_new", ValueFromAmount(pourtx.vpub_new)));
joinsplit.push_back(Pair("vpub_old", ValueFromAmount(jsdescription.vpub_old)));
joinsplit.push_back(Pair("vpub_new", ValueFromAmount(jsdescription.vpub_new)));
// TODO: #808
uint256 pubKeyHash;
pour.push_back(Pair("valid", pourtx.Verify(*pzcashParams, pubKeyHash)));
joinsplit.push_back(Pair("valid", jsdescription.Verify(*pzcashParams, pubKeyHash)));
vjoinsplit.push_back(pour);
vjoinsplit.push_back(joinsplit);
}
entry.push_back(Pair("vjoinsplit", vjoinsplit));