Remove wobble logic from the ledger master code.

This commit is contained in:
JoelKatz
2012-07-16 13:25:52 -07:00
parent 40e0dba6b6
commit e39c73d704
2 changed files with 4 additions and 17 deletions

View File

@@ -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<Ledger>(boost::ref(*mCurrentLedger), true);
Ledger::pointer closingLedger = mCurrentLedger;
mCurrentLedger = boost::make_shared<Ledger>(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,