Remove CFT Direct Step from path

* Remove DirectStepCFT * Remove CFT from the payment eng * Handle direct CFT payment in payment transactor
gregtatcam · Dec 5, 2023 · a4f5af2 · a4f5af2
1 parent d0278c2
commit a4f5af2
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 1,146 deletions.
diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake
@@ -489,7 +489,6 @@ target_sources (rippled PRIVATE
   src/ripple/app/paths/impl/AMMOffer.cpp
   src/ripple/app/paths/impl/BookStep.cpp
   src/ripple/app/paths/impl/DirectStep.cpp
-  src/ripple/app/paths/impl/DirectStepCFT.cpp
   src/ripple/app/paths/impl/PaySteps.cpp
   src/ripple/app/paths/impl/XRPEndpointStep.cpp
   src/ripple/app/rdb/backend/detail/impl/Node.cpp

diff --git a/src/ripple/app/paths/Flow.cpp b/src/ripple/app/paths/Flow.cpp
@@ -194,25 +194,6 @@ flow(
     }
 
     assert(!srcIsXRP && !dstIsXRP);
-    if (srcIssue.currency.isCFT())
-    {
-        assert(dstIssue.currency.isCFT());
-        return finishFlow(
-            sb,
-            srcIssue,
-            dstIssue,
-            flow<CFTAmount, CFTAmount>(
-                sb,
-                strands,
-                asDeliver.cft,
-                partialPayment,
-                offerCrossing,
-                limitQuality,
-                sendMax,
-                j,
-                ammContext,
-                flowDebugInfo));
-    }
     return finishFlow(
         sb,
         srcIssue,

diff --git a/src/ripple/app/paths/Pathfinder.cpp b/src/ripple/app/paths/Pathfinder.cpp
@@ -944,7 +944,7 @@ Pathfinder::addLink(
     auto const& uEndCurrency = pathEnd.getCurrency();
     auto const& uEndIssuer = pathEnd.getIssuerID();
     auto const& uEndAccount = pathEnd.getAccountID();
-    bool const bOnXRP = uEndCurrency.isXRP();
+    bool const bOnXRP = isXRP(uEndCurrency);
 
     // Does pathfinding really need to get this to
     // a gateway (the issuer of the destination amount)