From 531dad6cfc39bcaf8667fbba56445b86303ca503 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 16 Apr 2013 12:01:25 -0700 Subject: [PATCH] Merge fixes. --- src/cpp/ripple/OfferCreateTransactor.cpp | 2 +- src/cpp/ripple/RippleCalc.cpp | 1 + src/cpp/ripple/Transaction.cpp | 3 +-- src/cpp/ripple/TransactionFormats.cpp | 1 - src/cpp/ripple/TrustSetTransactor.cpp | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cpp/ripple/OfferCreateTransactor.cpp b/src/cpp/ripple/OfferCreateTransactor.cpp index 1c3cfe22c6..c415522b28 100644 --- a/src/cpp/ripple/OfferCreateTransactor.cpp +++ b/src/cpp/ripple/OfferCreateTransactor.cpp @@ -440,7 +440,7 @@ TER OfferCreateTransactor::doApply() { cLog(lsWARNING) << "OfferCreate: Malformed offer: Bad currency."; - teResult = temBAD_CURRENCY; + terResult = temBAD_CURRENCY; } else if (saTakerPays.isNative() != !uPaysIssuerID || saTakerGets.isNative() != !uGetsIssuerID) { diff --git a/src/cpp/ripple/RippleCalc.cpp b/src/cpp/ripple/RippleCalc.cpp index 3cce7bbde8..54c78a5748 100644 --- a/src/cpp/ripple/RippleCalc.cpp +++ b/src/cpp/ripple/RippleCalc.cpp @@ -887,6 +887,7 @@ TER RippleCalc::calcNodeAdvance( { // Get next quality. uDirectTip = lesActive.getLedger()->getNextLedgerIndex(uDirectTip, uDirectEnd); + bDirectDirDirty = true; bDirectAdvance = false; diff --git a/src/cpp/ripple/Transaction.cpp b/src/cpp/ripple/Transaction.cpp index 7d4369e745..fc044b47a1 100644 --- a/src/cpp/ripple/Transaction.cpp +++ b/src/cpp/ripple/Transaction.cpp @@ -295,10 +295,9 @@ bool Transaction::convertToTransactions(uint32 firstLedgerSeq, uint32 secondLedg // options 1 to include the date of the transaction Json::Value Transaction::getJson(int options, bool binary) const { - Json::Value ret(mTransaction->getJson(0, binary)); - if (mInLedger) + if (mInLedger) { ret["inLedger"] = mInLedger; diff --git a/src/cpp/ripple/TransactionFormats.cpp b/src/cpp/ripple/TransactionFormats.cpp index 66d3a01e0b..3347c541e0 100644 --- a/src/cpp/ripple/TransactionFormats.cpp +++ b/src/cpp/ripple/TransactionFormats.cpp @@ -78,7 +78,6 @@ void TFInit() ; DECLARE_TF(SetFee, ttFEE) - << SOElement(sfFeatures, SOE_REQUIRED) << SOElement(sfBaseFee, SOE_REQUIRED) << SOElement(sfReferenceFeeUnits, SOE_REQUIRED) << SOElement(sfReserveBase, SOE_REQUIRED) diff --git a/src/cpp/ripple/TrustSetTransactor.cpp b/src/cpp/ripple/TrustSetTransactor.cpp index 1e59430108..062778815f 100644 --- a/src/cpp/ripple/TrustSetTransactor.cpp +++ b/src/cpp/ripple/TrustSetTransactor.cpp @@ -250,7 +250,7 @@ TER TrustSetTransactor::doApply() if (bDefault || CURRENCY_BAD == uCurrencyID) { - // Can delete. + // Delete. terResult = mEngine->getNodes().trustDelete(sleRippleState, uLowAccountID, uHighAccountID); }