diff --git a/src/LedgerMaster.cpp b/src/LedgerMaster.cpp index 3481cd36da..ee31de2a66 100644 --- a/src/LedgerMaster.cpp +++ b/src/LedgerMaster.cpp @@ -73,14 +73,14 @@ Ledger::pointer LedgerMaster::closeLedger() boost::recursive_mutex::scoped_lock sl(mLock); Ledger::pointer closingLedger = mCurrentLedger; mCurrentLedger = boost::make_shared(boost::ref(*closingLedger), true); - mEngine.setDefaultLedger(mCurrentLedger); + mEngine.setLedger(mCurrentLedger); return closingLedger; } TransactionEngineResult LedgerMaster::doTransaction(const SerializedTransaction& txn, uint32 targetLedger, TransactionEngineParams params) { - Ledger::pointer ledger = mEngine.getTransactionLedger(targetLedger); + Ledger::pointer ledger = mEngine.getLedger(); TransactionEngineResult result = mEngine.applyTransaction(txn, params, ledger); theApp->getOPs().pubTransaction(ledger, txn, result); return result; diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp index 436fa8f9ae..4296945531 100644 --- a/src/TransactionEngine.cpp +++ b/src/TransactionEngine.cpp @@ -479,18 +479,6 @@ TransactionEngineResult TransactionEngine::setAuthorized(const SerializedTransac return terSUCCESS; } -Ledger::pointer TransactionEngine::getTransactionLedger(uint32 targetLedger) -{ - Ledger::pointer ledger = mDefaultLedger; - if (mAlternateLedger && (targetLedger != 0) && - (targetLedger != mLedger->getLedgerSeq()) && (targetLedger == mAlternateLedger->getLedgerSeq())) - { - Log(lsINFO) << "Transaction goes into wobble ledger"; - ledger = mAlternateLedger; - } - return ledger; -} - bool TransactionEngine::entryExists(SLE::pointer sleEntry) { return mEntries.find(sleEntry) != mEntries.end(); @@ -576,7 +564,7 @@ void TransactionEngine::entryUnfunded(SLE::pointer sleEntry) TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTransaction& txn, TransactionEngineParams params, uint32 targetLedger) { - return applyTransaction(txn, params, getTransactionLedger(targetLedger)); + return applyTransaction(txn, params, mLedger); } TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTransaction& txn, diff --git a/src/TransactionEngine.h b/src/TransactionEngine.h index 498bdcc0ac..7f63744887 100644 --- a/src/TransactionEngine.h +++ b/src/TransactionEngine.h @@ -154,7 +154,6 @@ private: STAmount& saTakerGot); protected: - Ledger::pointer mDefaultLedger, mAlternateLedger; Ledger::pointer mLedger; uint64 mLedgerParentCloseTime; @@ -188,16 +187,11 @@ protected: public: TransactionEngine() { ; } - TransactionEngine(Ledger::pointer ledger) : mDefaultLedger(ledger) { ; } + TransactionEngine(Ledger::pointer ledger) : mLedger(ledger) { ; } - Ledger::pointer getDefaultLedger() { return mDefaultLedger; } - void setDefaultLedger(Ledger::pointer ledger) { mDefaultLedger = ledger; } - Ledger::pointer getAlternateLedger() { return mAlternateLedger; } - void setAlternateLedger(Ledger::pointer ledger) { mAlternateLedger = ledger; } - void setLedger(Ledger::pointer ledger) { mDefaultLedger = ledger; - mAlternateLedger = Ledger::pointer(); } + Ledger::pointer getLedger() { return mLedger; } + void setLedger(Ledger::pointer ledger) { mLedger = ledger; } - Ledger::pointer getTransactionLedger(uint32 targetLedger); TransactionEngineResult applyTransaction(const SerializedTransaction&, TransactionEngineParams, Ledger::pointer ledger); TransactionEngineResult applyTransaction(const SerializedTransaction&, TransactionEngineParams,