diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp index 64da1e0f8a..b9315eb979 100644 --- a/src/LedgerConsensus.cpp +++ b/src/LedgerConsensus.cpp @@ -375,12 +375,10 @@ int LedgerConsensus::statePreClose() Log(lsINFO) << "CLC:: closing ledger"; mState = lcsESTABLISH; mConsensusStartTime = boost::posix_time::second_clock::universal_time(); - theApp->getMasterLedger().beginWobble(); - theApp->getMasterLedger().closeTime(); mCloseTime = theApp->getOPs().getNetworkTimeNC(); theApp->getOPs().setLastCloseNetTime(mCloseTime); statusChange(newcoin::neCLOSING_LEDGER, mPreviousLedger); - Ledger::pointer initial = theApp->getMasterLedger().endWobble(); + Ledger::pointer initial = theApp->getMasterLedger().closeLedger(); assert (initial->getParentHash() == mPreviousLedger->getHash()); takeInitialPosition(initial); } diff --git a/src/LedgerMaster.cpp b/src/LedgerMaster.cpp index 5ad5628163..9fbcd6928c 100644 --- a/src/LedgerMaster.cpp +++ b/src/LedgerMaster.cpp @@ -68,27 +68,17 @@ void LedgerMaster::storeLedger(Ledger::pointer ledger) mLedgerHistory.addLedger(ledger); } -void LedgerMaster::beginWobble() -{ +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); mEngine.setDefaultLedger(mCurrentLedger); mEngine.setAlternateLedger(mWobbleLedger); -} - -void LedgerMaster::closeTime() -{ // swap current and wobble ledgers - boost::recursive_mutex::scoped_lock sl(mLock); assert(mCurrentLedger && mWobbleLedger); std::swap(mCurrentLedger, mWobbleLedger); mEngine.setDefaultLedger(mCurrentLedger); mEngine.setAlternateLedger(mWobbleLedger); -} - -Ledger::pointer LedgerMaster::endWobble() -{ - boost::recursive_mutex::scoped_lock sl(mLock); assert(mWobbleLedger && mCurrentLedger); Ledger::pointer ret = mWobbleLedger; mWobbleLedger = Ledger::pointer(); diff --git a/src/LedgerMaster.h b/src/LedgerMaster.h index 4d90275fdc..5c290bc96d 100644 --- a/src/LedgerMaster.h +++ b/src/LedgerMaster.h @@ -56,9 +56,7 @@ public: void switchLedgers(Ledger::pointer lastClosed, Ledger::pointer newCurrent); - void closeTime(); - void beginWobble(); - Ledger::pointer endWobble(); + Ledger::pointer closeLedger(); Ledger::pointer getLedgerBySeq(uint32 index) {