From 942bc46756e847aa830c200efe7f6b4138b8251f Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Thu, 14 Jul 2016 15:16:57 -0600 Subject: [PATCH] Rename GetPourValueIn to GetJoinSplitValueIn --- src/coins.cpp | 2 +- src/main.cpp | 2 +- src/primitives/transaction.cpp | 4 ++-- src/primitives/transaction.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/coins.cpp b/src/coins.cpp index c9b87723a..43e47e974 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -385,7 +385,7 @@ CAmount CCoinsViewCache::GetValueIn(const CTransaction& tx) const for (unsigned int i = 0; i < tx.vin.size(); i++) nResult += GetOutputFor(tx.vin[i]).nValue; - nResult += tx.GetPourValueIn(); + nResult += tx.GetJoinSplitValueIn(); return nResult; } diff --git a/src/main.cpp b/src/main.cpp index 191757c3b..20ff750e1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1654,7 +1654,7 @@ bool NonContextualCheckInputs(const CTransaction& tx, CValidationState &state, c } - nValueIn += tx.GetPourValueIn(); + nValueIn += tx.GetJoinSplitValueIn(); if (!MoneyRange(nValueIn)) return state.DoS(100, error("CheckInputs(): vpub_old values out of range"), REJECT_INVALID, "bad-txns-inputvalues-outofrange"); diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 4f17bf89a..102a1a33d 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -167,7 +167,7 @@ CAmount CTransaction::GetValueOut() const return nValueOut; } -CAmount CTransaction::GetPourValueIn() const +CAmount CTransaction::GetJoinSplitValueIn() const { CAmount nValue = 0; for (std::vector::const_iterator it(vjoinsplit.begin()); it != vjoinsplit.end(); ++it) @@ -176,7 +176,7 @@ CAmount CTransaction::GetPourValueIn() const nValue += it->vpub_new; if (!MoneyRange(it->vpub_new) || !MoneyRange(nValue)) - throw std::runtime_error("CTransaction::GetPourValueIn(): value out of range"); + throw std::runtime_error("CTransaction::GetJoinSplitValueIn(): value out of range"); } return nValue; diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 25f44ae48..687cb667d 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -349,7 +349,7 @@ public: // inputs must be known to compute value in. // Return sum of pour vpub_new - CAmount GetPourValueIn() const; + CAmount GetJoinSplitValueIn() const; // Compute priority, given priority of inputs and (optionally) tx size double ComputePriority(double dPriorityInputs, unsigned int nTxSize=0) const;