Merge remote-tracking branch 'upstream/develop' into sponsor

src/test/rpc/AccountObjects_test.cpp

@@ -1,21 +1,44 @@
-#include <test/jtx.h>
 #include <test/jtx/AMM.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/TestHelpers.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/deposit.h>
+#include <test/jtx/envconfig.h>
+#include <test/jtx/fee.h>
+#include <test/jtx/multisign.h>
+#include <test/jtx/offer.h>
+#include <test/jtx/owners.h>  // IWYU pragma: keep
+#include <test/jtx/pay.h>
+#include <test/jtx/permissioned_domains.h>
+#include <test/jtx/sig.h>
 #include <test/jtx/sponsor.h>
+#include <test/jtx/ticket.h>
+#include <test/jtx/token.h>
+#include <test/jtx/trust.h>
+#include <test/jtx/txflags.h>
 #include <test/jtx/xchain_bridge.h>
 
+#include <xrpl/basics/base_uint.h>
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/json/json_reader.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/json/to_string.h>
+#include <xrpl/protocol/AccountID.h>
+#include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/protocol/nft.h>
 #include <xrpl/tx/transactors/nft/NFTokenMint.h>
 
-#include <boost/utility/string_ref.hpp>
-
 #include <algorithm>
+#include <cstdint>
+#include <iterator>
+#include <optional>
+#include <vector>
 
-namespace xrpl {
-namespace test {
+namespace xrpl::test {
 
 static char const* bob_account_objects[] = {
     R"json({
@@ -948,7 +971,7 @@ public:
                     jss::PayChannel.c_str(),
                     jss::PermissionedDomain.c_str(),
                     jss::Sponsorship.c_str()};
-                std::sort(v.begin(), v.end());
+                std::ranges::sort(v);
                 return v;
             }();
 
@@ -964,7 +987,7 @@ public:
                 {
                     gotLedgerTypes.push_back(aobjs[i]["LedgerEntryType"].asString());
                 }
-                std::sort(gotLedgerTypes.begin(), gotLedgerTypes.end());
+                std::ranges::sort(gotLedgerTypes);
                 BEAST_EXPECT(gotLedgerTypes == expectedLedgerTypes);
             }
         }
@@ -989,7 +1012,7 @@ public:
                 auto const objs = resp[jss::result][jss::account_objects];
                 for (auto const& obj : resp[jss::result][jss::account_objects])
                     typesOut.push_back(obj[sfLedgerEntryType.fieldName].asString());
-                std::sort(typesOut.begin(), typesOut.end());
+                std::ranges::sort(typesOut);
             };
             // Make a lambda we can use to check the number of fetched
             // account objects and their ledger type
@@ -1505,5 +1528,4 @@ public:
 
 BEAST_DEFINE_TESTSUITE(AccountObjects, rpc, xrpl);
 
-}  // namespace test
-}  // namespace xrpl
+}  // namespace xrpl::test