From 4082714ccdf3cc64f3d991a80420fe90a044e6d4 Mon Sep 17 00:00:00 2001
From: Denis Angell <dangell@transia.co>
Date: Mon, 15 Jun 2026 17:39:11 -0400
Subject: [PATCH] fix bad merge

---
 src/libxrpl/protocol/STTx.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libxrpl/protocol/STTx.cpp b/src/libxrpl/protocol/STTx.cpp
index 9633ba596a..5e911118d1 100644
--- a/src/libxrpl/protocol/STTx.cpp
+++ b/src/libxrpl/protocol/STTx.cpp
@@ -297,7 +297,7 @@ STTx::checkBatchSign(Rules const& rules) const
             return std::unexpected("Not a batch transaction.");
         }
         if (!isFieldPresent(sfBatchSigners))
-            return Unexpected("Missing BatchSigners field.");
+            return std::unexpected("Missing BatchSigners field.");
         STArray const& signers{getFieldArray(sfBatchSigners)};
         for (auto const& signer : signers)
         {
@@ -312,7 +312,7 @@ STTx::checkBatchSign(Rules const& rules) const
     }
     catch (std::exception const& e)
     {
-        return Unexpected(std::string("Internal batch signature check failure: ") + e.what());
+        return std::unexpected(std::string("Internal batch signature check failure: ") + e.what());
     }
 }
 
@@ -567,7 +567,7 @@ STTx::checkMultiSign(Rules const& rules, STObject const& sigObject) const
 void
 STTx::buildBatchTxnIds()
 {
-    if (tx_type_ != ttBATCH || !isFieldPresent(sfRawTransactions))
+    if (getTxnType() != ttBATCH || !isFieldPresent(sfRawTransactions))
         return;
 
     auto const& raw = getFieldArray(sfRawTransactions);