From be68458aff5de5ed73ce58168a51eabce5b4f676 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Fri, 5 Jul 2013 03:34:24 -0700
Subject: [PATCH] Some cleanups.

---
 src/cpp/ripple/ripple_SHAMapSync.cpp     | 16 +++-------------
 src/cpp/ripple/ripple_SHAMapTreeNode.cpp |  4 +---
 src/cpp/ripple/ripple_SHAMapTreeNode.h   |  2 +-
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/cpp/ripple/ripple_SHAMapSync.cpp b/src/cpp/ripple/ripple_SHAMapSync.cpp
index a2eebd5f6..2c5621ce2 100644
--- a/src/cpp/ripple/ripple_SHAMapSync.cpp
+++ b/src/cpp/ripple/ripple_SHAMapSync.cpp
@@ -56,7 +56,7 @@ void SHAMap::getMissingNodes (std::vector<SHAMapNode>& nodeIDs, std::vector<uint
 
                     if (!d)
                     {
-                        // node is not in the map
+                        // node is not in the database
                         nodeIDs.push_back (childID);
                         hashes.push_back (childHash);
 
@@ -77,12 +77,7 @@ void SHAMap::getMissingNodes (std::vector<SHAMapNode>& nodeIDs, std::vector<uint
         if (have_all)
         {
             node->setFullBelow ();
-
-            if (mType == smtSTATE)
-            {
-                fullBelowCache.add (node->getNodeHash ());
-                dropBelow (node);
-            }
+            fullBelowCache.add (node->getNodeHash ());
         }
     }
 
@@ -148,12 +143,7 @@ std::vector<uint256> SHAMap::getNeededHashes (int max, SHAMapSyncFilter* filter)
         if (have_all)
         {
             node->setFullBelow ();
-
-            if (mType == smtSTATE)
-            {
-                fullBelowCache.add (node->getNodeHash ());
-                dropBelow (node);
-            }
+            fullBelowCache.add (node->getNodeHash ());
         }
     }
 
diff --git a/src/cpp/ripple/ripple_SHAMapTreeNode.cpp b/src/cpp/ripple/ripple_SHAMapTreeNode.cpp
index 3ff484020..0a7d16dcf 100644
--- a/src/cpp/ripple/ripple_SHAMapTreeNode.cpp
+++ b/src/cpp/ripple/ripple_SHAMapTreeNode.cpp
@@ -356,12 +356,10 @@ void SHAMapTreeNode::addRaw (Serializer& s, SHANodeFormat format)
 
 bool SHAMapTreeNode::setItem (SHAMapItem::ref i, TNType type)
 {
-    uint256 hash = getNodeHash ();
     mType = type;
     mItem = i;
     assert (isLeaf ());
-    updateHash ();
-    return getNodeHash () != hash;
+    return updateHash ();
 }
 
 SHAMapItem::pointer SHAMapTreeNode::getItem () const
diff --git a/src/cpp/ripple/ripple_SHAMapTreeNode.h b/src/cpp/ripple/ripple_SHAMapTreeNode.h
index 44705dd49..bc653adef 100644
--- a/src/cpp/ripple/ripple_SHAMapTreeNode.h
+++ b/src/cpp/ripple/ripple_SHAMapTreeNode.h
@@ -122,7 +122,7 @@ public:
         return !!mItem;
     }
     SHAMapItem::ref peekItem ()
-    {
+    { // CAUTION: Do not modify the item
         return mItem;
     }
     SHAMapItem::pointer getItem () const;