Have OfferCreate require positive funds.

Conflicts:
	src/cpp/ripple/Amount.cpp
This commit is contained in:
Arthur Britto
2013-04-26 11:14:18 -07:00
committed by JoelKatz
parent cc04847961
commit 1e3b02841b
2 changed files with 4 additions and 4 deletions

View File

@@ -1022,8 +1022,8 @@ bool STAmount::applyOffer(
{
saOfferGets.throwComparable(saTakerFunds);
assert(!saOfferFunds.isZero() && !saTakerFunds.isZero()); // Must have funds.
assert(!saOfferGets.isZero() && !saOfferPays.isZero()); // Must not be a null offer.
assert(saOfferFunds.isPositive() && saTakerFunds.isPositive()); // Both must have funds.
assert(saOfferGets.isPositive() && saOfferPays.isPositive()); // Must not be a null offer.
// Limit offerer funds available, by transfer fees.
STAmount saOfferFundsAvailable = QUALITY_ONE == uOfferPaysRate

View File

@@ -137,7 +137,7 @@ TER OfferCreateTransactor::takeOffers(
STAmount saSubTakerGets = saTakerGets-saTakerGot; // How much more is wanted.
// Figure out next offer to take, if needed.
if (saTakerFunds // Taker has funds available.
if (saTakerFunds.isPositive() // Taker has funds available.
&& saSubTakerPays.isPositive()
&& saSubTakerGets.isPositive())
{
@@ -161,7 +161,7 @@ TER OfferCreateTransactor::takeOffers(
}
}
if (!saTakerFunds) // Taker has no funds.
if (!saTakerFunds.isPositive()) // Taker has no funds.
{
// Done. Ran out of funds on previous round. As fees aren't calculated directly in this routine, funds are checked here.
cLog(lsINFO) << "takeOffers: done: taker unfunded.";