Fix CFT related amounts

gregtatcam · Oct 11, 2023 · b024e28 · b024e28
1 parent 1d97251
commit b024e28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/ripple/app/paths/impl/AmountSpec.h b/src/ripple/app/paths/impl/AmountSpec.h
@@ -144,24 +144,23 @@ template <>
 inline IOUAmount&
 get<IOUAmount>(EitherAmount& amt)
 {
-    // assert(!amt.native && !amt.cft);
-    assert(!amt.native);
+    assert(!amt.native && !amt.is_cft);
     return amt.iou;
 }
 
 template <>
 inline XRPAmount&
 get<XRPAmount>(EitherAmount& amt)
 {
-    assert(amt.native && !amt.cft);
+    assert(amt.native && !amt.is_cft);
     return amt.xrp;
 }
 
 template <>
 inline CFTAmount&
 get<CFTAmount>(EitherAmount& amt)
 {
-    assert(amt.cft && !amt.native);
+    assert(amt.is_cft && !amt.native);
     return amt.cft;
 }
 
@@ -177,8 +176,7 @@ template <>
 inline IOUAmount const&
 get<IOUAmount>(EitherAmount const& amt)
 {
-    // assert(!amt.native && !amt.cft);
-    assert(!amt.native);
+    assert(!amt.native && !amt.is_cft);
     return amt.iou;
 }
 

diff --git a/src/ripple/protocol/impl/STAmount.cpp b/src/ripple/protocol/impl/STAmount.cpp
@@ -81,7 +81,7 @@ getSNValue(STAmount const& amount)
 static bool
 areComparable(STAmount const& v1, STAmount const& v2)
 {
-    return (v1.native() == v2.native() || v1.cft() == v2.cft()) &&
+    return (v1.native() == v2.native() || v1.isCFT() == v2.isCFT()) &&
         v1.issue().currency == v2.issue().currency;
 }