Resolve merge conflicts

gregtatcam · Nov 12, 2024 · f8c333b · f8c333b
1 parent 8d4ca5f
commit f8c333b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/xrpld/app/tx/detail/AMMClawback.cpp b/src/xrpld/app/tx/detail/AMMClawback.cpp
@@ -56,7 +56,7 @@ AMMClawback::preflight(PreflightContext const& ctx)
     }
 
     std::optional<STAmount> const clawAmount = ctx.tx[~sfAmount];
-    auto const asset = ctx.tx[sfAsset];
+    auto const asset = ctx.tx[sfAsset].get<Issue>();
 
     if (isXRP(asset))
         return temMALFORMED;
@@ -68,7 +68,7 @@ AMMClawback::preflight(PreflightContext const& ctx)
         return temMALFORMED;
     }
 
-    if (clawAmount && clawAmount->issue() != asset)
+    if (clawAmount && clawAmount->get<Issue>() != asset)
     {
         JLOG(ctx.j.trace()) << "AMMClawback: Amount's issuer/currency subfield "
                                "does not match Asset field";
@@ -84,8 +84,8 @@ AMMClawback::preflight(PreflightContext const& ctx)
 TER
 AMMClawback::preclaim(PreclaimContext const& ctx)
 {
-    auto const asset = ctx.tx[sfAsset];
-    auto const asset2 = ctx.tx[sfAsset2];
+    auto const asset = ctx.tx[sfAsset].get<Issue>();
+    auto const asset2 = ctx.tx[sfAsset2].get<Issue>();
     auto const sleIssuer = ctx.view.read(keylet::account(ctx.tx[sfAccount]));
     if (!sleIssuer)
         return terNO_ACCOUNT;  // LCOV_EXCL_LINE
@@ -138,8 +138,8 @@ AMMClawback::applyGuts(Sandbox& sb)
     std::optional<STAmount> const clawAmount = ctx_.tx[~sfAmount];
     AccountID const issuer = ctx_.tx[sfAccount];
     AccountID const holder = ctx_.tx[sfHolder];
-    Issue const asset = ctx_.tx[sfAsset];
-    Issue const asset2 = ctx_.tx[sfAsset2];
+    Issue const asset = ctx_.tx[sfAsset].get<Issue>();
+    Issue const asset2 = ctx_.tx[sfAsset2].get<Issue>();
 
     auto ammSle = sb.peek(keylet::amm(asset, asset2));
     if (!ammSle)

diff --git a/src/xrpld/app/tx/detail/AMMDeposit.cpp b/src/xrpld/app/tx/detail/AMMDeposit.cpp
@@ -268,10 +268,10 @@ AMMDeposit::preclaim(PreclaimContext const& ctx)
             return tesSUCCESS;
         };
 
-        if (auto const ter = checkAsset(ctx.tx[sfAsset]))
+        if (auto const ter = checkAsset(ctx.tx[sfAsset].get<Issue>()))
             return ter;
 
-        if (auto const ter = checkAsset(ctx.tx[sfAsset2]))
+        if (auto const ter = checkAsset(ctx.tx[sfAsset2].get<Issue>()))
             return ter;
     }
 

diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp
@@ -418,7 +418,12 @@ AMMWithdraw::applyGuts(Sandbox& sb)
         return {result, false};
 
     auto const res = deleteAMMAccountIfEmpty(
-        sb, ammSle, newLPTokenBalance, ctx_.tx[sfAsset], ctx_.tx[sfAsset2], j_);
+        sb,
+        ammSle,
+        newLPTokenBalance,
+        ctx_.tx[sfAsset].get<Issue>(),
+        ctx_.tx[sfAsset2].get<Issue>(),
+        j_);
     // LCOV_EXCL_START
     if (!res.second)
         return {res.first, false};