Skip to content

Commit

Permalink
Merge pull request #643 from dantudor/patch-1
Browse files Browse the repository at this point in the history
CPaymentRequest fields incorrect in diff
  • Loading branch information
proletesseract committed Dec 7, 2019
2 parents 8131b42 + d01e08e commit d501c89
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/consensus/cfund.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,13 @@ class CPaymentRequest
if (nVotesYes != b.nVotesYes) ret += strprintf("nVotesYes: %d => %d, ", nVotesYes, b.nVotesYes);
if (nVotesNo != b.nVotesNo) ret += strprintf("nVotesNo: %d => %d, ", nVotesNo, b.nVotesNo);
if (strDZeel != b.strDZeel) ret += strprintf("strDZeel: %s => %s, ", strDZeel, b.strDZeel);
if (hash != b.hash) ret += strprintf("nAnount: %d => %d, ", nAmount, b.nAmount);
if (proposalhash != b.proposalhash) ret += strprintf("proposalhash: %d => %d, ", proposalhash.ToString(), b.proposalhash.ToString());
if (paymenthash != b.paymenthash) ret += strprintf("paymenthash: %d => %d, ", paymenthash.ToString(), b.paymenthash.ToString());
if (txblockhash != b.txblockhash) ret += strprintf("hash: %s => %s, ", hash.ToString(), b.hash.ToString());
if (hash != b.hash) ret += strprintf("hash: %s => %s, ", hash.ToString(), b.hash.ToString());
if (proposalhash != b.proposalhash) ret += strprintf("proposalhash: %s => %s, ", proposalhash.ToString(), b.proposalhash.ToString());
if (paymenthash != b.paymenthash) ret += strprintf("paymenthash: %s => %s, ", paymenthash.ToString(), b.paymenthash.ToString());
if (txblockhash != b.txblockhash) ret += strprintf("txblockhash: %s => %s, ", txblockhash.ToString(), b.txblockhash.ToString());
if (blockhash != b.blockhash) ret += strprintf("blockhash: %s => %s, ", blockhash.ToString(), b.blockhash.ToString());
if (nVersion != b.nVersion) ret += strprintf("nAnount: %d => %d, ", nVersion, b.nVersion);
if (nVotingCycle != b.nVotingCycle) ret += strprintf("nVotingCycle: %s => %s, ", nVotingCycle, b.nVotingCycle);
if (nVersion != b.nVersion) ret += strprintf("nVersion: %d => %d, ", nVersion, b.nVersion);
if (nVotingCycle != b.nVotingCycle) ret += strprintf("nVotingCycle: %d => %d, ", nVotingCycle, b.nVotingCycle);
if (ret != "")
{
ret.pop_back();
Expand Down

0 comments on commit d501c89

Please sign in to comment.