diff --git a/src/ripple/app/misc/Transaction.h b/src/ripple/app/misc/Transaction.h index 24849994161..f1195d7f87a 100644 --- a/src/ripple/app/misc/Transaction.h +++ b/src/ripple/app/misc/Transaction.h @@ -99,13 +99,13 @@ class Transaction : public std::enable_shared_from_this, LedgerIndex getLedger() const { - return mInLedger; + return mLedgerIndex; } bool isValidated() const { - return mInLedger != 0; + return mLedgerIndex != 0; } TransStatus @@ -138,7 +138,7 @@ class Transaction : public std::enable_shared_from_this, void setLedger(LedgerIndex ledger) { - mInLedger = ledger; + mLedgerIndex = ledger; } /** @@ -391,7 +391,7 @@ class Transaction : public std::enable_shared_from_this, uint256 mTransactionID; - LedgerIndex mInLedger = 0; + LedgerIndex mLedgerIndex = 0; TransStatus mStatus = INVALID; TER mResult = temUNCERTAIN; bool mApplying = false; diff --git a/src/ripple/app/misc/impl/Transaction.cpp b/src/ripple/app/misc/impl/Transaction.cpp index c6cd01b7096..1340501a95a 100644 --- a/src/ripple/app/misc/impl/Transaction.cpp +++ b/src/ripple/app/misc/impl/Transaction.cpp @@ -62,7 +62,7 @@ void Transaction::setStatus(TransStatus ts, std::uint32_t lseq) { mStatus = ts; - mInLedger = lseq; + mLedgerIndex = lseq; } TransStatus @@ -173,16 +173,16 @@ Transaction::getJson( { Json::Value ret(mTransaction->getJson(JsonOptions::none, binary, hash)); - if (mInLedger) + if (mLedgerIndex) { if (showInLedger) - ret[jss::inLedger] = mInLedger; // Deprecated. + ret[jss::inLedger] = mLedgerIndex; // Deprecated. - ret[jss::ledger_index] = mInLedger; + ret[jss::ledger_index] = mLedgerIndex; if (options == JsonOptions::include_date) { - auto ct = mApp.getLedgerMaster().getCloseTimeBySeq(mInLedger); + auto ct = mApp.getLedgerMaster().getCloseTimeBySeq(mLedgerIndex); if (ct) ret[jss::date] = ct->time_since_epoch().count(); }