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

Better debug and a data corruption bugfix.

Browse Source
This commit is contained in:
JoelKatz
2012-10-16 13:56:37 -07:00
parent d9262e5cdb
commit cab69318b1
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/SHAMapNodes.cpp
View File

@@ -300,7 +300,7 @@ SHAMapTreeNode::SHAMapTreeNode(const SHAMapNode& id, const std::vector<unsigned
mType = tnINNER; mType = tnINNER;
} }
else if (prefix == sHP_TransactionNode) else if (prefix == sHP_TransactionNode)
{ { // transaction with metadata
if (s.getLength() < 32) if (s.getLength() < 32)
throw std::runtime_error("short TXN node"); throw std::runtime_error("short TXN node");
uint256 txID; uint256 txID;
@@ -335,18 +335,18 @@ bool SHAMapTreeNode::updateHash()
if(!empty) if(!empty)
nh = Serializer::getPrefixHash(sHP_InnerNode, reinterpret_cast<unsigned char *>(mHashes), sizeof(mHashes)); nh = Serializer::getPrefixHash(sHP_InnerNode, reinterpret_cast<unsigned char *>(mHashes), sizeof(mHashes));
} }
else if (mType == tnACCOUNT_STATE)
{
Serializer s((256 + 32) / 8 + mItem->peekData().size());
s.add32(sHP_LeafNode);
mItem->addRaw(s);
s.add256(mItem->getTag());
nh = s.getSHA512Half();
}
else if (mType == tnTRANSACTION_NM) else if (mType == tnTRANSACTION_NM)
{ {
nh = Serializer::getPrefixHash(sHP_TransactionID, mItem->peekData()); nh = Serializer::getPrefixHash(sHP_TransactionID, mItem->peekData());
} }
else if (mType == tnACCOUNT_STATE)
{
Serializer s(mItem->peekSerializer().getDataLength() + (256 + 32) / 8);
s.add32(sHP_LeafNode);
s.addRaw(mItem->peekData());
s.add256(mItem->getTag());
nh = s.getSHA512Half();
}
else if (mType == tnTRANSACTION_MD) else if (mType == tnTRANSACTION_MD)
{ {
Serializer s(mItem->peekSerializer().getDataLength() + (256 + 32) / 8); Serializer s(mItem->peekSerializer().getDataLength() + (256 + 32) / 8);
@@ -433,6 +433,7 @@ void SHAMapTreeNode::addRaw(Serializer& s, SHANodeFormat format)
{ {
s.add32(sHP_TransactionNode); s.add32(sHP_TransactionNode);
mItem->addRaw(s); mItem->addRaw(s);
s.add256(mItem->getTag());
} }
else else
{ {
@@ -511,11 +512,21 @@ std::string SHAMapTreeNode::getString() const
} }
if (isLeaf()) if (isLeaf())
{ {
ret += ",leaf\n"; if (mType == tnTRANSACTION_NM)
ret += ",txn\n";
else if (mType == tnTRANSACTION_MD)
ret += ",txn+md\n";
else if (mType == tnACCOUNT_STATE)
ret += ",as\n";
else
ret += ",leaf\n";
ret += " Tag="; ret += " Tag=";
ret += getTag().GetHex(); ret += getTag().GetHex();
ret += "\n Hash="; ret += "\n Hash=";
ret += mHash.GetHex(); ret += mHash.GetHex();
ret += "/";
ret += lexical_cast_i(mItem->peekSerializer().getDataLength());
} }
return ret; return ret;
} }