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

Remove SHAMapNodeID from SHAMapTreeNode (RIPD-347)

Browse Source 
This resolves the "right data, wrong ID" issue in the
tree node cache.
This commit is contained in:
David Schwartz
2014-07-16 16:58:46 -07:00
parent f1bb0afc4e
commit 07db5d497c
6 changed files with 41 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ripple/module/app/shamap/SHAMapSync.cpp
View File

@@ -353,14 +353,14 @@ SHAMapAddNode SHAMap::addRootNode (Blob const& rootNode, SHANodeFormat format,
assert (mSeq >= 1);
SHAMapTreeNode::pointer node =
std::make_shared<SHAMapTreeNode> (SHAMapNodeID (), rootNode, mSeq - 1,
std::make_shared<SHAMapTreeNode> (rootNode, mSeq - 1,
format, uZero, false);
if (!node)
return SHAMapAddNode::invalid ();
#ifdef BEAST_DEBUG
node->dump ();
node->dump (SHAMapNodeID ());
#endif
root = node;
@@ -395,7 +395,7 @@ SHAMapAddNode SHAMap::addRootNode (uint256 const& hash, Blob const& rootNode, SH
assert (mSeq >= 1);
SHAMapTreeNode::pointer node =
std::make_shared<SHAMapTreeNode> (SHAMapNodeID (), rootNode, mSeq - 1,
std::make_shared<SHAMapTreeNode> (rootNode, mSeq - 1,
format, uZero, false);
if (!node || node->getNodeHash () != hash)
@@ -477,7 +477,7 @@ SHAMap::addKnownNode (const SHAMapNodeID& node, Blob const& rawNode,
}
SHAMapTreeNode::pointer newNode =
std::make_shared<SHAMapTreeNode> (node, rawNode, 0, snfWIRE,
std::make_shared<SHAMapTreeNode> (rawNode, 0, snfWIRE,
uZero, false);
if (childHash != newNode->getNodeHash ())
@@ -488,7 +488,7 @@ SHAMap::addKnownNode (const SHAMapNodeID& node, Blob const& rawNode,
canonicalize (childHash, newNode);
if (!iNode->isInBounds ())
if (!iNode->isInBounds (iNodeID))
{
// Map is provably invalid
mState = smsInvalid;