ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 14:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the transaction engine report whether it added the transaction.

Browse Source
This commit is contained in:
JoelKatz
2012-12-23 17:42:04 -08:00
parent adb9561c2c
commit 2c535940ac
4 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/cpp/ripple/LedgerConsensus.cpp
View File

@@ -1090,14 +1090,15 @@ void LedgerConsensus::playbackProposals()
void LedgerConsensus::applyTransaction(TransactionEngine& engine, SerializedTransaction::ref txn,
Ledger::ref ledger, CanonicalTXSet& failedTransactions, bool openLedger)
{
{ // FIXME: Needs to handle partial success
TransactionEngineParams parms = openLedger ? tapOPEN_LEDGER : tapNONE;
#ifndef TRUST_NETWORK
try
{
#endif
TER result = engine.applyTransaction(*txn, parms);
if (isTerRetry(result))
bool didApply;
TER result = engine.applyTransaction(*txn, parms, didApply);
if (!didApply && !isTefFailure(result) && !isTemMalformed(result))
{
cLog(lsINFO) << " retry";
assert(!ledger->hasTransaction(txn->getTransactionID()));
@@ -1108,12 +1109,6 @@ void LedgerConsensus::applyTransaction(TransactionEngine& engine, SerializedTran
cLog(lsTRACE) << " success";
assert(ledger->hasTransaction(txn->getTransactionID()));
}
else if (isTemMalformed(result) || isTefFailure(result))
{
cLog(lsINFO) << " hard fail";
}
else
assert(false);
#ifndef TRUST_NETWORK
}
catch (...)
@@ -1160,14 +1155,24 @@ void LedgerConsensus::applyTransactions(SHAMap::ref set, Ledger::ref applyLedger
{
try
{
TER result = engine.applyTransaction(*it->second, parms);
if (result <= 0)
{
if (result == 0) ++successes;
bool didApply;
TER result = engine.applyTransaction(*it->second, parms, didApply);
if (isTelLocal(result))
{ // should never happen
assert(false);
it = failedTransactions.erase(it);
}
else if (didApply)
{ // transaction was applied, remove from set
++successes;
it = failedTransactions.erase(it);
}
else if (isTefFailure(result) || isTemMalformed(result))
{ // transaction cannot apply. tef is expected, tem should never happen
it = failedTransactions.erase(it);
}
else
{
{ // try again
++it;
}
}

9
src/cpp/ripple/LedgerMaster.cpp
View File

@@ -91,8 +91,9 @@ Ledger::pointer LedgerMaster::closeLedger(bool recover)
{
try
{
TER result = mEngine.applyTransaction(*it->second, tapOPEN_LEDGER);
if (isTepSuccess(result))
bool didApply;
mEngine.applyTransaction(*it->second, tapOPEN_LEDGER, didApply);
if (didApply)
++recovers;
}
catch (...)
@@ -112,7 +113,9 @@ Ledger::pointer LedgerMaster::closeLedger(bool recover)
TER LedgerMaster::doTransaction(const SerializedTransaction& txn, TransactionEngineParams params)
{
TER result = mEngine.applyTransaction(txn, params);
bool didApply;
TER result = mEngine.applyTransaction(txn, params, didApply);
// CHECKME: Should we call this even on gross failures?
theApp->getOPs().pubProposedTransaction(mEngine.getLedger(), txn, result);
return result;
}

17
src/cpp/ripple/TransactionEngine.cpp
View File

@@ -67,9 +67,11 @@ void TransactionEngine::txnWrite()
}
}
TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, TransactionEngineParams params)
TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, TransactionEngineParams params,
bool& didApply)
{
cLog(lsTRACE) << "applyTransaction>";
didApply = false;
assert(mLedger);
mNodes.init(mLedger, txn.getTransactionID(), mLedger->getLedgerSeq());
@@ -110,12 +112,10 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
cLog(lsINFO) << "applyTransaction: terResult=" << strToken << " : " << terResult << " : " << strHuman;
bool applyTransaction = false;
if (terResult == tesSUCCESS)
applyTransaction = true;
didApply = true;
else if (isTepPartial(terResult) && !isSetBit(params, tapRETRY))
applyTransaction = true;
didApply = true;
else if (isTecClaim(terResult) && !isSetBit(params, tapRETRY))
{ // only claim the transaction fee
mNodes.clear();
@@ -146,14 +146,14 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
{
txnAcct->setFieldAmount(sfBalance, balance - fee);
txnAcct->setFieldU32(sfSequence, t_seq + 1);
applyTransaction = true;
didApply = true;
entryModify(txnAcct);
}
}
}
}
if (applyTransaction)
if (didApply)
{
// Transaction succeeded fully or (retries are not allowed and the transaction succeeded partially).
Serializer m;
@@ -183,8 +183,7 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
mTxnAccount.reset();
mNodes.clear();
if (!isSetBit(params, tapOPEN_LEDGER)
&& (isTemMalformed(terResult) || isTefFailure(terResult)))
if (!isSetBit(params, tapOPEN_LEDGER) && isTemMalformed(terResult))
{
// XXX Malformed or failed transaction in closed ledger must bow out.
}

2
src/cpp/ripple/TransactionEngine.h
View File

@@ -78,7 +78,7 @@ public:
void entryDelete(SLE::ref sleEntry) { mNodes.entryDelete(sleEntry); }
void entryModify(SLE::ref sleEntry) { mNodes.entryModify(sleEntry); }
TER applyTransaction(const SerializedTransaction&, TransactionEngineParams);
TER applyTransaction(const SerializedTransaction&, TransactionEngineParams, bool& didApply);
};
inline TransactionEngineParams operator|(const TransactionEngineParams& l1, const TransactionEngineParams& l2)