ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-03 17:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Logging reductions.

Browse Source
This commit is contained in:
JoelKatz
2013-02-13 00:09:12 -08:00
parent 25109d7298
commit 57a9f6afdc
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpp/ripple/Ledger.cpp
View File

@@ -1231,7 +1231,7 @@ uint256 Ledger::getBookBase(const uint160& uTakerPaysCurrency, const uint160& uT
uint256 uBaseIndex = getQualityIndex(s.getSHA512Half()); // Return with quality 0. uint256 uBaseIndex = getQualityIndex(s.getSHA512Half()); // Return with quality 0.
cLog(lsDEBUG) << boost::str(boost::format("getBookBase(%s,%s,%s,%s) = %s") cLog(lsTRACE) << boost::str(boost::format("getBookBase(%s,%s,%s,%s) = %s")
% STAmount::createHumanCurrency(uTakerPaysCurrency) % STAmount::createHumanCurrency(uTakerPaysCurrency)
% RippleAddress::createHumanAccountID(uTakerPaysIssuerID) % RippleAddress::createHumanAccountID(uTakerPaysIssuerID)
% STAmount::createHumanCurrency(uTakerGetsCurrency) % STAmount::createHumanCurrency(uTakerGetsCurrency)

26
src/cpp/ripple/Pathfinder.cpp
View File

@@ -118,8 +118,8 @@ bool Pathfinder::bDefaultPath(const STPath& spPath)
// When path is a default (implied). Don't need to add it to return set. // When path is a default (implied). Don't need to add it to return set.
bDefault = pspCurrent->vpnNodes == mPsDefault->vpnNodes; bDefault = pspCurrent->vpnNodes == mPsDefault->vpnNodes;
cLog(lsDEBUG) << "findPaths: expanded path: " << pspCurrent->getJson(); cLog(lsTRACE) << "findPaths: expanded path: " << pspCurrent->getJson();
cLog(lsDEBUG) << "findPaths: default path: indirect: " << spPath.getJson(0); cLog(lsTRACE) << "findPaths: default path: indirect: " << spPath.getJson(0);
return bDefault; return bDefault;
} }
@@ -159,14 +159,14 @@ Pathfinder::Pathfinder(Ledger::ref ledger,
if (tesSUCCESS == psDefault->terStatus) if (tesSUCCESS == psDefault->terStatus)
{ {
// The default path works, remember it. // The default path works, remember it.
cLog(lsDEBUG) << "Pathfinder: default path: " << psDefault->getJson(); cLog(lsTRACE) << "Pathfinder: default path: " << psDefault->getJson();
mPsDefault = psDefault; mPsDefault = psDefault;
} }
else else
{ {
// The default path doesn't work. // The default path doesn't work.
cLog(lsDEBUG) << "Pathfinder: default path: NONE: " << transToken(psDefault->terStatus); cLog(lsTRACE) << "Pathfinder: default path: NONE: " << transToken(psDefault->terStatus);
} }
} }
} }
@@ -189,7 +189,7 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
{ {
bool bFound = false; // True, iff found a path. bool bFound = false; // True, iff found a path.
cLog(lsDEBUG) << boost::str(boost::format("findPaths> mSrcAccountID=%s mDstAccountID=%s mDstAmount=%s mSrcCurrencyID=%s mSrcIssuerID=%s") cLog(lsTRACE) << boost::str(boost::format("findPaths> mSrcAccountID=%s mDstAccountID=%s mDstAmount=%s mSrcCurrencyID=%s mSrcIssuerID=%s")
% RippleAddress::createHumanAccountID(mSrcAccountID) % RippleAddress::createHumanAccountID(mSrcAccountID)
% RippleAddress::createHumanAccountID(mDstAccountID) % RippleAddress::createHumanAccountID(mDstAccountID)
% mDstAmount.getFullText() % mDstAmount.getFullText()
@@ -199,7 +199,7 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
if (!mLedger) if (!mLedger)
{ {
cLog(lsDEBUG) << boost::str(boost::format("findPaths< no ledger")); cLog(lsDEBUG) << "findPaths< no ledger";
return false; return false;
} }
@@ -273,13 +273,13 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
if (spPath.size()) if (spPath.size())
{ {
// There is an actual path element. // There is an actual path element.
cLog(lsDEBUG) << "findPaths: adding path: " << spPath.getJson(0); cLog(lsTRACE) << "findPaths: adding path: " << spPath.getJson(0);
vspResults.push_back(spPath); // Potential result. vspResults.push_back(spPath); // Potential result.
} }
else else
{ {
cLog(lsDEBUG) << "findPaths: empty path: XRP->XRP"; cLog(lsTRACE) << "findPaths: empty path: XRP->XRP";
} }
continue; continue;
@@ -287,7 +287,7 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
cLog(lsDEBUG) << "findPaths: finish? account: " << (speEnd.mAccountID == mDstAccountID); cLog(lsDEBUG) << "findPaths: finish? account: " << (speEnd.mAccountID == mDstAccountID);
cLog(lsDEBUG) << "findPaths: finish? currency: " << (speEnd.mCurrencyID == mDstAmount.getCurrency()); cLog(lsDEBUG) << "findPaths: finish? currency: " << (speEnd.mCurrencyID == mDstAmount.getCurrency());
cLog(lsDEBUG) << "findPaths: finish? issuer: " cLog(lsTRACE) << "findPaths: finish? issuer: "
<< RippleAddress::createHumanAccountID(speEnd.mIssuerID) << RippleAddress::createHumanAccountID(speEnd.mIssuerID)
<< " / " << " / "
<< RippleAddress::createHumanAccountID(mDstAmount.getIssuer()) << RippleAddress::createHumanAccountID(mDstAmount.getIssuer())
@@ -333,7 +333,7 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
bool bContinued = false; // True, if wasn't a dead end. bool bContinued = false; // True, if wasn't a dead end.
cLog(lsDEBUG) << cLog(lsTRACE) <<
boost::str(boost::format("findPaths: cursor: %s - %s/%s") boost::str(boost::format("findPaths: cursor: %s - %s/%s")
% RippleAddress::createHumanAccountID(speEnd.mAccountID) % RippleAddress::createHumanAccountID(speEnd.mAccountID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID) % STAmount::createHumanCurrency(speEnd.mCurrencyID)
@@ -414,7 +414,7 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
|| (bRequireAuth && !rspEntry->getAuth()))) // Not authorized to hold credit. || (bRequireAuth && !rspEntry->getAuth()))) // Not authorized to hold credit.
{ {
// Path has no credit left. Ignore it. // Path has no credit left. Ignore it.
cLog(lsDEBUG) << cLog(lsTRACE) <<
boost::str(boost::format("findPaths: No credit: %s/%s -> %s/%s") boost::str(boost::format("findPaths: No credit: %s/%s -> %s/%s")
% RippleAddress::createHumanAccountID(speEnd.mAccountID) % RippleAddress::createHumanAccountID(speEnd.mAccountID)
% STAmount::createHumanCurrency(speEnd.mCurrencyID) % STAmount::createHumanCurrency(speEnd.mCurrencyID)
@@ -432,7 +432,7 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
bContinued = true; bContinued = true;
cLog(lsDEBUG) << cLog(lsTRACE) <<
boost::str(boost::format("findPaths: push explore: %s/%s -> %s/%s") boost::str(boost::format("findPaths: push explore: %s/%s -> %s/%s")
% STAmount::createHumanCurrency(speEnd.mCurrencyID) % STAmount::createHumanCurrency(speEnd.mCurrencyID)
% RippleAddress::createHumanAccountID(speEnd.mAccountID) % RippleAddress::createHumanAccountID(speEnd.mAccountID)
@@ -460,7 +460,7 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax
bContinued = true; bContinued = true;
cLog(lsDEBUG) << cLog(lsTRACE) <<
boost::str(boost::format("findPaths: push book: %s/%s -> %s/%s") boost::str(boost::format("findPaths: push book: %s/%s -> %s/%s")
% STAmount::createHumanCurrency(speEnd.mCurrencyID) % STAmount::createHumanCurrency(speEnd.mCurrencyID)
% RippleAddress::createHumanAccountID(speEnd.mIssuerID) % RippleAddress::createHumanAccountID(speEnd.mIssuerID)

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

@@ -107,7 +107,7 @@ TER PathState::pushImply(
uIssuerID); uIssuerID);
} }
cLog(lsDEBUG) << boost::str(boost::format("pushImply< : %s") % transToken(terResult)); cLog(lsINFO) << boost::str(boost::format("pushImply< : %s") % transToken(terResult));
return terResult; return terResult;
} }
@@ -280,7 +280,7 @@ TER PathState::pushNode(
vpnNodes.push_back(pnCur); vpnNodes.push_back(pnCur);
} }
} }
cLog(lsDEBUG) << boost::str(boost::format("pushNode< : %s") % transToken(terResult)); cLog(lsINFO) << boost::str(boost::format("pushNode< : %s") % transToken(terResult));
return terResult; return terResult;
} }
@@ -1660,7 +1660,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
? lesActive.rippleOwed(uCurAccountID, uNxtAccountID, uCurrencyID) ? lesActive.rippleOwed(uCurAccountID, uNxtAccountID, uCurrencyID)
: STAmount(uCurrencyID, uCurAccountID); : STAmount(uCurrencyID, uCurAccountID);
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountRev> uNode=%d/%d uPrvAccountID=%s uCurAccountID=%s uNxtAccountID=%s uCurrencyID=%s uQualityIn=%d uQualityOut=%d saPrvOwed=%s saPrvLimit=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev> uNode=%d/%d uPrvAccountID=%s uCurAccountID=%s uNxtAccountID=%s uCurrencyID=%s uQualityIn=%d uQualityOut=%d saPrvOwed=%s saPrvLimit=%s")
% uNode % uNode
% uLast % uLast
% RippleAddress::createHumanAccountID(uPrvAccountID) % RippleAddress::createHumanAccountID(uPrvAccountID)
@@ -1695,14 +1695,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(lsINFO) << boost::str(boost::format("calcNodeAccountRev: saPrvRedeemReq=%s saPrvIssueReq=%s saCurRedeemReq=%s saCurIssueReq=%s saNxtOwed=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: saPrvRedeemReq=%s saPrvIssueReq=%s saCurRedeemReq=%s saCurIssueReq=%s saNxtOwed=%s")
% saPrvRedeemReq.getFullText() % saPrvRedeemReq.getFullText()
% saPrvIssueReq.getFullText() % saPrvIssueReq.getFullText()
% saCurRedeemReq.getFullText() % saCurRedeemReq.getFullText()
% saCurIssueReq.getFullText() % saCurIssueReq.getFullText()
% saNxtOwed.getFullText()); % saNxtOwed.getFullText());
cLog(lsINFO) << psCur.getJson(); cLog(lsDEBUG) << psCur.getJson();
assert(!saCurRedeemReq || (-saNxtOwed) >= saCurRedeemReq); // Current redeem req can't be more than IOUs on hand. assert(!saCurRedeemReq || (-saNxtOwed) >= saCurRedeemReq); // Current redeem req can't be more than IOUs on hand.
assert(!saCurIssueReq // If not issuing, fine. assert(!saCurIssueReq // If not issuing, fine.
@@ -1727,7 +1727,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
: psCur.saOutReq-psCur.saOutAct; // Previous is an offer, no limit: redeem own IOUs. : psCur.saOutReq-psCur.saOutAct; // Previous is an offer, no limit: redeem own IOUs.
STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer()); STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer());
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> $ : saCurWantedReq=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> $ : saCurWantedReq=%s")
% saCurWantedReq.getFullText()); % saCurWantedReq.getFullText());
// Calculate redeem // Calculate redeem
@@ -1740,7 +1740,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
uRateMax = STAmount::uRateOne; uRateMax = STAmount::uRateOne;
cLog(lsINFO) << 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.getFullText()
% saPrvRedeemAct.getFullText() % saPrvRedeemAct.getFullText()
% STAmount::saFromRate(uRateMax).getText()); % STAmount::saFromRate(uRateMax).getText());
@@ -1761,7 +1761,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
// If we previously redeemed and this has a poorer rate, this won't be included the current increment. // If we previously redeemed and this has a poorer rate, this won't be included the current increment.
calcNodeRipple(uQualityIn, QUALITY_ONE, saPrvIssueReq, saCurWantedReq, saPrvIssueAct, saCurWantedAct, uRateMax); calcNodeRipple(uQualityIn, QUALITY_ONE, saPrvIssueReq, saCurWantedReq, saPrvIssueAct, saCurWantedAct, uRateMax);
cLog(lsINFO) << 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.getFullText()
% saCurWantedAct.getFullText()); % saCurWantedAct.getFullText());
} }
@@ -1785,7 +1785,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
// Rate : 1.0 : quality out // Rate : 1.0 : quality out
calcNodeRipple(QUALITY_ONE, uQualityOut, saPrvRedeemReq, saCurRedeemReq, saPrvRedeemAct, saCurRedeemAct, uRateMax); calcNodeRipple(QUALITY_ONE, uQualityOut, saPrvRedeemReq, saCurRedeemReq, saPrvRedeemAct, saCurRedeemAct, uRateMax);
cLog(lsINFO) << 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.getFullText()
% saCurRedeemAct.getFullText()); % saCurRedeemAct.getFullText());
} }
@@ -1797,7 +1797,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
// Rate: quality in : quality out // Rate: quality in : quality out
calcNodeRipple(uQualityIn, uQualityOut, saPrvIssueReq, saCurRedeemReq, saPrvIssueAct, saCurRedeemAct, uRateMax); calcNodeRipple(uQualityIn, uQualityOut, saPrvIssueReq, saCurRedeemReq, saPrvIssueAct, saCurRedeemAct, uRateMax);
cLog(lsINFO) << 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.getFullText()
% saCurRedeemAct.getFullText()); % saCurRedeemAct.getFullText());
} }
@@ -1824,7 +1824,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
// Rate: quality in : 1.0 // Rate: quality in : 1.0
calcNodeRipple(uQualityIn, QUALITY_ONE, saPrvIssueReq, saCurIssueReq, saPrvIssueAct, saCurIssueAct, uRateMax); calcNodeRipple(uQualityIn, QUALITY_ONE, saPrvIssueReq, saCurIssueReq, saPrvIssueAct, saCurIssueAct, uRateMax);
cLog(lsINFO) << 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.getFullText()
% saCurIssueAct.getFullText()); % saCurIssueAct.getFullText());
} }
@@ -1835,7 +1835,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
terResult = tecPATH_DRY; terResult = tecPATH_DRY;
} }
cLog(lsINFO) << 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.getFullText()
% saCurIssueReq.getFullText() % saCurIssueReq.getFullText()
% saPrvOwed.getFullText() % saPrvOwed.getFullText()
@@ -1847,7 +1847,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
{ {
// account --> ACCOUNT --> offer // account --> ACCOUNT --> offer
// Note: deliver is always issue as ACCOUNT is the issuer for the offer input. // Note: deliver is always issue as ACCOUNT is the issuer for the offer input.
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> offer")); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: account --> ACCOUNT --> offer"));
saPrvRedeemAct.zero(saCurRedeemReq); saPrvRedeemAct.zero(saCurRedeemReq);
saPrvIssueAct.zero(saCurRedeemReq); saPrvIssueAct.zero(saCurRedeemReq);
@@ -1874,7 +1874,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
terResult = tecPATH_DRY; terResult = tecPATH_DRY;
} }
cLog(lsINFO) << 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.getFullText()
% saCurDeliverAct.getFullText() % saCurDeliverAct.getFullText()
% saPrvOwed.getFullText()); % saPrvOwed.getFullText());
@@ -1891,7 +1891,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
: psCur.saOutReq-psCur.saOutAct; // Previous is an offer, no limit: redeem own IOUs. : psCur.saOutReq-psCur.saOutAct; // Previous is an offer, no limit: redeem own IOUs.
STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer()); STAmount saCurWantedAct(saCurWantedReq.getCurrency(), saCurWantedReq.getIssuer());
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> $ : saCurWantedReq=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> $ : saCurWantedReq=%s")
% saCurWantedReq.getFullText()); % saCurWantedReq.getFullText());
// Rate: quality in : 1.0 // Rate: quality in : 1.0
@@ -1907,7 +1907,7 @@ 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(lsINFO) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> account")); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> account"));
// deliver -> redeem // deliver -> redeem
if (saCurRedeemReq) // Next wants us to redeem. if (saCurRedeemReq) // Next wants us to redeem.
@@ -1924,7 +1924,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
calcNodeRipple(QUALITY_ONE, lesActive.rippleTransferRate(uCurAccountID), saPrvDeliverReq, saCurIssueReq, saPrvDeliverAct, saCurIssueAct, uRateMax); calcNodeRipple(QUALITY_ONE, lesActive.rippleTransferRate(uCurAccountID), saPrvDeliverReq, saCurIssueReq, saPrvDeliverAct, saCurIssueAct, uRateMax);
} }
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountRev: saCurRedeemReq=%s saCurIssueAct=%s saCurIssueReq=%s saPrvDeliverAct=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: saCurRedeemReq=%s saCurIssueAct=%s saCurIssueReq=%s saPrvDeliverAct=%s")
% saCurRedeemReq.getFullText() % saCurRedeemReq.getFullText()
% saCurRedeemAct.getFullText() % saCurRedeemAct.getFullText()
% saCurIssueReq.getFullText() % saCurIssueReq.getFullText()
@@ -1941,7 +1941,7 @@ TER RippleCalc::calcNodeAccountRev(const unsigned int uNode, PathState& psCur, c
{ {
// offer --> ACCOUNT --> offer // offer --> ACCOUNT --> offer
// deliver/redeem -> deliver/issue. // deliver/redeem -> deliver/issue.
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> offer")); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountRev: offer --> ACCOUNT --> offer"));
saPrvDeliverAct.zero(saCurRedeemReq); saPrvDeliverAct.zero(saCurRedeemReq);
@@ -2025,7 +2025,7 @@ TER RippleCalc::calcNodeAccountFwd(
// For !uNode // For !uNode
STAmount& saCurSendMaxPass = psCur.saInPass; // Report how much pass sends. STAmount& saCurSendMaxPass = psCur.saInPass; // Report how much pass sends.
cLog(lsINFO) << 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.getFullText()
@@ -2069,7 +2069,7 @@ TER RippleCalc::calcNodeAccountFwd(
saCurSendMaxPass += saCurIssueAct; saCurSendMaxPass += saCurIssueAct;
cLog(lsINFO) << 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.getFullText()
% psCur.saInAct.getFullText() % psCur.saInAct.getFullText()
% saCurRedeemAct.getFullText() % saCurRedeemAct.getFullText()
@@ -2080,7 +2080,7 @@ TER RippleCalc::calcNodeAccountFwd(
else if (uNode == uLast) else if (uNode == uLast)
{ {
// account --> ACCOUNT --> $ // account --> ACCOUNT --> $
cLog(lsINFO) << 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.getFullText()
@@ -2103,7 +2103,7 @@ TER RippleCalc::calcNodeAccountFwd(
else else
{ {
// account --> ACCOUNT --> account // account --> ACCOUNT --> account
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountFwd: account --> ACCOUNT --> account")); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: account --> ACCOUNT --> account"));
saCurRedeemAct.zero(saCurRedeemReq); saCurRedeemAct.zero(saCurRedeemReq);
saCurIssueAct.zero(saCurIssueReq); saCurIssueAct.zero(saCurIssueReq);
@@ -2223,7 +2223,7 @@ TER RippleCalc::calcNodeAccountFwd(
if (uNode == uLast) if (uNode == uLast)
{ {
// offer --> ACCOUNT --> $ // offer --> ACCOUNT --> $
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountFwd: offer --> ACCOUNT --> $ : %s") % saPrvDeliverReq.getFullText()); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: offer --> ACCOUNT --> $ : %s") % saPrvDeliverReq.getFullText());
STAmount& saCurReceive = psCur.saOutPass; STAmount& saCurReceive = psCur.saOutPass;
@@ -2235,7 +2235,7 @@ TER RippleCalc::calcNodeAccountFwd(
else else
{ {
// offer --> ACCOUNT --> account // offer --> ACCOUNT --> account
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountFwd: offer --> ACCOUNT --> account")); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: offer --> ACCOUNT --> account"));
saCurRedeemAct.zero(saCurRedeemReq); saCurRedeemAct.zero(saCurRedeemReq);
saCurIssueAct.zero(saCurIssueReq); saCurIssueAct.zero(saCurIssueReq);
@@ -2264,7 +2264,7 @@ TER RippleCalc::calcNodeAccountFwd(
{ {
// offer --> ACCOUNT --> offer // offer --> ACCOUNT --> offer
// deliver/redeem -> deliver/issue. // deliver/redeem -> deliver/issue.
cLog(lsINFO) << boost::str(boost::format("calcNodeAccountFwd: offer --> ACCOUNT --> offer")); cLog(lsDEBUG) << boost::str(boost::format("calcNodeAccountFwd: offer --> ACCOUNT --> offer"));
saCurDeliverAct.zero(saCurDeliverReq); saCurDeliverAct.zero(saCurDeliverReq);
@@ -2286,7 +2286,7 @@ TER RippleCalc::calcNodeFwd(const unsigned int uNode, PathState& psCur, const bo
const PaymentNode& pnCur = psCur.vpnNodes[uNode]; const PaymentNode& pnCur = psCur.vpnNodes[uNode];
const bool bCurAccount = isSetBit(pnCur.uFlags, STPathElement::typeAccount); const bool bCurAccount = isSetBit(pnCur.uFlags, STPathElement::typeAccount);
cLog(lsINFO) << boost::str(boost::format("calcNodeFwd> uNode=%d") % uNode); cLog(lsDEBUG) << boost::str(boost::format("calcNodeFwd> uNode=%d") % uNode);
TER terResult = bCurAccount TER terResult = bCurAccount
? calcNodeAccountFwd(uNode, psCur, bMultiQuality) ? calcNodeAccountFwd(uNode, psCur, bMultiQuality)
@@ -2297,7 +2297,7 @@ TER RippleCalc::calcNodeFwd(const unsigned int uNode, PathState& psCur, const bo
terResult = calcNodeFwd(uNode+1, psCur, bMultiQuality); terResult = calcNodeFwd(uNode+1, psCur, bMultiQuality);
} }
cLog(lsINFO) << boost::str(boost::format("calcNodeFwd< uNode=%d terResult=%d") % uNode % terResult); cLog(lsDEBUG) << boost::str(boost::format("calcNodeFwd< uNode=%d terResult=%d") % uNode % terResult);
return terResult; return terResult;
} }
@@ -2323,7 +2323,7 @@ TER RippleCalc::calcNodeRev(const unsigned int uNode, PathState& psCur, const bo
saTransferRate = STAmount::saFromRate(lesActive.rippleTransferRate(uCurIssuerID)); saTransferRate = STAmount::saFromRate(lesActive.rippleTransferRate(uCurIssuerID));
cLog(lsINFO) << boost::str(boost::format("calcNodeRev> uNode=%d uIssuerID=%s saTransferRate=%s") cLog(lsDEBUG) << boost::str(boost::format("calcNodeRev> uNode=%d uIssuerID=%s saTransferRate=%s")
% uNode % uNode
% RippleAddress::createHumanAccountID(uCurIssuerID) % RippleAddress::createHumanAccountID(uCurIssuerID)
% saTransferRate.getFullText()); % saTransferRate.getFullText());
@@ -2368,7 +2368,7 @@ void RippleCalc::pathNext(PathState::ref psrCur, const bool bMultiQuality, const
psrCur->vUnfundedBecame.clear(); psrCur->vUnfundedBecame.clear();
psrCur->umReverse.clear(); psrCur->umReverse.clear();
cLog(lsINFO) << "pathNext: Path In: " << psrCur->getJson(); cLog(lsDEBUG) << "pathNext: Path In: " << psrCur->getJson();
assert(psrCur->vpnNodes.size() >= 2); assert(psrCur->vpnNodes.size() >= 2);
@@ -2377,7 +2377,7 @@ void RippleCalc::pathNext(PathState::ref psrCur, const bool bMultiQuality, const
psrCur->terStatus = calcNodeRev(uLast, *psrCur, bMultiQuality); psrCur->terStatus = calcNodeRev(uLast, *psrCur, bMultiQuality);
cLog(lsINFO) << "pathNext: Path after reverse: " << psrCur->getJson(); cLog(lsDEBUG) << "pathNext: Path after reverse: " << psrCur->getJson();
if (tesSUCCESS == psrCur->terStatus) if (tesSUCCESS == psrCur->terStatus)
{ {
@@ -2400,7 +2400,7 @@ void RippleCalc::pathNext(PathState::ref psrCur, const bool bMultiQuality, const
psrCur->uQuality = STAmount::getRate(psrCur->saOutPass, psrCur->saInPass); // Calculate relative quality. psrCur->uQuality = STAmount::getRate(psrCur->saOutPass, psrCur->saInPass); // Calculate relative quality.
cLog(lsINFO) << "pathNext: Path after forward: " << psrCur->getJson(); cLog(lsDEBUG) << "pathNext: Path after forward: " << psrCur->getJson();
} }
else else
{ {