Properly track the most recently closed ledger. That's the first thing the

network must agree on.
This commit is contained in:
JoelKatz
2012-05-01 02:27:27 -07:00
parent 3df579bbae
commit 77ebac9b5f
2 changed files with 27 additions and 25 deletions

View File

@@ -19,8 +19,8 @@ class LedgerMaster
TransactionEngine mEngine;
Ledger::pointer mCurrentLedger;
Ledger::pointer mFinalizingLedger;
Ledger::pointer mCurrentLedger; // The ledger we are currently processiong
Ledger::pointer mFinalizedLedger; // The ledger that most recently closed
LedgerHistory mLedgerHistory;
@@ -39,7 +39,7 @@ public:
void setSynced() { mIsSynced=true; }
Ledger::pointer getCurrentLedger() { return mCurrentLedger; }
Ledger::pointer getClosingLedger() { return mFinalizingLedger; }
Ledger::pointer getClosedLedger() { return mFinalizedLedger; }
TransactionEngineResult doTransaction(const SerializedTransaction& txn, TransactionEngineParams params)
{ return mEngine.applyTransaction(txn, params); }
@@ -48,15 +48,15 @@ public:
Ledger::pointer getLedgerBySeq(uint32 index)
{
if(mCurrentLedger && (mCurrentLedger->getLedgerSeq()==index)) return mCurrentLedger;
if(mFinalizingLedger && (mFinalizingLedger->getLedgerSeq()==index)) return mFinalizingLedger;
if (mCurrentLedger && (mCurrentLedger->getLedgerSeq()==index)) return mCurrentLedger;
if (mFinalizedLedger && (mFinalizedLedger->getLedgerSeq()==index)) return mFinalizedLedger;
return mLedgerHistory.getLedgerBySeq(index);
}
Ledger::pointer getLedgerByHash(const uint256& hash)
{
if(mCurrentLedger && (mCurrentLedger->getHash()==hash)) return mCurrentLedger;
if(mFinalizingLedger && (mFinalizingLedger->getHash()==hash)) return mFinalizingLedger;
if (mCurrentLedger && (mCurrentLedger->getHash() == hash)) return mCurrentLedger;
if (mFinalizedLedger && (mFinalizedLedger->getHash() == hash)) return mFinalizedLedger;
return mLedgerHistory.getLedgerByHash(hash);
}