ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove wobble logic from the ledger master code.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

17
src/LedgerMaster.cpp
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,

4
src/LedgerMaster.h
View File

@@ -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; }