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

Some cleanups.

Browse Source
This commit is contained in:
JoelKatz
2012-11-25 08:54:23 -08:00
parent 553d55b5db
commit 73ad63849c
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpp/ripple/LedgerEntrySet.cpp
View File

@@ -328,8 +328,8 @@ bool LedgerEntrySet::threadTx(SLE::ref threadTo, Ledger::ref ledger,
if (!threadTo->thread(mSet.getTxID(), mSet.getLgrSeq(), prevTxID, prevLgrID))
return false;
if (prevTxID.isZero() || TransactionMetaSet::thread(mSet.getAffectedNode(threadTo->getIndex(), sfModifiedNode),
prevTxID, prevLgrID))
if (prevTxID.isZero() ||
TransactionMetaSet::thread(mSet.getAffectedNode(threadTo, sfModifiedNode), prevTxID, prevLgrID))
return true;
assert(false);
@@ -408,8 +408,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result)
if (type == &sfDeletedNode)
{
assert(origNode);
assert(curNode);
assert(origNode && curNode);
threadOwners(origNode, mLedger, newMod); // thread transaction to owners
STObject prevs(sfPreviousFields);
@@ -432,6 +431,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result)
}
else if (type == &sfModifiedNode)
{
assert(curNode && origNode);
if (curNode->isThreadedType()) // thread transaction to node it modified
threadTx(curNode, mLedger, newMod);
@@ -455,7 +455,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result)
}
else if (type == &sfCreatedNode) // if created, thread to owner(s)
{
assert(!origNode);
assert(curNode && !origNode);
threadOwners(curNode, mLedger, newMod);
if (curNode->isThreadedType()) // always thread to self
@@ -470,6 +470,7 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, TER result)
if (!news.empty())
mSet.getAffectedNode(it.first).addObject(news);
}
else assert(false);
}
// add any new modified nodes to the modification set

8
src/cpp/ripple/TransactionMeta.cpp
View File

@@ -79,12 +79,13 @@ std::vector<RippleAddress> TransactionMetaSet::getAffectedAccounts()
}
*/
STObject& TransactionMetaSet::getAffectedNode(const uint256& node, SField::ref type)
STObject& TransactionMetaSet::getAffectedNode(SLE::ref node, SField::ref type)
{
assert(&type);
uint256 index = node->getIndex();
BOOST_FOREACH(STObject& it, mNodes)
{
if (it.getFieldH256(sfLedgerIndex) == node)
if (it.getFieldH256(sfLedgerIndex) == index)
return it;
}
@@ -92,7 +93,8 @@ STObject& TransactionMetaSet::getAffectedNode(const uint256& node, SField::ref t
STObject& obj = mNodes.back();
assert(obj.getFName() == type);
obj.setFieldH256(sfLedgerIndex, node);
obj.setFieldH256(sfLedgerIndex, index);
obj.setFieldU16(sfLedgerEntryType, node->getFieldU16(sfLedgerEntryType));
return obj;
}

3
src/cpp/ripple/TransactionMeta.h
View File

@@ -12,6 +12,7 @@
#include "Serializer.h"
#include "SerializedTypes.h"
#include "SerializedObject.h"
#include "SerializedLedger.h"
#include "TransactionErr.h"
class TransactionMetaSet
@@ -42,7 +43,7 @@ public:
bool isNodeAffected(const uint256&) const;
void setAffectedNode(const uint256&, SField::ref type, uint16 nodeType);
STObject& getAffectedNode(const uint256&, SField::ref type);
STObject& getAffectedNode(SLE::ref node, SField::ref type); // create if needed
STObject& getAffectedNode(const uint256&);
const STObject& peekAffectedNode(const uint256&) const;
//std::vector<RippleAddress> getAffectedAccounts();