Cleanups.

This commit is contained in:
JoelKatz
2012-10-14 23:03:23 -07:00
parent b326852954
commit de5321e51c

View File

@@ -347,9 +347,11 @@ bool SHAMapTreeNode::updateHash()
{ {
nh = Serializer::getPrefixHash(sHP_TransactionNode, mItem->peekData()); nh = Serializer::getPrefixHash(sHP_TransactionNode, mItem->peekData());
} }
else assert(false); else
assert(false);
if (nh == mHash) return false; if (nh == mHash)
return false;
mHash = nh; mHash = nh;
return true; return true;
} }
@@ -357,10 +359,12 @@ bool SHAMapTreeNode::updateHash()
void SHAMapTreeNode::addRaw(Serializer& s, SHANodeFormat format) void SHAMapTreeNode::addRaw(Serializer& s, SHANodeFormat format)
{ {
assert((format == snfPREFIX) || (format == snfWIRE)); assert((format == snfPREFIX) || (format == snfWIRE));
if (mType == tnERROR) throw std::runtime_error("invalid I node type"); if (mType == tnERROR)
throw std::runtime_error("invalid I node type");
if (mType == tnINNER) if (mType == tnINNER)
{ {
assert(getBranchCount() != 0);
if (format == snfPREFIX) if (format == snfPREFIX)
{ {
s.add32(sHP_InnerNode); s.add32(sHP_InnerNode);