Refactor Payment and Clawback transactors

to have separate functions for MPT/IOU handling since there is little overlap between them.
gregtatcam · Aug 15, 2024 · fe8e9d2 · fe8e9d2
1 parent 39e8906
commit fe8e9d2
Show file tree

Hide file tree

Showing 7 changed files with 570 additions and 487 deletions.
diff --git a/include/xrpl/protocol/SField.h b/include/xrpl/protocol/SField.h
@@ -691,7 +691,6 @@ extern SField const sfXChainClaimProofSig;
 extern SField const sfXChainCreateAccountProofSig;
 extern SField const sfXChainClaimAttestationCollectionElement;
 extern SField const sfXChainCreateAccountAttestationCollectionElement;
-extern SField const MPToken;
 
 // array of objects (common)
 // ARRAY/1 is reserved for end of array

diff --git a/include/xrpl/protocol/STAmount.h b/include/xrpl/protocol/STAmount.h
@@ -409,6 +409,12 @@ STAmount::value() const noexcept
     return *this;
 }
 
+inline bool
+isLegalNet(STAmount const& value)
+{
+    return !value.native() || (value.mantissa() <= STAmount::cMaxNativeN);
+}
+
 //------------------------------------------------------------------------------
 //
 // Operators

diff --git a/include/xrpl/protocol/STEitherAmount.h b/include/xrpl/protocol/STEitherAmount.h
@@ -213,47 +213,6 @@ operator!=(STEitherAmount const& lhs, STEitherAmount const& rhs)
     return !operator==(lhs, rhs);
 }
 
-template <ValidAssetType T1, ValidAssetType T2>
-bool
-sameAsset(T1 const& t1, T2 const& t2)
-{
-    if constexpr (std::is_same_v<T1, T2>)
-        return t1 == t2;
-    else
-        return false;
-}
-
-template <ValidAssetType T>
-bool
-badAsset(T const& t)
-{
-    if constexpr (std::is_same_v<T, Currency>)
-        return badCurrency() == t;
-    else
-        return badMPT() == t;
-}
-
-inline bool
-isLegalNet(STEitherAmount const& value)
-{
-    if (value.isIssue())
-    {
-        auto const& v = get<STAmount>(value);
-        return !v.native() || (v.mantissa() <= STAmount::cMaxNativeN);
-    }
-    return true;
-}
-
-template <ValidAmountType T>
-bool
-isNative(T const& amount)
-{
-    if constexpr (std::is_same_v<T, STMPTAmount>)
-        return false;
-    else if constexpr (std::is_same_v<T, STAmount>)
-        return amount.native();
-}
-
 template <ValidAmountType T>
 bool
 isMPT(T const& amount)

diff --git a/include/xrpl/protocol/STMPTAmount.h b/include/xrpl/protocol/STMPTAmount.h
@@ -178,6 +178,12 @@ operator>=(STMPTAmount const& lhs, STMPTAmount const& rhs)
     return !(lhs < rhs);
 }
 
+inline bool
+isLegalNet(STMPTAmount const& value)
+{
+    return true;
+}
+
 STMPTAmount
 amountFromString(MPTIssue const& issue, std::string const& amount);
 

diff --git a/src/test/app/MPToken_test.cpp b/src/test/app/MPToken_test.cpp
@@ -1333,7 +1333,7 @@ class MPToken_test : public beast::unit_test::suite
             auto const mpt = ripple::test::jtx::MPT(
                 alice.name(), std::make_pair(env.seq(alice), alice.id()));
 
-            env(claw(alice, bob["USD"](5), bob), ter(temDISABLED));
+            env(claw(alice, bob["USD"](5), bob), ter(temMALFORMED));
             env.close();
 
             env(claw(alice, mpt(5)), ter(temDISABLED));