ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic.

Browse Source
This commit is contained in:
Arthur Britto
2013-05-06 20:11:16 -07:00
parent 9bfb5922c5
commit 8ccd0c6ef6
1 changed files with 88 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
src/cpp/ripple/RippleCalc.cpp
View File

@@ -313,8 +313,8 @@ TER PathState::pushNode(
&& -saOwed >= (saLimit = lesEntries.rippleLimit(pnCur.uAccountID, pnBck.uAccountID, pnCur.uCurrencyID))) && -saOwed >= (saLimit = lesEntries.rippleLimit(pnCur.uAccountID, pnBck.uAccountID, pnCur.uCurrencyID)))
{ {
cLog(lsWARNING) << boost::str(boost::format("pushNode: dry: saOwed=%s saLimit=%s") cLog(lsWARNING) << boost::str(boost::format("pushNode: dry: saOwed=%s saLimit=%s")
% saOwed.getFullText() % saOwed
% saLimit.getFullText()); % saLimit);
terResult = tecPATH_DRY; terResult = tecPATH_DRY;
} }
@@ -1154,9 +1154,10 @@ TER RippleCalc::calcNodeDeliverRev(
// YYY Note this gets zeroed on each increment, ideally only on first increment, then it could be a limit on the forward pass. // YYY Note this gets zeroed on each increment, ideally only on first increment, then it could be a limit on the forward pass.
saOutAct.zero(saOutReq); saOutAct.zero(saOutReq);
cLog(lsINFO) << boost::str(boost::format("calcNodeDeliverRev: saOutAct=%s saOutReq=%s") cLog(lsINFO) << boost::str(boost::format("calcNodeDeliverRev> saOutAct=%s saOutReq=%s saPrvDlvReq=%s")
% saOutAct % saOutAct
% saOutReq); % saOutReq
% saPrvDlvReq);
assert(!!saOutReq); assert(!!saOutReq);
@@ -1387,11 +1388,16 @@ TER RippleCalc::calcNodeDeliverRev(
<< boost::str(boost::format("calcNodeDeliverRev: TOO MUCH: saOutAct=%s saOutReq=%s") << boost::str(boost::format("calcNodeDeliverRev: TOO MUCH: saOutAct=%s saOutReq=%s")
% saOutAct % saOutAct
% saOutReq); % saOutReq);
assert(saOutAct <= saOutReq); assert(saOutAct <= saOutReq);
// XXX Perhaps need to check if partial is okay to relax this? // XXX Perhaps need to check if partial is okay to relax this?
if (tesSUCCESS == terResult && !saOutAct) if (tesSUCCESS == terResult && !saOutAct)
terResult = tecPATH_DRY; // Unable to meet request, consider path dry. terResult = tecPATH_DRY; // Unable to meet request, consider path dry.
cLog(lsINFO) << boost::str(boost::format("calcNodeDeliverRev< saOutAct=%s saOutReq=%s saPrvDlvReq=%s")
% saOutAct
% saOutReq
% saPrvDlvReq);
return terResult; return terResult;
} }
@@ -1780,13 +1786,15 @@ void RippleCalc::calcNodeRipple(
cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple> uQualityIn=%d uQualityOut=%d saPrvReq=%s saCurReq=%s saPrvAct=%s saCurAct=%s") cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple> uQualityIn=%d uQualityOut=%d saPrvReq=%s saCurReq=%s saPrvAct=%s saCurAct=%s")
% uQualityIn % uQualityIn
% uQualityOut % uQualityOut
% saPrvReq.getFullText() % saPrvReq
% saCurReq.getFullText() % saCurReq
% saPrvAct.getFullText() % saPrvAct
% saCurAct.getFullText()); % saCurAct);
assert(saCurReq.isPositive()); assert(saCurReq.isPositive());
assert(saPrvReq.getCurrency() == saCurReq.getCurrency()); assert(saPrvReq.getCurrency() == saCurReq.getCurrency());
assert(saPrvReq.getCurrency() == saPrvAct.getCurrency());
assert(saPrvReq.getIssuer() == saPrvAct.getIssuer());
const bool bPrvUnlimited = saPrvReq.isNegative(); const bool bPrvUnlimited = saPrvReq.isNegative();
const STAmount saPrv = bPrvUnlimited ? STAmount(saPrvReq) : saPrvReq-saPrvAct; const STAmount saPrv = bPrvUnlimited ? STAmount(saPrvReq) : saPrvReq-saPrvAct;
@@ -1795,8 +1803,8 @@ void RippleCalc::calcNodeRipple(
#if 0 #if 0
cLog(lsINFO) << boost::str(boost::format("calcNodeRipple: bPrvUnlimited=%d saPrv=%s saCur=%s") cLog(lsINFO) << boost::str(boost::format("calcNodeRipple: bPrvUnlimited=%d saPrv=%s saCur=%s")
% bPrvUnlimited % bPrvUnlimited
% saPrv.getFullText() % saPrv
% saCur.getFullText()); % saCur);
#endif #endif
if (uQualityIn >= uQualityOut) if (uQualityIn >= uQualityOut)
@@ -1835,19 +1843,19 @@ void RippleCalc::calcNodeRipple(
STAmount saCurIn = STAmount::divRound(STAmount::mulRound(saCur, uQualityOut, uCurrencyID, uCurIssuerID, true), uQualityIn, uCurrencyID, uCurIssuerID, true); STAmount saCurIn = STAmount::divRound(STAmount::mulRound(saCur, uQualityOut, uCurrencyID, uCurIssuerID, true), uQualityIn, uCurrencyID, uCurIssuerID, true);
cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple: bPrvUnlimited=%d saPrv=%s saCurIn=%s") % bPrvUnlimited % saPrv.getFullText() % saCurIn.getFullText()); cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple: bPrvUnlimited=%d saPrv=%s saCurIn=%s") % bPrvUnlimited % saPrv % saCurIn);
if (bPrvUnlimited || saCurIn <= saPrv) if (bPrvUnlimited || saCurIn <= saPrv)
{ {
// All of cur. Some amount of prv. // All of cur. Some amount of prv.
saCurAct += saCur; saCurAct += saCur;
saPrvAct += saCurIn; saPrvAct += saCurIn;
cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple:3c: saCurReq=%s saPrvAct=%s") % saCurReq.getFullText() % saPrvAct.getFullText()); cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple:3c: saCurReq=%s saPrvAct=%s") % saCurReq % saPrvAct);
} }
else else
{ {
// A part of cur. All of prv. (cur as driver) // A part of cur. All of prv. (cur as driver)
STAmount saCurOut = STAmount::divRound(STAmount::mulRound(saPrv, uQualityIn, uCurrencyID, uCurIssuerID, true), uQualityOut, uCurrencyID, uCurIssuerID, true); STAmount saCurOut = STAmount::divRound(STAmount::mulRound(saPrv, uQualityIn, uCurrencyID, uCurIssuerID, true), uQualityOut, uCurrencyID, uCurIssuerID, true);
cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple:4: saCurReq=%s") % saCurReq.getFullText()); cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple:4: saCurReq=%s") % saCurReq);
saCurAct += saCurOut; saCurAct += saCurOut;
saPrvAct = saPrvReq; saPrvAct = saPrvReq;
@@ -1861,10 +1869,10 @@ void RippleCalc::calcNodeRipple(
cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple< uQualityIn=%d uQualityOut=%d saPrvReq=%s saCurReq=%s saPrvAct=%s saCurAct=%s") cLog(lsTRACE) << boost::str(boost::format("calcNodeRipple< uQualityIn=%d uQualityOut=%d saPrvReq=%s saCurReq=%s saPrvAct=%s saCurAct=%s")
% uQualityIn % uQualityIn
% uQualityOut % uQualityOut
% saPrvReq.getFullText() % saPrvReq
% saCurReq.getFullText() % saCurReq
% saPrvAct.getFullText() % saPrvAct
% saCurAct.getFullText()); % saCurAct);
} }
// Calculate saPrvRedeemReq, saPrvIssueReq, saPrvDeliver from saCur... // Calculate saPrvRedeemReq, saPrvIssueReq, saPrvDeliver from saCur...
@@ -1921,8 +1929,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
% STAmount::createHumanCurrency(uCurrencyID) % STAmount::createHumanCurrency(uCurrencyID)
% uQualityIn % uQualityIn
% uQualityOut % uQualityOut
% saPrvOwed.getFullText() % saPrvOwed
% saPrvLimit.getFullText()); % saPrvLimit);
// Previous can redeem the owed IOUs it holds. // Previous can redeem the owed IOUs it holds.
const STAmount saPrvRedeemReq = saPrvOwed.isPositive() ? saPrvOwed : STAmount(saPrvOwed.getCurrency(), saPrvOwed.getIssuer()); const STAmount saPrvRedeemReq = saPrvOwed.isPositive() ? saPrvOwed : STAmount(saPrvOwed.getCurrency(), saPrvOwed.getIssuer());
@@ -1947,12 +1955,14 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
const STAmount& saCurDeliverReq = pnCur.saRevDeliver; const STAmount& saCurDeliverReq = pnCur.saRevDeliver;
STAmount saCurDeliverAct(saCurDeliverReq.getCurrency(), saCurDeliverReq.getIssuer()); STAmount saCurDeliverAct(saCurDeliverReq.getCurrency(), saCurDeliverReq.getIssuer());
cLog(lsTRACE) << boost::str(boost::format("calcNodeAccountRev: saPrvRedeemReq=%s saPrvIssueReq=%s saCurRedeemReq=%s saCurIssueReq=%s saNxtOwed=%s") cLog(lsTRACE) << boost::str(boost::format("calcNodeAccountRev: saPrvRedeemReq=%s saPrvIssueReq=%s saPrvDeliverAct=%s saPrvDeliverReq=%s saCurRedeemReq=%s saCurIssueReq=%s saNxtOwed=%s")
% saPrvRedeemReq.getFullText() % saPrvRedeemReq
% saPrvIssueReq.getFullText() % saPrvIssueReq
% saCurRedeemReq.getFullText() % saPrvDeliverAct
% saCurIssueReq.getFullText() % saPrvDeliverReq
% saNxtOwed.getFullText()); % saCurRedeemReq
% saCurIssueReq
% saNxtOwed);
cLog(lsTRACE) << psCur.getJson(); cLog(lsTRACE) << psCur.getJson();
@@ -1978,7 +1988,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer()); STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer());
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> $ : saCurWantedReq=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> $ : saCurWantedReq=%s")
% saCurWantedReq.getFullText()); % saCurWantedReq);
// Calculate redeem // Calculate redeem
if (saPrvRedeemReq) // Previous has IOUs to redeem. if (saPrvRedeemReq) // Previous has IOUs to redeem.
@@ -1991,8 +2002,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
uRateMax = STAmount::uRateOne; uRateMax = STAmount::uRateOne;
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Redeem at 1:1 saPrvRedeemReq=%s (available) saPrvRedeemAct=%s uRateMax=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Redeem at 1:1 saPrvRedeemReq=%s (available) saPrvRedeemAct=%s uRateMax=%s")
% saPrvRedeemReq.getFullText() % saPrvRedeemReq
% saPrvRedeemAct.getFullText() % saPrvRedeemAct
% STAmount::saFromRate(uRateMax).getText()); % STAmount::saFromRate(uRateMax).getText());
} }
else else
@@ -2012,8 +2023,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
calcNodeRipple(uQualityIn, QUALITY_ONE, saPrvIssueReq, saCurWantedReq, saPrvIssueAct, saCurWantedAct, uRateMax); calcNodeRipple(uQualityIn, QUALITY_ONE, saPrvIssueReq, saCurWantedReq, saPrvIssueAct, saCurWantedAct, uRateMax);
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Issuing: Rate: quality in : 1.0 saPrvIssueAct=%s saCurWantedAct=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Issuing: Rate: quality in : 1.0 saPrvIssueAct=%s saCurWantedAct=%s")
% saPrvIssueAct.getFullText() % saPrvIssueAct
% saCurWantedAct.getFullText()); % saCurWantedAct);
} }
if (!saCurWantedAct) if (!saCurWantedAct)
@@ -2036,8 +2047,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
calcNodeRipple(QUALITY_ONE, uQualityOut, saPrvRedeemReq, saCurRedeemReq, saPrvRedeemAct, saCurRedeemAct, uRateMax); calcNodeRipple(QUALITY_ONE, uQualityOut, saPrvRedeemReq, saCurRedeemReq, saPrvRedeemAct, saCurRedeemAct, uRateMax);
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Rate : 1.0 : quality out saPrvRedeemAct=%s saCurRedeemAct=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Rate : 1.0 : quality out saPrvRedeemAct=%s saCurRedeemAct=%s")
% saPrvRedeemAct.getFullText() % saPrvRedeemAct
% saCurRedeemAct.getFullText()); % saCurRedeemAct);
} }
// issue (part 1) -> redeem // issue (part 1) -> redeem
@@ -2048,8 +2059,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
calcNodeRipple(uQualityIn, uQualityOut, saPrvIssueReq, saCurRedeemReq, saPrvIssueAct, saCurRedeemAct, uRateMax); calcNodeRipple(uQualityIn, uQualityOut, saPrvIssueReq, saCurRedeemReq, saPrvIssueAct, saCurRedeemAct, uRateMax);
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Rate: quality in : quality out: saPrvIssueAct=%s saCurRedeemAct=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Rate: quality in : quality out: saPrvIssueAct=%s saCurRedeemAct=%s")
% saPrvIssueAct.getFullText() % saPrvIssueAct
% saCurRedeemAct.getFullText()); % saCurRedeemAct);
} }
// redeem (part 2) -> issue. // redeem (part 2) -> issue.
@@ -2061,8 +2072,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
calcNodeRipple(QUALITY_ONE, lesActive.rippleTransferRate(uCurAccountID), saPrvRedeemReq, saCurIssueReq, saPrvRedeemAct, saCurIssueAct, uRateMax); calcNodeRipple(QUALITY_ONE, lesActive.rippleTransferRate(uCurAccountID), saPrvRedeemReq, saCurIssueReq, saPrvRedeemAct, saCurIssueAct, uRateMax);
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountRev: Rate : 1.0 : transfer_rate: saPrvRedeemAct=%s saCurIssueAct=%s") cLog(lsINFO) << boost::str(boost::format("calcNodeAccountRev: Rate : 1.0 : transfer_rate: saPrvRedeemAct=%s saCurIssueAct=%s")
% saPrvRedeemAct.getFullText() % saPrvRedeemAct
% saCurIssueAct.getFullText()); % saCurIssueAct);
} }
// issue (part 2) -> issue // issue (part 2) -> issue
@@ -2075,8 +2086,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
calcNodeRipple(uQualityIn, QUALITY_ONE, saPrvIssueReq, saCurIssueReq, saPrvIssueAct, saCurIssueAct, uRateMax); calcNodeRipple(uQualityIn, QUALITY_ONE, saPrvIssueReq, saCurIssueReq, saPrvIssueAct, saCurIssueAct, uRateMax);
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Rate: quality in : 1.0: saPrvIssueAct=%s saCurIssueAct=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: Rate: quality in : 1.0: saPrvIssueAct=%s saCurIssueAct=%s")
% saPrvIssueAct.getFullText() % saPrvIssueAct
% saCurIssueAct.getFullText()); % saCurIssueAct);
} }
if (!saCurRedeemAct && !saCurIssueAct) if (!saCurRedeemAct && !saCurIssueAct)
@@ -2086,11 +2097,11 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
} }
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: ^|account --> ACCOUNT --> account : saCurRedeemReq=%s saCurIssueReq=%s saPrvOwed=%s saCurRedeemAct=%s saCurIssueAct=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: ^|account --> ACCOUNT --> account : saCurRedeemReq=%s saCurIssueReq=%s saPrvOwed=%s saCurRedeemAct=%s saCurIssueAct=%s")
% saCurRedeemReq.getFullText() % saCurRedeemReq
% saCurIssueReq.getFullText() % saCurIssueReq
% saPrvOwed.getFullText() % saPrvOwed
% saCurRedeemAct.getFullText() % saCurRedeemAct
% saCurIssueAct.getFullText()); % saCurIssueAct);
} }
} }
else if (bPrvAccount && !bNxtAccount) else if (bPrvAccount && !bNxtAccount)
@@ -2125,9 +2136,9 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
} }
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: saCurDeliverReq=%s saCurDeliverAct=%s saPrvOwed=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: saCurDeliverReq=%s saCurDeliverAct=%s saPrvOwed=%s")
% saCurDeliverReq.getFullText() % saCurDeliverReq
% saCurDeliverAct.getFullText() % saCurDeliverAct
% saPrvOwed.getFullText()); % saPrvOwed);
} }
else if (!bPrvAccount && bNxtAccount) else if (!bPrvAccount && bNxtAccount)
{ {
@@ -2138,7 +2149,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer()); STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer());
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> $ : saCurWantedReq=%s saOutAct=%s saOutReq=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> $ : saCurWantedReq=%s saOutAct=%s saOutReq=%s")
% saCurWantedReq.getFullText() % saCurWantedReq
% psCur.saOutAct % psCur.saOutAct
% psCur.saOutReq); % psCur.saOutReq);
@@ -2163,7 +2174,8 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
{ {
// offer --> ACCOUNT --> account // offer --> ACCOUNT --> account
// Note: offer is always delivering(redeeming) as account is issuer. // Note: offer is always delivering(redeeming) as account is issuer.
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> account")); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> account : saCurRedeemReq=%s saCurIssueReq=%s")
% saCurRedeemReq % saCurIssueReq);
// deliver -> redeem // deliver -> redeem
if (saCurRedeemReq) // Next wants us to redeem. if (saCurRedeemReq) // Next wants us to redeem.
@@ -2282,12 +2294,12 @@ TER RippleCalc::calcNodeAccountFwd(
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd> uNode=%d/%d saPrvRedeemReq=%s saPrvIssueReq=%s saPrvDeliverReq=%s saCurRedeemReq=%s saCurIssueReq=%s saCurDeliverReq=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd> uNode=%d/%d saPrvRedeemReq=%s saPrvIssueReq=%s saPrvDeliverReq=%s saCurRedeemReq=%s saCurIssueReq=%s saCurDeliverReq=%s")
% uNode % uNode
% uLast % uLast
% saPrvRedeemReq.getFullText() % saPrvRedeemReq
% saPrvIssueReq.getFullText() % saPrvIssueReq
% saPrvDeliverReq.getFullText() % saPrvDeliverReq
% saCurRedeemReq.getFullText() % saCurRedeemReq
% saCurIssueReq.getFullText() % saCurIssueReq
% saCurDeliverReq.getFullText()); % saCurDeliverReq);
// Ripple through account. // Ripple through account.
@@ -2324,12 +2336,12 @@ TER RippleCalc::calcNodeAccountFwd(
saCurSendMaxPass += saCurIssueAct; saCurSendMaxPass += saCurIssueAct;
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: ^ --> ACCOUNT --> account : saInReq=%s saInAct=%s saCurRedeemAct=%s saCurIssueReq=%s saCurIssueAct=%s saCurSendMaxPass=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: ^ --> ACCOUNT --> account : saInReq=%s saInAct=%s saCurRedeemAct=%s saCurIssueReq=%s saCurIssueAct=%s saCurSendMaxPass=%s")
% psCur.saInReq.getFullText() % psCur.saInReq
% psCur.saInAct.getFullText() % psCur.saInAct
% saCurRedeemAct.getFullText() % saCurRedeemAct
% saCurIssueReq.getFullText() % saCurIssueReq
% saCurIssueAct.getFullText() % saCurIssueAct
% saCurSendMaxPass.getFullText()); % saCurSendMaxPass);
} }
else if (uNode == uLast) else if (uNode == uLast)
{ {
@@ -2337,8 +2349,8 @@ TER RippleCalc::calcNodeAccountFwd(
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: account --> ACCOUNT --> $ : uPrvAccountID=%s uCurAccountID=%s saPrvRedeemReq=%s saPrvIssueReq=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: account --> ACCOUNT --> $ : uPrvAccountID=%s uCurAccountID=%s saPrvRedeemReq=%s saPrvIssueReq=%s")
% RippleAddress::createHumanAccountID(uPrvAccountID) % RippleAddress::createHumanAccountID(uPrvAccountID)
% RippleAddress::createHumanAccountID(uCurAccountID) % RippleAddress::createHumanAccountID(uCurAccountID)
% saPrvRedeemReq.getFullText() % saPrvRedeemReq
% saPrvIssueReq.getFullText()); % saPrvIssueReq);
// Last node. Accept all funds. Calculate amount actually to credit. // Last node. Accept all funds. Calculate amount actually to credit.
@@ -2495,7 +2507,7 @@ TER RippleCalc::calcNodeAccountFwd(
if (uNode == uLast) if (uNode == uLast)
{ {
// offer --> ACCOUNT --> $ // offer --> ACCOUNT --> $
cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: offer --> ACCOUNT --> $ : %s") % saPrvDeliverReq.getFullText()); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: offer --> ACCOUNT --> $ : %s") % saPrvDeliverReq);
STAmount& saCurReceive = psCur.saOutPass; STAmount& saCurReceive = psCur.saOutPass;
@@ -2605,7 +2617,7 @@ TER RippleCalc::calcNodeRev(const unsigned int uNode, PathState& psCur, const bo
% uNode % uNode
% bCurAccount % bCurAccount
% RippleAddress::createHumanAccountID(uCurIssuerID) % RippleAddress::createHumanAccountID(uCurIssuerID)
% saTransferRate.getFullText()); % saTransferRate);
terResult = bCurAccount terResult = bCurAccount
? calcNodeAccountRev(uNode, psCur, bMultiQuality) ? calcNodeAccountRev(uNode, psCur, bMultiQuality)
@@ -2669,8 +2681,8 @@ void RippleCalc::pathNext(PathState::ref psrCur, const bool bMultiQuality, const
{ {
tLog(!psrCur->saInPass || !psrCur->saOutPass, lsDEBUG) tLog(!psrCur->saInPass || !psrCur->saOutPass, lsDEBUG)
<< boost::str(boost::format("pathNext: Error calcNodeFwd reported success for nothing: saOutPass=%s saInPass=%s") << boost::str(boost::format("pathNext: Error calcNodeFwd reported success for nothing: saOutPass=%s saInPass=%s")
% psrCur->saOutPass.getFullText() % psrCur->saOutPass
% psrCur->saInPass.getFullText()); % psrCur->saInPass);
if (!psrCur->saOutPass || !psrCur->saInPass) if (!psrCur->saOutPass || !psrCur->saInPass)
throw std::runtime_error("Made no progress."); throw std::runtime_error("Made no progress.");
@@ -2716,8 +2728,8 @@ TER RippleCalc::rippleCalc(
RippleCalc rc(lesActive, bOpenLedger); RippleCalc rc(lesActive, bOpenLedger);
cLog(lsTRACE) << boost::str(boost::format("rippleCalc> saMaxAmountReq=%s saDstAmountReq=%s") cLog(lsTRACE) << boost::str(boost::format("rippleCalc> saMaxAmountReq=%s saDstAmountReq=%s")
% saMaxAmountReq.getFullText() % saMaxAmountReq
% saDstAmountReq.getFullText()); % saDstAmountReq);
TER terResult = temUNCERTAIN; TER terResult = temUNCERTAIN;
@@ -2777,8 +2789,8 @@ cLog(lsDEBUG) << boost::str(boost::format("rippleCalc: Build direct: status: %s"
return temUNKNOWN; return temUNKNOWN;
cLog(lsTRACE) << boost::str(boost::format("rippleCalc: EXPAND: saDstAmountReq=%s saMaxAmountReq=%s uDstAccountID=%s uSrcAccountID=%s") cLog(lsTRACE) << boost::str(boost::format("rippleCalc: EXPAND: saDstAmountReq=%s saMaxAmountReq=%s uDstAccountID=%s uSrcAccountID=%s")
% saDstAmountReq.getFullText() % saDstAmountReq
% saMaxAmountReq.getFullText() % saMaxAmountReq
% RippleAddress::createHumanAccountID(uDstAccountID) % RippleAddress::createHumanAccountID(uDstAccountID)
% RippleAddress::createHumanAccountID(uSrcAccountID)); % RippleAddress::createHumanAccountID(uSrcAccountID));
@@ -2870,8 +2882,8 @@ int iPass = 0;
tLog(!pspCur->saInPass || !pspCur->saOutPass, lsDEBUG) tLog(!pspCur->saInPass || !pspCur->saOutPass, lsDEBUG)
<< boost::str(boost::format("rippleCalc: better: uQuality=%s saInPass=%s saOutPass=%s") << boost::str(boost::format("rippleCalc: better: uQuality=%s saInPass=%s saOutPass=%s")
% STAmount::saFromRate(pspCur->uQuality) % STAmount::saFromRate(pspCur->uQuality)
% pspCur->saInPass.getFullText() % pspCur->saInPass
% pspCur->saOutPass.getFullText()); % pspCur->saOutPass);
assert(!!pspCur->saInPass && !!pspCur->saOutPass); assert(!!pspCur->saInPass && !!pspCur->saOutPass);
@@ -2883,8 +2895,8 @@ int iPass = 0;
% pspCur->mIndex % pspCur->mIndex
% pspCur->uQuality % pspCur->uQuality
% STAmount::saFromRate(pspCur->uQuality) % STAmount::saFromRate(pspCur->uQuality)
% pspCur->saInPass.getFullText() % pspCur->saInPass
% pspCur->saOutPass.getFullText()); % pspCur->saOutPass);
assert(lesActive.isValid()); assert(lesActive.isValid());
lesActive.swapWith(pspCur->lesEntries); // For the path, save ledger state. lesActive.swapWith(pspCur->lesEntries); // For the path, save ledger state.
@@ -2917,8 +2929,8 @@ int iPass = 0;
cLog(lsDEBUG) << boost::str(boost::format("rippleCalc: best: uQuality=%s saInPass=%s saOutPass=%s") cLog(lsDEBUG) << boost::str(boost::format("rippleCalc: best: uQuality=%s saInPass=%s saOutPass=%s")
% STAmount::saFromRate(pspBest->uQuality) % STAmount::saFromRate(pspBest->uQuality)
% pspBest->saInPass.getFullText() % pspBest->saInPass
% pspBest->saOutPass.getFullText()); % pspBest->saOutPass);
// Record best pass' offers that became unfunded for deletion on success. // Record best pass' offers that became unfunded for deletion on success.
vuUnfundedBecame.insert(vuUnfundedBecame.end(), pspBest->vUnfundedBecame.begin(), pspBest->vUnfundedBecame.end()); vuUnfundedBecame.insert(vuUnfundedBecame.end(), pspBest->vUnfundedBecame.begin(), pspBest->vUnfundedBecame.end());