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

Simplifications made possible by CLC

Browse Source
This commit is contained in:
JoelKatz
2012-07-16 13:30:51 -07:00
parent e39c73d704
commit 659bb5af63
3 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/LedgerMaster.cpp
View File

@@ -73,14 +73,14 @@ Ledger::pointer LedgerMaster::closeLedger()
boost::recursive_mutex::scoped_lock sl(mLock);
Ledger::pointer closingLedger = mCurrentLedger;
mCurrentLedger = boost::make_shared<Ledger>(boost::ref(*closingLedger), true);
mEngine.setDefaultLedger(mCurrentLedger);
mEngine.setLedger(mCurrentLedger);
return closingLedger;
}
TransactionEngineResult LedgerMaster::doTransaction(const SerializedTransaction& txn, uint32 targetLedger,
TransactionEngineParams params)
{
Ledger::pointer ledger = mEngine.getTransactionLedger(targetLedger);
Ledger::pointer ledger = mEngine.getLedger();
TransactionEngineResult result = mEngine.applyTransaction(txn, params, ledger);
theApp->getOPs().pubTransaction(ledger, txn, result);
return result;

14
src/TransactionEngine.cpp
View File

@@ -479,18 +479,6 @@ TransactionEngineResult TransactionEngine::setAuthorized(const SerializedTransac
return terSUCCESS;
}
Ledger::pointer TransactionEngine::getTransactionLedger(uint32 targetLedger)
{
Ledger::pointer ledger = mDefaultLedger;
if (mAlternateLedger && (targetLedger != 0) &&
(targetLedger != mLedger->getLedgerSeq()) && (targetLedger == mAlternateLedger->getLedgerSeq()))
{
Log(lsINFO) << "Transaction goes into wobble ledger";
ledger = mAlternateLedger;
}
return ledger;
}
bool TransactionEngine::entryExists(SLE::pointer sleEntry)
{
return mEntries.find(sleEntry) != mEntries.end();
@@ -576,7 +564,7 @@ void TransactionEngine::entryUnfunded(SLE::pointer sleEntry)
TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTransaction& txn,
TransactionEngineParams params, uint32 targetLedger)
{
return applyTransaction(txn, params, getTransactionLedger(targetLedger));
return applyTransaction(txn, params, mLedger);
}
TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTransaction& txn,

12
src/TransactionEngine.h
View File

@@ -154,7 +154,6 @@ private:
STAmount& saTakerGot);
protected:
Ledger::pointer mDefaultLedger, mAlternateLedger;
Ledger::pointer mLedger;
uint64 mLedgerParentCloseTime;
@@ -188,16 +187,11 @@ protected:
public:
TransactionEngine() { ; }
TransactionEngine(Ledger::pointer ledger) : mDefaultLedger(ledger) { ; }
TransactionEngine(Ledger::pointer ledger) : mLedger(ledger) { ; }
Ledger::pointer getDefaultLedger() { return mDefaultLedger; }
void setDefaultLedger(Ledger::pointer ledger) { mDefaultLedger = ledger; }
Ledger::pointer getAlternateLedger() { return mAlternateLedger; }
void setAlternateLedger(Ledger::pointer ledger) { mAlternateLedger = ledger; }
void setLedger(Ledger::pointer ledger) { mDefaultLedger = ledger;
mAlternateLedger = Ledger::pointer(); }
Ledger::pointer getLedger() { return mLedger; }
void setLedger(Ledger::pointer ledger) { mLedger = ledger; }
Ledger::pointer getTransactionLedger(uint32 targetLedger);
TransactionEngineResult applyTransaction(const SerializedTransaction&, TransactionEngineParams,
Ledger::pointer ledger);
TransactionEngineResult applyTransaction(const SerializedTransaction&, TransactionEngineParams,