ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Speedups.

Browse Source
This commit is contained in:
JoelKatz
2013-03-05 09:00:31 -08:00
parent 56d3c49252
commit 86893487d1
4 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cpp/ripple/SHAMap.cpp
View File

@@ -94,13 +94,12 @@ std::stack<SHAMapTreeNode::pointer> SHAMap::getStack(const uint256& id, bool inc
int branch = node->selectBranch(id);
assert(branch >= 0);
uint256 hash = node->getChildHash(branch);
if (hash.isZero())
if (node->isEmptyBranch(branch))
return stack;
try
{
node = getNode(node->getChildNodeID(branch), hash, false);
node = getNode(node->getChildNodeID(branch), node->getChildHash(branch), false);
}
catch (SHAMapMissingNode& mn)
{
@@ -165,14 +164,13 @@ SHAMapTreeNode::pointer SHAMap::walkTo(const uint256& id, bool modify)
while (!inNode->isLeaf())
{
int branch = inNode->selectBranch(id);
uint256 childHash = inNode->getChildHash(branch);
if (childHash.isZero())
if (inNode->isEmptyBranch(branch))
return inNode;
try
{
inNode = getNode(inNode->getChildNodeID(branch), childHash, false);
inNode = getNode(inNode->getChildNodeID(branch), inNode->getChildHash(branch), false);
}
catch (SHAMapMissingNode& mn)
{
@@ -193,10 +191,10 @@ SHAMapTreeNode* SHAMap::walkToPointer(const uint256& id)
while (!inNode->isLeaf())
{
int branch = inNode->selectBranch(id);
const uint256& nextHash = inNode->getChildHash(branch);
if (nextHash.isZero())
if (inNode->isEmptyBranch(branch))
return NULL;
inNode = getNodePointer(inNode->getChildNodeID(branch), nextHash);
inNode = getNodePointer(inNode->getChildNodeID(branch), inNode->getChildHash(branch));
assert(inNode);
}
return (inNode->getTag() == id) ? inNode : NULL;