diff --git a/src/LedgerMaster.cpp b/src/LedgerMaster.cpp index 9fbcd6928c..3481cd36da 100644 --- a/src/LedgerMaster.cpp +++ b/src/LedgerMaster.cpp @@ -69,21 +69,12 @@ void LedgerMaster::storeLedger(Ledger::pointer ledger) } Ledger::pointer LedgerMaster::closeLedger() -{ // FIXME: This needs to be cleaned up, now that wobble time is gone +{ boost::recursive_mutex::scoped_lock sl(mLock); - assert(!mWobbleLedger); - mWobbleLedger = boost::make_shared(boost::ref(*mCurrentLedger), true); + Ledger::pointer closingLedger = mCurrentLedger; + mCurrentLedger = boost::make_shared(boost::ref(*closingLedger), true); mEngine.setDefaultLedger(mCurrentLedger); - mEngine.setAlternateLedger(mWobbleLedger); - assert(mCurrentLedger && mWobbleLedger); - std::swap(mCurrentLedger, mWobbleLedger); - mEngine.setDefaultLedger(mCurrentLedger); - mEngine.setAlternateLedger(mWobbleLedger); - assert(mWobbleLedger && mCurrentLedger); - Ledger::pointer ret = mWobbleLedger; - mWobbleLedger = Ledger::pointer(); - mEngine.setAlternateLedger(Ledger::pointer()); - return ret; + return closingLedger; } TransactionEngineResult LedgerMaster::doTransaction(const SerializedTransaction& txn, uint32 targetLedger, diff --git a/src/LedgerMaster.h b/src/LedgerMaster.h index 5c290bc96d..9f9603f1bc 100644 --- a/src/LedgerMaster.h +++ b/src/LedgerMaster.h @@ -19,7 +19,6 @@ class LedgerMaster TransactionEngine mEngine; Ledger::pointer mCurrentLedger; // The ledger we are currently processiong - Ledger::pointer mWobbleLedger; // A ledger past its close time Ledger::pointer mFinalizedLedger; // The ledger that most recently closed LedgerHistory mLedgerHistory; @@ -41,9 +40,6 @@ public: // The current ledger is the ledger we believe new transactions should go in Ledger::pointer getCurrentLedger() { return mCurrentLedger; } - // The wobble ledger is a ledger that new transactions can go in if requested - Ledger::pointer getWobbleLedger() { return mWobbleLedger; } - // The finalized ledger is the last closed/accepted ledger Ledger::pointer getClosedLedger() { return mFinalizedLedger; }