Rename GetPourValueIn to GetJoinSplitValueIn
This commit is contained in:
parent
8f95cd3c26
commit
942bc46756
|
@ -385,7 +385,7 @@ CAmount CCoinsViewCache::GetValueIn(const CTransaction& tx) const
|
||||||
for (unsigned int i = 0; i < tx.vin.size(); i++)
|
for (unsigned int i = 0; i < tx.vin.size(); i++)
|
||||||
nResult += GetOutputFor(tx.vin[i]).nValue;
|
nResult += GetOutputFor(tx.vin[i]).nValue;
|
||||||
|
|
||||||
nResult += tx.GetPourValueIn();
|
nResult += tx.GetJoinSplitValueIn();
|
||||||
|
|
||||||
return nResult;
|
return nResult;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1654,7 +1654,7 @@ bool NonContextualCheckInputs(const CTransaction& tx, CValidationState &state, c
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
nValueIn += tx.GetPourValueIn();
|
nValueIn += tx.GetJoinSplitValueIn();
|
||||||
if (!MoneyRange(nValueIn))
|
if (!MoneyRange(nValueIn))
|
||||||
return state.DoS(100, error("CheckInputs(): vpub_old values out of range"),
|
return state.DoS(100, error("CheckInputs(): vpub_old values out of range"),
|
||||||
REJECT_INVALID, "bad-txns-inputvalues-outofrange");
|
REJECT_INVALID, "bad-txns-inputvalues-outofrange");
|
||||||
|
|
|
@ -167,7 +167,7 @@ CAmount CTransaction::GetValueOut() const
|
||||||
return nValueOut;
|
return nValueOut;
|
||||||
}
|
}
|
||||||
|
|
||||||
CAmount CTransaction::GetPourValueIn() const
|
CAmount CTransaction::GetJoinSplitValueIn() const
|
||||||
{
|
{
|
||||||
CAmount nValue = 0;
|
CAmount nValue = 0;
|
||||||
for (std::vector<JSDescription>::const_iterator it(vjoinsplit.begin()); it != vjoinsplit.end(); ++it)
|
for (std::vector<JSDescription>::const_iterator it(vjoinsplit.begin()); it != vjoinsplit.end(); ++it)
|
||||||
|
@ -176,7 +176,7 @@ CAmount CTransaction::GetPourValueIn() const
|
||||||
nValue += it->vpub_new;
|
nValue += it->vpub_new;
|
||||||
|
|
||||||
if (!MoneyRange(it->vpub_new) || !MoneyRange(nValue))
|
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;
|
return nValue;
|
||||||
|
|
|
@ -349,7 +349,7 @@ public:
|
||||||
// inputs must be known to compute value in.
|
// inputs must be known to compute value in.
|
||||||
|
|
||||||
// Return sum of pour vpub_new
|
// Return sum of pour vpub_new
|
||||||
CAmount GetPourValueIn() const;
|
CAmount GetJoinSplitValueIn() const;
|
||||||
|
|
||||||
// Compute priority, given priority of inputs and (optionally) tx size
|
// Compute priority, given priority of inputs and (optionally) tx size
|
||||||
double ComputePriority(double dPriorityInputs, unsigned int nTxSize=0) const;
|
double ComputePriority(double dPriorityInputs, unsigned int nTxSize=0) const;
|
||||||
|
|
Loading…
Reference in New Issue