[FOLD] Review feedback

XRPLF · Oct 22, 2019 · abbf1eb · abbf1eb
1 parent 2cc5476
commit abbf1eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/ripple/app/misc/FeeVoteImpl.cpp b/src/ripple/app/misc/FeeVoteImpl.cpp
@@ -170,8 +170,10 @@ FeeVoteImpl::doVoting(
         {
             if (val->isFieldPresent (sfBaseFee))
             {
+                using xrptype = XRPAmount::value_type;
                 auto const vote = val->getFieldU64 (sfBaseFee);
-                if (vote <= std::numeric_limits<XRPAmount::value_type>::max())
+                if (vote <= std::numeric_limits<xrptype>::max() &&
+                    isLegalAmount(XRPAmount{unsafe_cast<xrptype>(vote)}))
                     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,23 +96,18 @@ scaleFeeLoad(FeeUnit64 fee, LoadFeeTrack const& feeTrack,
     // compatible. This function is an exception.
     auto lowestTerms = [](auto& a, auto& b)
     {
-        auto const value = [](auto val)
+        auto value = [](auto val)
         {
             if constexpr(std::is_arithmetic_v<decltype(val)>)
                 return val;
             else
                 return val.value();
         };
 
-        auto const divide = [&value](auto& val, auto gcd)
-        {
-            val = value(val) / gcd;
-        };
-
         if (auto const g = std::gcd(value(a), value(b)))
         {
-            divide(a, g);
-            divide(b, g);
+            a = value(a) / g;
+            b = value(b) / g;
         }
     };