Fix mpt conversion

gregtatcam · Jul 12, 2024 · a9eafe6 · a9eafe6
1 parent 20eab6c
commit a9eafe6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/src/test/jtx/amount.h b/src/test/jtx/amount.h
@@ -446,7 +446,7 @@ class MPT
         return mptID;
     }
 
-    /** Implicit conversion to Issue.
+    /** Implicit conversion to MPTIssue.
 
         This allows passing an MPT
         value where an Issue is expected.
@@ -457,23 +457,10 @@ class MPT
     }
 
     template <class T>
-    requires(sizeof(T) >= sizeof(int) && std::is_arithmetic_v<T>) PrettyAmount
+    requires(sizeof(T) >= sizeof(int) && std::is_arithmetic_v<T>) STMPTAmount
     operator()(T v) const
     {
-        // VFALCO NOTE Should throw if the
-        //             representation of v is not exact.
-        return {amountFromString(mptID, std::to_string(v)), name};
-    }
-
-    PrettyAmount operator()(epsilon_t) const;
-    PrettyAmount operator()(detail::epsilon_multiple) const;
-
-    friend BookSpec
-    operator~(MPT const& mpt)
-    {
-        assert(false);
-        Throw<std::logic_error>("MPT is not supported");
-        return BookSpec{beast::zero, noCurrency()};
+        return amountFromString(mptID, std::to_string(v));
     }
 };
 

diff --git a/src/test/jtx/impl/mpt.cpp b/src/test/jtx/impl/mpt.cpp
@@ -365,7 +365,7 @@ MPTTester::claw(
         mptpay(*this, holder, holderAmt - std::min(holderAmt, amount)));
 }
 
-PrettyAmount
+STMPTAmount
 MPTTester::mpt(std::int64_t amount) const
 {
     assert(mpt_);

diff --git a/src/test/jtx/mpt.h b/src/test/jtx/mpt.h
@@ -196,7 +196,7 @@ class MPTTester
         std::int64_t amount,
         std::optional<TER> err = std::nullopt);
 
-    PrettyAmount
+    STMPTAmount
     mpt(std::int64_t amount) const;
 
     uint256 const&