[FOLD] Last minute tweaks:

* Range check in fee vote * Simplify `divide` in fee track * Fix comment * Remove extra indent
XRPLF · Oct 21, 2019 · 2cc5476 · 2cc5476
1 parent 31281cb
commit 2cc5476
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/ripple/app/misc/FeeVoteImpl.cpp b/src/ripple/app/misc/FeeVoteImpl.cpp
@@ -171,7 +171,7 @@ FeeVoteImpl::doVoting(
             if (val->isFieldPresent (sfBaseFee))
             {
                 auto const vote = val->getFieldU64 (sfBaseFee);
-                if (isLegalAmount(vote))
+                if (vote <= std::numeric_limits<XRPAmount::value_type>::max())
                     baseFeeVote.addVote(XRPAmount{
                         unsafe_cast<XRPAmount::value_type>(vote)});
                 else

diff --git a/src/ripple/app/misc/impl/LoadFeeTrack.cpp b/src/ripple/app/misc/impl/LoadFeeTrack.cpp
@@ -96,21 +96,17 @@ scaleFeeLoad(FeeUnit64 fee, LoadFeeTrack const& feeTrack,
     // compatible. This function is an exception.
     auto lowestTerms = [](auto& a, auto& b)
     {
-        auto value = [](auto val)
+        auto const value = [](auto val)
         {
             if constexpr(std::is_arithmetic_v<decltype(val)>)
                 return val;
             else
                 return val.value();
         };
 
-        auto divide = [](auto& val, auto gcd)
+        auto const divide = [&value](auto& val, auto gcd)
         {
-            if constexpr(std::is_arithmetic_v<std::remove_reference_t<
-                    decltype(val)>>)
-                return val /= gcd;
-            else
-                return val = val.value() / gcd;
+            val = value(val) / gcd;
         };
 
         if (auto const g = std::gcd(value(a), value(b)))

diff --git a/src/ripple/basics/XRPAmount.h b/src/ripple/basics/XRPAmount.h
@@ -197,7 +197,7 @@ class XRPAmount
         if ((drops_ > std::numeric_limits<Dest>::max()) ||
             (!std::numeric_limits<Dest>::is_signed && drops_ < 0) ||
             (std::numeric_limits<Dest>::is_signed &&
-                drops_ < std::numeric_limits<Dest>::lowest()))
+            drops_ < std::numeric_limits<Dest>::lowest()))
         {
             return boost::none;
         }

diff --git a/src/test/basics/XRPAmount_test.cpp b/src/test/basics/XRPAmount_test.cpp
@@ -130,7 +130,7 @@ class XRPAmount_test : public beast::unit_test::suite
 
     void testFunctions()
     {
-        // Explicitly test every defined function for the TaggedFee class
+        // Explicitly test every defined function for the XRPAmount class
         // since some of them are templated, but not used anywhere else.
         auto make = [&](auto x) -> XRPAmount {
             return x; };