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

Some transaction metadata fixes.

Browse Source
This commit is contained in:
JoelKatz
2012-07-30 00:29:42 -07:00
parent 1167ba2cc0
commit a01909fa4b
2 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/TransactionMeta.cpp
View File

@@ -134,6 +134,14 @@ void TransactionMetaNode::addRaw(Serializer& s) const
s.add8(TransactionMetaNodeEntry::TMNEndOfMetadata);
}
void TransactionMetaNode::thread(const uint256& prevTx, uint32 prevLgr)
{
assert((mPreviousLedger == 0) || (mPreviousLedger == prevLgr));
assert(mPreviousTransaction.isZero() || (mPreviousTransaction == prevTx));
mPreviousTransaction = prevTx;
mPreviousLedger = prevLgr;
}
Json::Value TransactionMetaNode::getJson(int v) const
{
Json::Value ret = Json::objectValue;
@@ -162,16 +170,16 @@ TransactionMetaSet::TransactionMetaSet(uint32 ledger, const std::vector<unsigned
uint256 node = sit.get256();
if (node.isZero())
break;
mNodes.insert(TransactionMetaNode(node, sit));
mNodes.insert(std::make_pair(node, TransactionMetaNode(node, sit)));
} while(1);
}
void TransactionMetaSet::addRaw(Serializer& s) const
{
s.add256(mTransactionID);
for (std::set<TransactionMetaNode>::const_iterator it = mNodes.begin(), end = mNodes.end();
for (std::map<uint256, TransactionMetaNode>::const_iterator it = mNodes.begin(), end = mNodes.end();
it != end; ++it)
it->addRaw(s);
it->second.addRaw(s);
s.add256(uint256());
}
@@ -183,9 +191,9 @@ Json::Value TransactionMetaSet::getJson(int v) const
ret["ledger"] = mLedger;
Json::Value e = Json::arrayValue;
for (std::set<TransactionMetaNode>::const_iterator it = mNodes.begin(), end = mNodes.end();
for (std::map<uint256, TransactionMetaNode>::const_iterator it = mNodes.begin(), end = mNodes.end();
it != end; ++it)
e.append(it->getJson(v));
e.append(it->second.getJson(v));
ret["nodes_affected"] = e;
return ret;
@@ -193,28 +201,14 @@ Json::Value TransactionMetaSet::getJson(int v) const
bool TransactionMetaSet::isNodeAffected(const uint256& node) const
{
for (std::set<TransactionMetaNode>::const_iterator it = mNodes.begin(), end = mNodes.end();
it != end; ++it)
if (it->getNode() == node)
return true;
return false;
}
TransactionMetaNode TransactionMetaSet::getAffectedNode(const uint256& node)
{
for (std::set<TransactionMetaNode>::const_iterator it = mNodes.begin(), end = mNodes.end();
it != end; ++it)
if (it->getNode() == node)
return *it;
return TransactionMetaNode(uint256());
return mNodes.find(node) != mNodes.end();
}
const TransactionMetaNode& TransactionMetaSet::peekAffectedNode(const uint256& node) const
{
for (std::set<TransactionMetaNode>::const_iterator it = mNodes.begin(), end = mNodes.end();
it != end; ++it)
if (it->getNode() == node)
return *it;
std::map<uint256, TransactionMetaNode>::const_iterator it = mNodes.find(node);
if (it != mNodes.end())
return it->second;
throw std::runtime_error("Affected node not found");
}
@@ -231,6 +225,19 @@ void TransactionMetaSet::swap(TransactionMetaSet& s)
mNodes.swap(s.mNodes);
}
TransactionMetaNode& TransactionMetaSet::modifyNode(const uint256& node)
{
std::map<uint256, TransactionMetaNode>::iterator it = mNodes.find(node);
if (it != mNodes.end())
return it->second;
return mNodes.insert(std::make_pair(node, TransactionMetaNode(node))).first->second;
}
void TransactionMetaSet::threadNode(const uint256& node, const uint256& prevTx, uint32 prevLgr)
{
modifyNode(node).thread(prevTx, prevLgr);
}
bool TransactionMetaSet::deleteUnfunded(const uint256& node, const STAmount& firstBalance, const STAmount &secondBalance)
{
// WRITEME

7
src/TransactionMeta.h
View File

@@ -106,6 +106,8 @@ public:
bool operator>(const TransactionMetaNode& n) const { return mNode > n.mNode; }
bool operator>=(const TransactionMetaNode& n) const { return mNode >= n.mNode; }
void thread(const uint256& prevTx, uint32 prevLgr);
TransactionMetaNode(const uint256&node, SerializerIterator&);
void addRaw(Serializer&) const;
Json::Value getJson(int) const;
@@ -116,7 +118,9 @@ class TransactionMetaSet
protected:
uint256 mTransactionID;
uint32 mLedger;
std::set<TransactionMetaNode> mNodes;
std::map<uint256, TransactionMetaNode> mNodes;
TransactionMetaNode& modifyNode(const uint256&);
public:
TransactionMetaSet() : mLedger(0) { ; }
@@ -128,7 +132,6 @@ public:
void swap(TransactionMetaSet&);
bool isNodeAffected(const uint256&) const;
TransactionMetaNode getAffectedNode(const uint256&);
const TransactionMetaNode& peekAffectedNode(const uint256&) const;
Json::Value getJson(int) const;