[FOLD] Address feedback

src/ripple/core/impl/Stoppable.cpp

@@ -45,12 +45,9 @@ Stoppable::~Stoppable ()
 
 void Stoppable::setParent (Stoppable& parent)
 {
-    if (hasParent_ ||
-        parent.isStopping() ||
-        std::addressof(m_root) != std::addressof(parent.m_root))
-    {
-        LogicError("Invalid parent");
-    }
+    assert(!hasParent_);
+    assert(!parent.isStopping());
+    assert(std::addressof(m_root) == std::addressof(parent.m_root));
 
     parent.m_children.push_front(&m_child);
     hasParent_ = true;

src/ripple/nodestore/impl/DatabaseShardImp.cpp

@@ -122,20 +122,25 @@ DatabaseShardImp::init()
     else
         boost::filesystem::create_directories(dir_);
 
-    if (!get_if_exists<std::uint64_t>(section, "max_size_gb", maxDiskSpace_))
-        return fail("'max_size_gb' missing");
-
-    if (maxDiskSpace_ < minDiskSpace_)
     {
-        return fail("'max_size_gb' must be at least " +
-            std::to_string(minDiskSpace_));
-    }
+        std::uint64_t i;
+        if (!get_if_exists<std::uint64_t>(section, "max_size_gb", i))
+            return fail("'max_size_gb' missing");
+
+        // Minimum disk space required (in gigabytes)
+        static constexpr auto minDiskSpace = 10;
+        if (i < minDiskSpace)
+        {
+            return fail("'max_size_gb' must be at least " +
+                std::to_string(minDiskSpace));
+        }
 
-    if ((maxDiskSpace_ << 30) < maxDiskSpace_)
-        return fail("'max_size_gb' overflow");
+        if ((i << 30) < i)
+            return fail("'max_size_gb' overflow");
 
-    // Convert to bytes
-    maxDiskSpace_ <<= 30;
+        // Convert to bytes
+        maxDiskSpace_ = i << 30;
+    }
 
     if (section.exists("ledgers_per_shard"))
     {

src/ripple/nodestore/impl/DatabaseShardImp.h

@@ -218,9 +218,6 @@ class DatabaseShardImp : public DatabaseShard
     // File name used to mark shards being imported from node store
     static constexpr auto importMarker_ = "import";
 
-    // Minimum disk space required
-    static constexpr auto minDiskSpace_ = 10;
-
     std::shared_ptr<NodeObject>
     fetchFrom(uint256 const& hash, std::uint32_t seq) override;