From 3509de9c5f6a62ebe02a916265a4238dd4f3bcd1 Mon Sep 17 00:00:00 2001
From: tequ <git@tequ.dev>
Date: Wed, 15 Oct 2025 03:37:39 +0900
Subject: [PATCH] refactor: Add `paychan` namespace and update related tests
 (#5840)

This change adds a paychan namespace to the TestHelpers and implementation files, improving organization and clarity. Additionally, it updates the AMM test to use the new `paychan::create` function for payment channel creation.

Co-authored-by: Bart Thomee <11445373+bthomee@users.noreply.github.com>
---
 src/test/app/AMM_test.cpp         | 2 +-
 src/test/app/PayChan_test.cpp     | 2 ++
 src/test/jtx/TestHelpers.h        | 3 +++
 src/test/jtx/impl/TestHelpers.cpp | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp
index 1fe37bb7c1..3e0d65894f 100644
--- a/src/test/app/AMM_test.cpp
+++ b/src/test/app/AMM_test.cpp
@@ -3666,7 +3666,7 @@ private:
             auto const settleDelay = 100s;
             NetClock::time_point const cancelAfter =
                 env.current()->info().parentCloseTime + 200s;
-            env(create(
+            env(paychan::create(
                     carol,
                     ammAlice.ammAccount(),
                     XRP(1'000),
diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp
index fe9b70cf7f..595a12aed9 100644
--- a/src/test/app/PayChan_test.cpp
+++ b/src/test/app/PayChan_test.cpp
@@ -31,6 +31,8 @@
 
 namespace ripple {
 namespace test {
+using namespace jtx::paychan;
+
 struct PayChan_test : public beast::unit_test::suite
 {
     FeatureBitset const disallowIncoming{featureDisallowIncoming};
diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h
index 7d14f23c92..a7bdbb9b9f 100644
--- a/src/test/jtx/TestHelpers.h
+++ b/src/test/jtx/TestHelpers.h
@@ -502,6 +502,7 @@ expectLedgerEntryRoot(
 
 /* Payment Channel */
 /******************************************************************************/
+namespace paychan {
 
 Json::Value
 create(
@@ -561,6 +562,8 @@ channelBalance(ReadView const& view, uint256 const& chan);
 bool
 channelExists(ReadView const& view, uint256 const& chan);
 
+}  // namespace paychan
+
 /* Crossing Limits */
 /******************************************************************************/
 
diff --git a/src/test/jtx/impl/TestHelpers.cpp b/src/test/jtx/impl/TestHelpers.cpp
index 20f24f0d84..71f44c691e 100644
--- a/src/test/jtx/impl/TestHelpers.cpp
+++ b/src/test/jtx/impl/TestHelpers.cpp
@@ -237,6 +237,8 @@ expectLedgerEntryRoot(
 
 /* Payment Channel */
 /******************************************************************************/
+namespace paychan {
+
 Json::Value
 create(
     AccountID const& account,
@@ -328,6 +330,8 @@ channelExists(ReadView const& view, uint256 const& chan)
     return bool(slep);
 }
 
+}  // namespace paychan
+
 /* Crossing Limits */
 /******************************************************************************/