[FOLD] Address undertome's feedback

XRPLF · Feb 14, 2020 · d56bab8 · d56bab8
1 parent 37d1a62
commit d56bab8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp
@@ -142,7 +142,7 @@ void printHelp (const po::options_description& desc)
            "     connect <ip> [<port>]\n"
            "     consensus_info\n"
            "     deposit_authorized <source_account> <destination_account> [<ledger>]\n"
-           "     download_shard [[<index> <url>]] <validate>\n"
+           "     download_shard [[<index> <url>]]\n"
            "     feature [<feature> [accept|reject]]\n"
            "     fetch_info [clear]\n"
            "     gateway_balances [<ledger>] <issuer_account> [ <hotwallet> [ <hotwallet> ]]\n"

diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp
@@ -171,7 +171,7 @@ class RPCParser
                 ++i;
             else if (!boost::iequals(jvParams[--sz].asString(), "novalidate"))
                 return rpcError(rpcINVALID_PARAMS);
-            jvResult[jss::validate] = false;
+//            jvResult[jss::validate] = false;
         }
 
         // Create the 'shards' array

diff --git a/src/ripple/nodestore/impl/DatabaseShardImp.cpp b/src/ripple/nodestore/impl/DatabaseShardImp.cpp
@@ -88,8 +88,6 @@ DatabaseShardImp::init()
 
         Config const& config {app_.config()};
         Section const& section {config.section(ConfigSection::shardDatabase())};
-        if (section.empty())
-            return fail("missing configuration");
 
         {
             // Node and shard stores must use same earliest ledger sequence
@@ -1273,20 +1271,22 @@ DatabaseShardImp::setFileStats()
 
     std::uint64_t sumSz {0};
     std::uint32_t sumFd {0};
+    std::uint32_t numShards {0};
     for (auto const& wptr : wptrShards)
     {
         if (auto shard {wptr.lock()}; shard)
         {
             auto[sz, fd] = shard->fileInfo();
             sumSz += sz;
             sumFd += fd;
+            ++numShards;
         }
     }
 
     std::lock_guard lock(mutex_);
     fileSz_ = sumSz;
     fdRequired_ = sumFd;
-    avgShardFileSz_ = fileSz_ / wptrShards.size();
+    avgShardFileSz_ = fileSz_ / numShards;
 
     if (fileSz_ >= maxFileSz_)
     {

diff --git a/src/ripple/protocol/jss.h b/src/ripple/protocol/jss.h
@@ -542,7 +542,6 @@ JSS ( url_password );               // in: Subscribe
 JSS ( url_username );               // in: Subscribe
 JSS ( urlgravatar );                //
 JSS ( username );                   // in: Subscribe
-JSS ( validate );                   // in: DownloadShard
 JSS ( validated );                  // out: NetworkOPs, RPCHelpers, AccountTx*
                                     //      Tx
 JSS ( validator_list_expires );     // out: NetworkOps, ValidatorList

diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp
@@ -2980,10 +2980,9 @@ static RPCCallTestData const rpcCallTestArray [] =
     })"
 },
 {
-    "download_shard: novalidate.", __LINE__,
+    "download_shard:", __LINE__,
     {
         "download_shard",
-        "novalidate",
         "20",
         "url_NotValidated",
     },
@@ -2998,8 +2997,7 @@ static RPCCallTestData const rpcCallTestArray [] =
                "index" : 20,
                "url" : "url_NotValidated"
             }
-         ],
-         "validate" : false
+         ]
       }
     ]
     })"
@@ -3046,10 +3044,9 @@ static RPCCallTestData const rpcCallTestArray [] =
     })"
 },
 {
-    "download_shard: novalidate many shards.", __LINE__,
+    "download_shard: many shards.", __LINE__,
     {
         "download_shard",
-        "novalidate",
         "2000000",
         "url_NotValidated0",
         "2000001",
@@ -3088,8 +3085,7 @@ static RPCCallTestData const rpcCallTestArray [] =
                "index" : 2000004,
                "url" : "url_NotValidated4"
             }
-         ],
-         "validate" : false
+         ]
       }
     ]
     })"
@@ -3142,8 +3138,7 @@ static RPCCallTestData const rpcCallTestArray [] =
                "index" : 20,
                "url" : "url_NotValidated"
             }
-         ],
-         "validate" : false
+         ]
       }
     ]
     })"