From fd669915ba01398a60a1f87f0a2ad53b11955838 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Mon, 5 Nov 2012 09:41:59 -0800 Subject: [PATCH] Remove unnecessary assert. --- src/LedgerEntrySet.cpp | 2 -- src/RippleCalc.cpp | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/LedgerEntrySet.cpp b/src/LedgerEntrySet.cpp index 3224f07eb..60ee99a1c 100644 --- a/src/LedgerEntrySet.cpp +++ b/src/LedgerEntrySet.cpp @@ -861,8 +861,6 @@ uint32 LedgerEntrySet::rippleTransferRate(const uint160& uIssuerID) % !!sleAccount % (uQuality/1000000000.0)); - assert(sleAccount); - return uQuality; } diff --git a/src/RippleCalc.cpp b/src/RippleCalc.cpp index d4ba49a39..1ac494c3a 100644 --- a/src/RippleCalc.cpp +++ b/src/RippleCalc.cpp @@ -286,7 +286,7 @@ TER RippleCalc::calcNodeDeliverRev( STAmount& saPrvDlvReq = pnPrv.saRevDeliver; // To be adjusted. - saOutAct = 0; + saOutAct.zero(saOutReq); while (saOutAct != saOutReq) // Did not deliver limit. { @@ -1650,6 +1650,11 @@ PathState::PathState( uInCurrencyID, uSenderID); +cLog(lsDEBUG) << boost::str(boost::format("PathState: pushed: account=%s currency=%s issuer=%s") + % RippleAddress::createHumanAccountID(uSenderID) + % STAmount::createHumanCurrency(uInCurrencyID) + % RippleAddress::createHumanAccountID(uSenderID)); + if (tesSUCCESS == terStatus && !!uInCurrencyID // First was not XRC && uInIssuerID != uSenderID) { // Issuer was not same as sender @@ -1667,11 +1672,19 @@ PathState::PathState( : uOutIssuerID : ACCOUNT_XNS; +cLog(lsDEBUG) << boost::str(boost::format("PathState: implied check: uNxtCurrencyID=%s uNxtAccountID=%s") + % RippleAddress::createHumanAccountID(uNxtCurrencyID) + % RippleAddress::createHumanAccountID(uNxtAccountID)); + // Can't just use push implied, because it can't compensate for next account. if (!uNxtCurrencyID // Next is XRC - will have offer next || uInCurrencyID != uNxtCurrencyID // Next is different current - will have offer next || uInIssuerID != uNxtAccountID) // Next is not implied issuer { +cLog(lsDEBUG) << boost::str(boost::format("PathState: implied: account=%s currency=%s issuer=%s") + % RippleAddress::createHumanAccountID(uInIssuerID) + % RippleAddress::createHumanAccountID(uInCurrencyID) + % RippleAddress::createHumanAccountID(uInIssuerID)); // Add implied account. terStatus = pushNode( STPathElement::typeAccount