sync with develop

src/xrpld/shamap/detail/SHAMap.cpp

@@ -115,7 +115,7 @@ SHAMap::dirtyUp(
             intr_ptr::dynamic_pointer_cast<SHAMapInnerNode>(stack.top().first);
         SHAMapNodeID nodeID = stack.top().second;
         stack.pop();
-        assert(node);
+        ASSERT(node != nullptr, "ripple::SHAMap::dirtyUp : non-null node");
 
         int branch = selectBranch(nodeID, target);
         ASSERT(branch >= 0, "ripple::SHAMap::dirtyUp : valid branch");
@@ -442,8 +442,10 @@ SHAMap::unshareNode(intr_ptr::SharedPtr<Node> node, SHAMapNodeID const& nodeID)
     if (node->cowid() != cowid_)
     {
         // have a CoW
-        assert(state_ != SHAMapState::Immutable);
-        node = intr_ptr::static_pointer_cast<Node>(node->clone(cowid_));
+        ASSERT(
+            state_ != SHAMapState::Immutable,
+            "ripple::SHAMap::unshareNode : not immutable");
+        node = std::static_pointer_cast<Node>(node->clone(cowid_));
         if (nodeID.isRoot())
             root_ = node;
     }
@@ -474,8 +476,10 @@ SHAMap::belowHelper(
     {
         if (!inner->isEmptyBranch(i))
         {
-            node = descendThrow(*inner, i);
-            assert(!stack.empty());
+            node = descendThrow(inner, i);
+            ASSERT(
+                !stack.empty(),
+                "ripple::SHAMap::belowHelper : non-empty stack");
             if (node->isLeaf())
             {
                 auto n = intr_ptr::static_pointer_cast<SHAMapLeafNode>(node);
@@ -581,8 +585,10 @@ SHAMap::peekNextItem(uint256 const& id, SharedPtrNodeStack& stack) const
     while (!stack.empty())
     {
         auto [node, nodeID] = stack.top();
-        assert(!node->isLeaf());
-        auto inner = intr_ptr::static_pointer_cast<SHAMapInnerNode>(node);
+        ASSERT(
+            !node->isLeaf(),
+            "ripple::SHAMap::peekNextItem : another node is not leaf");
+        auto inner = std::static_pointer_cast<SHAMapInnerNode>(node);
         for (auto i = selectBranch(nodeID, id) + 1; i < branchFactor; ++i)
         {
             if (!inner->isEmptyBranch(i))
@@ -1234,8 +1240,9 @@ SHAMap::invariants() const
 {
     (void)getHash();  // update node hashes
     auto node = root_.get();
-    assert(node);
-    assert(!node->isLeaf());
+    ASSERT(node != nullptr, "ripple::SHAMap::invariants : non-null root node");
+    ASSERT(
+        !node->isLeaf(), "ripple::SHAMap::invariants : root node is not leaf");
     SharedPtrNodeStack stack;
     for (auto leaf = peekFirstItem(stack); leaf != nullptr;
          leaf = peekNextItem(leaf->peekItem()->key(), stack))

src/xrpld/shamap/detail/SHAMapInnerNode.cpp

@@ -445,9 +445,11 @@ SHAMapInnerNode::invariants(bool is_root) const
         auto const branchCount = getBranchCount();
         for (int i = 0; i < branchCount; ++i)
         {
-            assert(hashes[i].isNonZero());
-            if (auto p = children[i].get())
-                p->invariants();
+            ASSERT(
+                hashes[i].isNonZero(),
+                "ripple::SHAMapInnerNode::invariants : nonzero hash in branch");
+            if (children[i] != nullptr)
+                children[i]->invariants();
             ++count;
         }
     }
@@ -457,9 +459,12 @@ SHAMapInnerNode::invariants(bool is_root) const
         {
             if (hashes[i].isNonZero())
             {
-                assert((isBranch_ & (1 << i)) != 0);
-                if (auto p = children[i].get())
-                    p->invariants();
+                ASSERT(
+                    (isBranch_ & (1 << i)) != 0,
+                    "ripple::SHAMapInnerNode::invariants : valid branch when "
+                    "nonzero hash");
+                if (children[i] != nullptr)
+                    children[i]->invariants();
                 ++count;
             }
             else