mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-06 17:27:55 +00:00
Cosmetic.
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
//
|
||||
// XXX Should make sure all fields and are recognized on a transactions.
|
||||
// XXX Make sure fee is claimed for failed transactions.
|
||||
// XXX Might uses an unordered set for vector.
|
||||
//
|
||||
|
||||
#include "TransactionEngine.h"
|
||||
@@ -182,7 +183,7 @@ TransactionEngineResult TransactionEngine::dirAdd(
|
||||
|
||||
if (uNodeDir)
|
||||
{
|
||||
// Try adding to non-root.
|
||||
// Try adding to last node.
|
||||
lspRoot = lepNONE;
|
||||
sleNode = mLedger->getDirNode(lspRoot, Ledger::getDirNodeIndex(uRootIndex, uNodeDir));
|
||||
|
||||
@@ -190,7 +191,7 @@ TransactionEngineResult TransactionEngine::dirAdd(
|
||||
}
|
||||
else
|
||||
{
|
||||
// Try adding to root. Didn't have a previous set.
|
||||
// Try adding to root. Didn't have a previous set to the last node.
|
||||
sleNode = sleRoot;
|
||||
}
|
||||
|
||||
@@ -284,7 +285,7 @@ TransactionEngineResult TransactionEngine::dirDelete(
|
||||
{
|
||||
assert(false);
|
||||
|
||||
Log(lsWARNING) << "dirDelete: node not mentioned";
|
||||
Log(lsWARNING) << "dirDelete: no such entry";
|
||||
|
||||
return terBAD_LEDGER;
|
||||
}
|
||||
@@ -316,13 +317,13 @@ TransactionEngineResult TransactionEngine::dirDelete(
|
||||
// Root overflowed.
|
||||
else if (bKeepRoot)
|
||||
{
|
||||
// Not allowed to delete root node, if it ever overflowed.
|
||||
// If root overflowed and not allowed to delete overflowed root node.
|
||||
|
||||
nothing();
|
||||
}
|
||||
else if (uNodePrevious != uNodeNext)
|
||||
{
|
||||
// Have multiple other nodes. Can't delete root node.
|
||||
// Have more than 2 nodes. Can't delete root node.
|
||||
|
||||
nothing();
|
||||
}
|
||||
@@ -343,7 +344,7 @@ TransactionEngineResult TransactionEngine::dirDelete(
|
||||
}
|
||||
else
|
||||
{
|
||||
// Have an entry, can't delete.
|
||||
// Have an entry, can't delete root node.
|
||||
|
||||
nothing();
|
||||
}
|
||||
@@ -362,6 +363,7 @@ TransactionEngineResult TransactionEngine::dirDelete(
|
||||
LedgerStateParms lspNext = lepNONE;
|
||||
SLE::pointer sleNext = mLedger->getDirNode(lspNext, uNodeNext ? Ledger::getDirNodeIndex(uRootIndex, uNodeNext) : uRootIndex);
|
||||
|
||||
assert(slePrevious);
|
||||
assert(sleNext);
|
||||
|
||||
if (!slePrevious)
|
||||
@@ -371,7 +373,6 @@ TransactionEngineResult TransactionEngine::dirDelete(
|
||||
return terBAD_LEDGER;
|
||||
}
|
||||
|
||||
assert(sleNext);
|
||||
if (!sleNext)
|
||||
{
|
||||
Log(lsWARNING) << "dirDelete: next node is missing";
|
||||
@@ -519,7 +520,7 @@ void TransactionEngine::entryDelete(SLE::pointer sleEntry)
|
||||
|
||||
case taaMODIFY:
|
||||
case taaNONE:
|
||||
mEntries[sleEntry] = taaDELETE; // Upgrade
|
||||
mEntries[sleEntry] = taaDELETE; // Upgrade.
|
||||
break;
|
||||
|
||||
case taaDELETE:
|
||||
@@ -541,7 +542,7 @@ void TransactionEngine::entryModify(SLE::pointer sleEntry)
|
||||
break;
|
||||
|
||||
case taaNONE:
|
||||
mEntries[sleEntry] = taaMODIFY; // Upgrade
|
||||
mEntries[sleEntry] = taaMODIFY; // Upgrade.
|
||||
break;
|
||||
|
||||
case taaCREATE:
|
||||
@@ -565,7 +566,7 @@ void TransactionEngine::entryUnfunded(SLE::pointer sleEntry)
|
||||
break;
|
||||
|
||||
case taaNONE:
|
||||
mEntries[sleEntry] = taaUNFUNDED; // Upgrade
|
||||
mEntries[sleEntry] = taaUNFUNDED; // Upgrade.
|
||||
break;
|
||||
|
||||
case taaUNFUNDED:
|
||||
@@ -2234,13 +2235,14 @@ TransactionEngineResult TransactionEngine::doOfferCancel(const SerializedTransac
|
||||
Log(lsWARNING) << "doOfferCancel: uSequence=" << uSequence;
|
||||
|
||||
uint64 uOwnerNode = sleOffer->getIFieldU64(sfOwnerNode);
|
||||
uint64 uBookNode = sleOffer->getIFieldU64(sfBookNode);
|
||||
uint256 uDirectory = sleOffer->getIFieldH256(sfDirectory);
|
||||
|
||||
terResult = dirDelete(true, uOwnerNode, Ledger::getOwnerDirIndex(uSrcAccountID), uLedgerIndex);
|
||||
|
||||
if (terSUCCESS == terResult)
|
||||
{
|
||||
uint256 uDirectory = sleOffer->getIFieldH256(sfDirectory);
|
||||
uint64 uBookNode = sleOffer->getIFieldU64(sfBookNode);
|
||||
|
||||
terResult = dirDelete(false, uBookNode, uDirectory, uLedgerIndex);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user