diff --git a/src/cpp/ripple/PaymentTransactor.cpp b/src/cpp/ripple/PaymentTransactor.cpp index d9c837681c..c4aba28712 100644 --- a/src/cpp/ripple/PaymentTransactor.cpp +++ b/src/cpp/ripple/PaymentTransactor.cpp @@ -143,8 +143,7 @@ TER PaymentTransactor::doApply() const uint64 uReserve = mEngine->getLedger()->getReserve(uOwnerCount); // Make sure have enough reserve to send. - if (isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, we can vote. - && saSrcXRPBalance < saDstAmount + uReserve) // Reserve is not scaled by fee. + if (saSrcXRPBalance < saDstAmount + uReserve) // Reserve is not scaled by fee. { // Vote no. However, transaction might succeed, if applied in a different order. cLog(lsINFO) << ""; diff --git a/src/cpp/ripple/Transactor.cpp b/src/cpp/ripple/Transactor.cpp index 01861525f9..7b0091a3ac 100644 --- a/src/cpp/ripple/Transactor.cpp +++ b/src/cpp/ripple/Transactor.cpp @@ -57,7 +57,7 @@ TER Transactor::payFee() return telINSUF_FEE_P; } - if( !saPaid ) return tesSUCCESS; + if (!saPaid) return tesSUCCESS; // Deduct the fee, so it's not available during the transaction. // Will only write the account back, if the transaction succeeds. diff --git a/src/cpp/ripple/TrustSetTransactor.cpp b/src/cpp/ripple/TrustSetTransactor.cpp index aff2fa00b4..a3239f23dd 100644 --- a/src/cpp/ripple/TrustSetTransactor.cpp +++ b/src/cpp/ripple/TrustSetTransactor.cpp @@ -235,7 +235,6 @@ TER TrustSetTransactor::doApply() cLog(lsINFO) << "doTrustSet: Deleting ripple line"; } else if (bReserveIncrease - && isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, we can vote no. && saSrcXRPBalance.getNValue() < uReserveCreate) // Reserve is not scaled by load. { cLog(lsINFO) << "doTrustSet: Delay transaction: Insufficent reserve to add trust line."; @@ -259,8 +258,7 @@ TER TrustSetTransactor::doApply() return tecNO_LINE_REDUNDANT; } - else if (isSetBit(mParams, tapOPEN_LEDGER) // Ledger is not final, we can vote no. - && saSrcXRPBalance.getNValue() < uReserveCreate) // Reserve is not scaled by load. + else if (saSrcXRPBalance.getNValue() < uReserveCreate) // Reserve is not scaled by load. { cLog(lsINFO) << "doTrustSet: Delay transaction: Line does not exist. Insufficent reserve to create line.";