From 0a8e3c8b5ca5aa9892c890e0df8ed3b5df5cb317 Mon Sep 17 00:00:00 2001
From: Mayukha Vadari <mvadari@gmail.com>
Date: Thu, 2 Jul 2026 16:39:42 -0400
Subject: [PATCH] more cleanup

---
 include/xrpl/ledger/helpers/NFTokenHelpers.h      | 2 +-
 src/libxrpl/ledger/helpers/AccountRootHelpers.cpp | 4 ++--
 src/libxrpl/ledger/helpers/CredentialHelpers.cpp  | 3 +--
 src/libxrpl/ledger/helpers/NFTokenHelpers.cpp     | 5 ++---
 src/libxrpl/ledger/helpers/TokenHelpers.cpp       | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/include/xrpl/ledger/helpers/NFTokenHelpers.h b/include/xrpl/ledger/helpers/NFTokenHelpers.h
index 5e24d65b9c..b8754c722d 100644
--- a/include/xrpl/ledger/helpers/NFTokenHelpers.h
+++ b/include/xrpl/ledger/helpers/NFTokenHelpers.h
@@ -51,7 +51,7 @@ findTokenAndPage(ApplyView& view, AccountID const& owner, uint256 const& nftoken
 
 /** Insert the token in the owner's token directory. */
 TER
-insertToken(ApplyViewContext& view, AccountID owner, STObject&& nft);
+insertToken(ApplyViewContext view, AccountID owner, STObject&& nft);
 
 /** Remove the token from the owner's token directory. */
 TER
diff --git a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
index d5c456f422..8ecbd1d8a2 100644
--- a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
@@ -296,7 +296,7 @@ decreaseOwnerCount(
 void
 decreaseOwnerCountForObject(
     ApplyView& view,
-    SLE::ref ownerSle,
+    SLE::ref accountSle,
     SLE::ref objectSle,
     std::uint32_t count,
     beast::Journal j)
@@ -310,7 +310,7 @@ decreaseOwnerCountForObject(
     if (!validObjectType)
         return;  // LCOV_EXCL_LINE
 
-    decreaseOwnerCount(view, ReserveContext::makeFromObject(view, objectSle, ownerSle), count, j);
+    decreaseOwnerCount(view, ReserveContext::makeFromObject(view, objectSle, accountSle), count, j);
 }
 XRPAmount
 accountReserve(ReadView const& view, SLE::const_ref sle, beast::Journal j, Adjustment adj)
diff --git a/src/libxrpl/ledger/helpers/CredentialHelpers.cpp b/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
index 5d377b2354..226ea100e9 100644
--- a/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
@@ -97,8 +97,7 @@ deleteSLE(ApplyView& view, SLE::ref sleCredential, beast::Journal j)
         }
 
         if (isOwner)
-            decreaseOwnerCountForObject(
-                view, view.peek(keylet::account(account)), sleCredential, 1, j);
+            decreaseOwnerCountForObject(view, sleAccount, sleCredential, 1, j);
 
         return tesSUCCESS;
     };
diff --git a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
index ea19110afb..afd54050b8 100644
--- a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
@@ -261,9 +261,8 @@ changeTokenURI(
 
 /** Insert the token in the owner's token directory. */
 TER
-insertToken(ApplyViewContext& ctx, AccountID owner, STObject&& nft)
+insertToken(ApplyViewContext ctx, AccountID owner, STObject&& nft)
 {
-    auto& view = ctx.view;
     XRPL_ASSERT(nft.isFieldPresent(sfNFTokenID), "xrpl::nft::insertToken : has NFT token");
 
     // First, we need to locate the page the NFT belongs to, creating it
@@ -293,7 +292,7 @@ insertToken(ApplyViewContext& ctx, AccountID owner, STObject&& nft)
         page->setFieldArray(sfNFTokens, arr);
     }
 
-    view.update(page);
+    ctx.view.update(page);
 
     return tesSUCCESS;
 }
diff --git a/src/libxrpl/ledger/helpers/TokenHelpers.cpp b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
index af9f3a00f2..bdc48ca83e 100644
--- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
@@ -581,7 +581,7 @@ addEmptyHolding(
 {
     return std::visit(
         [&]<ValidIssueType TIss>(TIss const& issue) -> TER {
-            return addEmptyHolding(std::move(ctx), accountID, priorBalance, issue, journal);
+            return addEmptyHolding(ctx, accountID, priorBalance, issue, journal);
         },
         asset.value());
 }
@@ -595,7 +595,7 @@ removeEmptyHolding(
 {
     return std::visit(
         [&]<ValidIssueType TIss>(TIss const& issue) -> TER {
-            return removeEmptyHolding(std::move(ctx), accountID, issue, journal);
+            return removeEmptyHolding(ctx, accountID, issue, journal);
         },
         asset.value());
 }