ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 14:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups.

Browse Source
This commit is contained in:
JoelKatz
2013-03-03 23:52:13 -08:00
parent a96676f122
commit df9884f48e
1 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,7 +325,7 @@ void PathState::setExpanded(
uMaxCurrencyID, // Max specifes the currency. uMaxCurrencyID, // Max specifes the currency.
uSenderIssuerID); uSenderIssuerID);
cLog(lsDEBUG) << boost::str(boost::format("PathState: pushed: account=%s currency=%s issuer=%s") cLog(lsDEBUG) << boost::str(boost::format("PathState: pushed: account=%s currency=%s issuer=%s")
% RippleAddress::createHumanAccountID(uSenderID) % RippleAddress::createHumanAccountID(uSenderID)
% STAmount::createHumanCurrency(uMaxCurrencyID) % STAmount::createHumanCurrency(uMaxCurrencyID)
% RippleAddress::createHumanAccountID(uSenderIssuerID)); % RippleAddress::createHumanAccountID(uSenderIssuerID));
@@ -347,7 +347,7 @@ cLog(lsDEBUG) << boost::str(boost::format("PathState: pushed: account=%s currenc
: uOutIssuerID // Use implied node. : uOutIssuerID // Use implied node.
: ACCOUNT_XRP; : ACCOUNT_XRP;
cLog(lsDEBUG) << boost::str(boost::format("PathState: implied check: uNxtCurrencyID=%s uNxtAccountID=%s") cLog(lsDEBUG) << boost::str(boost::format("PathState: implied check: uNxtCurrencyID=%s uNxtAccountID=%s")
% RippleAddress::createHumanAccountID(uNxtCurrencyID) % RippleAddress::createHumanAccountID(uNxtCurrencyID)
% RippleAddress::createHumanAccountID(uNxtAccountID)); % RippleAddress::createHumanAccountID(uNxtAccountID));
@@ -356,7 +356,7 @@ cLog(lsDEBUG) << boost::str(boost::format("PathState: implied check: uNxtCurrenc
|| uMaxCurrencyID != uNxtCurrencyID // Next is different currency, offer next... || uMaxCurrencyID != uNxtCurrencyID // Next is different currency, offer next...
|| uMaxIssuerID != uNxtAccountID) // Next is not implied issuer || uMaxIssuerID != uNxtAccountID) // Next is not implied issuer
{ {
cLog(lsDEBUG) << boost::str(boost::format("PathState: sender implied: account=%s currency=%s issuer=%s") cLog(lsDEBUG) << boost::str(boost::format("PathState: sender implied: account=%s currency=%s issuer=%s")
% RippleAddress::createHumanAccountID(uMaxIssuerID) % RippleAddress::createHumanAccountID(uMaxIssuerID)
% RippleAddress::createHumanAccountID(uMaxCurrencyID) % RippleAddress::createHumanAccountID(uMaxCurrencyID)
% RippleAddress::createHumanAccountID(uMaxIssuerID)); % RippleAddress::createHumanAccountID(uMaxIssuerID));
@@ -375,7 +375,7 @@ cLog(lsDEBUG) << boost::str(boost::format("PathState: sender implied: account=%s
{ {
if (tesSUCCESS == terStatus) if (tesSUCCESS == terStatus)
{ {
cLog(lsDEBUG) << boost::str(boost::format("PathState: element in path:")); cLog(lsDEBUG) << boost::str(boost::format("PathState: element in path:"));
terStatus = pushNode(speElement.getNodeType(), speElement.getAccountID(), speElement.getCurrency(), speElement.getIssuerID()); terStatus = pushNode(speElement.getNodeType(), speElement.getAccountID(), speElement.getCurrency(), speElement.getIssuerID());
} }
} }
@@ -389,7 +389,7 @@ cLog(lsDEBUG) << boost::str(boost::format("PathState: element in path:"));
|| pnPrv.uAccountID != uOutIssuerID)) // Need the implied issuer. || pnPrv.uAccountID != uOutIssuerID)) // Need the implied issuer.
{ {
// Add implied account. // Add implied account.
cLog(lsDEBUG) << boost::str(boost::format("PathState: receiver implied: account=%s currency=%s issuer=%s") cLog(lsDEBUG) << boost::str(boost::format("PathState: receiver implied: account=%s currency=%s issuer=%s")
% RippleAddress::createHumanAccountID(uOutIssuerID) % RippleAddress::createHumanAccountID(uOutIssuerID)
% RippleAddress::createHumanAccountID(uOutCurrencyID) % RippleAddress::createHumanAccountID(uOutCurrencyID)
% RippleAddress::createHumanAccountID(uOutIssuerID)); % RippleAddress::createHumanAccountID(uOutIssuerID));
@@ -2495,7 +2495,7 @@ int iIndex = 0;
pspExpanded->setExpanded(lesActive, spPath, uDstAccountID, uSrcAccountID); pspExpanded->setExpanded(lesActive, spPath, uDstAccountID, uSrcAccountID);
cLog(lsDEBUG) << boost::str(boost::format("rippleCalc: Build path: %d: status: %s") cLog(lsDEBUG) << boost::str(boost::format("rippleCalc: Build path: %d: status: %s")
% ++iIndex % ++iIndex
% transToken(pspExpanded->terStatus)); % transToken(pspExpanded->terStatus));
@@ -2561,7 +2561,8 @@ int iPass = 0;
++iDry; ++iDry;
} }
else { else
{
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)
@@ -2587,16 +2588,19 @@ int iPass = 0;
} }
} }
} }
cLog(lsDEBUG) << boost::str(boost::format("rippleCalc: Summary: Pass: %d Dry: %d Paths: %d") % ++iPass % iDry % vpsExpanded.size()); if (sLog(lsDEBUG))
{
cLog(lsDEBUG) << boost::str(boost::format("rippleCalc: Summary: Pass: %d Dry: %d Paths: %d") % ++iPass % iDry % vpsExpanded.size());
BOOST_FOREACH(PathState::ref pspCur, vpsExpanded) BOOST_FOREACH(PathState::ref pspCur, vpsExpanded)
{ {
cLog(lsDEBUG) << boost::str(boost::format("rippleCalc: Summary: %d rate: %s quality:%d best: %d consumed: %d") cLog(lsDEBUG) << boost::str(boost::format("rippleCalc: Summary: %d rate: %s quality:%d best: %d consumed: %d")
% pspCur->mIndex % pspCur->mIndex
% STAmount::saFromRate(pspCur->uQuality) % STAmount::saFromRate(pspCur->uQuality)
% pspCur->uQuality % pspCur->uQuality
% (iBest == pspCur->getIndex()) % (iBest == pspCur->getIndex())
% pspCur->bConsumed); % pspCur->bConsumed);
} }
}
if (iBest >= 0) if (iBest >= 0)
{ {