ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 19:15:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes. isChildLeaf had wrong test. peekNextItem walked the wrong way.

Browse Source
This commit is contained in:
JoelKatz
2011-11-25 17:10:42 -08:00
parent 9eb8188627
commit d176e9d2c7
3 changed files with 20 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SHAMapNodes.cpp
View File

@@ -68,13 +68,13 @@ void SHAMapNode::ClassInit()
uint256 SHAMapNode::getNodeID(int depth, const uint256& hash)
{
assert(depth>=0 && depth<=leafDepth);
return hash & smMasks[depth];
uint256 ret = hash & smMasks[depth];
return ret;
}
SHAMapNode::SHAMapNode(int depth, const uint256 &hash)
SHAMapNode::SHAMapNode(int depth, const uint256 &hash) : mDepth(depth)
{ // canonicalize the hash to a node ID for this depth
assert(depth>=0 && depth<=leafDepth);
mDepth = depth;
mNodeID = getNodeID(depth, hash);
}
@@ -83,13 +83,10 @@ SHAMapNode SHAMapNode::getChildNodeID(int m)
assert(!isLeaf());
uint256 branch=m;
branch<<=248-(mDepth*8);
branch<<=mDepth*8;
#ifdef DEBUG
std::cerr << "m=" << m << ", branch=" << branch.GetHex() << std::endl;
#endif
return SHAMapNode(mDepth+1, mNodeID | branch);
SHAMapNode ret(mDepth+1, mNodeID | branch);
return ret;
}
int SHAMapNode::selectBranch(const uint256 &hash)
@@ -101,7 +98,6 @@ int SHAMapNode::selectBranch(const uint256 &hash)
uint256 selector=hash&smMasks[mDepth+1];
int branch=*(selector.begin()+mDepth);
assert(branch>=0 && branch<32);
return branch;
}