Merge branch 'ripple/wasmi' into wasmi-host-functions

src/libxrpl/net/RegisterSSLCerts.cpp

@@ -85,7 +85,8 @@ registerSSLCerts(boost::asio::ssl::context& ctx, boost::system::error_code& ec,
 // There is a very unpleasant interaction between <wincrypt> and
 // openssl x509 types (namely the former has macros that stomp
 // on the latter), these undefs allow this TU to be safely used in
-// unity builds without messing up subsequent TUs.
+// unity builds without messing up subsequent TUs. Although we
+// no longer use unity builds, leaving the undefs here does no harm.
 #if BOOST_OS_WINDOWS
 #undef X509_NAME
 #undef X509_EXTENSIONS

src/test/csf/BasicNetwork.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_BASICNETWORK_H_INCLUDED
-#define XRPL_TEST_CSF_BASICNETWORK_H_INCLUDED
+#pragma once
 
 #include <test/csf/Digraph.h>
 #include <test/csf/Scheduler.h>
@@ -228,5 +227,3 @@ BasicNetwork<Peer>::send(Peer const& from, Peer const& to, Function&& f)
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/CollectorRef.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_COLLECTOREF_H_INCLUDED
-#define XRPL_TEST_CSF_COLLECTOREF_H_INCLUDED
+#pragma once
 
 #include <test/csf/SimTime.h>
 #include <test/csf/events.h>
@@ -328,5 +327,3 @@ public:
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/Digraph.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_DIGRAPH_H_INCLUDED
-#define XRPL_TEST_CSF_DIGRAPH_H_INCLUDED
+#pragma once
 
 #include <boost/container/flat_map.hpp>
 #include <boost/range/adaptor/transformed.hpp>
@@ -228,4 +227,3 @@ public:
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-#endif

src/test/csf/Histogram.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_HISTOGRAM_H_INCLUDED
-#define XRPL_TEST_CSF_HISTOGRAM_H_INCLUDED
+#pragma once
 
 #include <algorithm>
 #include <cassert>
@@ -112,5 +111,3 @@ public:
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/Peer.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_PEER_H_INCLUDED
-#define XRPL_TEST_CSF_PEER_H_INCLUDED
+#pragma once
 
 #include <test/csf/CollectorRef.h>
 #include <test/csf/Scheduler.h>
@@ -937,4 +936,3 @@ struct Peer
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-#endif

src/test/csf/PeerGroup.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_PEERGROUP_H_INCLUDED
-#define XRPL_TEST_CSF_PEERGROUP_H_INCLUDED
+#pragma once
 
 #include <test/csf/Peer.h>
 #include <test/csf/random.h>
@@ -340,4 +339,3 @@ randomRankedConnect(
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-#endif

src/test/csf/Proposal.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_PROPOSAL_H_INCLUDED
-#define XRPL_TEST_CSF_PROPOSAL_H_INCLUDED
+#pragma once
 
 #include <test/csf/Tx.h>
 #include <test/csf/Validation.h>
@@ -18,5 +17,3 @@ using Proposal = ConsensusProposal<PeerID, Ledger::ID, TxSet::ID>;
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/Scheduler.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_SCHEDULER_H_INCLUDED
-#define XRPL_TEST_CSF_SCHEDULER_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/beast/clock/manual_clock.h>
@@ -428,5 +427,3 @@ Scheduler::step_for(std::chrono::duration<Period, Rep> const& amount)
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/Sim.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_SIM_H_INCLUDED
-#define XRPL_TEST_CSF_SIM_H_INCLUDED
+#pragma once
 
 #include <test/csf/BasicNetwork.h>
 #include <test/csf/CollectorRef.h>
@@ -148,5 +147,3 @@ public:
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/SimTime.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_SIMTIME_H_INCLUDED
-#define XRPL_TEST_CSF_SIMTIME_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/clock/manual_clock.h>
 
@@ -20,5 +19,3 @@ using SimTime = typename SimClock::time_point;
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/TrustGraph.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_UNL_H_INCLUDED
-#define XRPL_TEST_CSF_UNL_H_INCLUDED
+#pragma once
 
 #include <test/csf/random.h>
 
@@ -150,5 +149,3 @@ public:
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/Tx.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_TX_H_INCLUDED
-#define XRPL_TEST_CSF_TX_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/hash/hash_append.h>
 #include <xrpl/beast/hash/uhash.h>
@@ -207,5 +206,3 @@ hash_append(Hasher& h, Tx const& tx)
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/Validation.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_VALIDATION_H_INCLUDED
-#define XRPL_TEST_CSF_VALIDATION_H_INCLUDED
+#pragma once
 
 #include <test/csf/ledgers.h>
 
@@ -176,5 +175,3 @@ public:
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/collectors.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_COLLECTORS_H_INCLUDED
-#define XRPL_TEST_CSF_COLLECTORS_H_INCLUDED
+#pragma once
 
 #include <test/csf/Histogram.h>
 #include <test/csf/SimTime.h>
@@ -641,5 +640,3 @@ struct JumpCollector
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/events.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_EVENTS_H_INCLUDED
-#define XRPL_TEST_CSF_EVENTS_H_INCLUDED
+#pragma once
 
 #include <test/csf/Proposal.h>
 #include <test/csf/Tx.h>
@@ -130,5 +129,3 @@ struct FullyValidateLedger
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/ledgers.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_LEDGERS_H_INCLUDED
-#define XRPL_TEST_CSF_LEDGERS_H_INCLUDED
+#pragma once
 
 #include <test/csf/Tx.h>
 
@@ -330,5 +329,3 @@ struct LedgerHistoryHelper
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/random.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_RANDOM_H_INCLUDED
-#define XRPL_TEST_CSF_RANDOM_H_INCLUDED
+#pragma once
 
 #include <random>
 #include <vector>
@@ -153,5 +152,3 @@ public:
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/submitters.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_SUBMITTERS_H_INCLUDED
-#define XRPL_TEST_CSF_SUBMITTERS_H_INCLUDED
+#pragma once
 
 #include <test/csf/Peer.h>
 #include <test/csf/Scheduler.h>
@@ -97,5 +96,3 @@ makeSubmitter(Distribution dist, SimTime start, SimTime end, Selector& sel, Sche
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/csf/timers.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_CSF_TIMERS_H_INCLUDED
-#define XRPL_TEST_CSF_TIMERS_H_INCLUDED
+#pragma once
 
 #include <test/csf/Scheduler.h>
 #include <test/csf/SimTime.h>
@@ -61,5 +60,3 @@ public:
 }  // namespace csf
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/json/TestOutputSuite.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_RPC_TESTOUTPUTSUITE_H_INCLUDED
-#define XRPL_RPC_TESTOUTPUTSUITE_H_INCLUDED
+#pragma once
 
 #include <test/jtx/TestSuite.h>
 
@@ -35,5 +34,3 @@ protected:
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_H_INCLUDED
-#define XRPL_TEST_JTX_H_INCLUDED
+#pragma once
 
 // Convenience header that includes everything
 
@@ -60,5 +59,3 @@
 #include <test/jtx/utility.h>
 
 #include <xrpl/json/to_string.h>
-
-#endif

src/test/jtx/AMM.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_AMM_H_INCLUDED
-#define XRPL_TEST_JTX_AMM_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -415,5 +414,3 @@ ammClawback(
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif  // XRPL_TEST_JTX_AMM_H_INCLUDED

src/test/jtx/AMMTest.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_AMMTEST_H_INCLUDED
-#define XRPL_TEST_JTX_AMMTEST_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
@@ -159,5 +158,3 @@ protected:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif  // XRPL_TEST_JTX_AMMTEST_H_INCLUDED

src/test/jtx/AbstractClient.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_ABSTRACTCLIENT_H_INCLUDED
-#define XRPL_TEST_ABSTRACTCLIENT_H_INCLUDED
+#pragma once
 
 #include <xrpl/json/json_value.h>
 
@@ -41,5 +40,3 @@ public:
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/Account.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_ACCOUNT_H_INCLUDED
-#define XRPL_TEST_JTX_ACCOUNT_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/hash/uhash.h>
 #include <xrpl/protocol/KeyType.h>
@@ -147,5 +146,3 @@ operator<=>(Account const& lhs, Account const& rhs) noexcept
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/CaptureLogs.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_CAPTURELOGS_H_INCLUDED
-#define XRPL_TEST_JTX_CAPTURELOGS_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/Log.h>
 
@@ -66,5 +65,3 @@ public:
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/CheckMessageLogs.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_CHECKMESSAGELOGS_H_INCLUDED
-#define XRPL_TEST_JTX_CHECKMESSAGELOGS_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/Log.h>
 
@@ -58,5 +57,3 @@ public:
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/Env.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_ENV_H_INCLUDED
-#define XRPL_TEST_JTX_ENV_H_INCLUDED
+#pragma once
 
 #include <test/jtx/AbstractClient.h>
 #include <test/jtx/Account.h>
@@ -779,5 +778,3 @@ Env::rpc(std::string const& cmd, Args&&... args)
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/Env_ss.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_ENV_SS_H_INCLUDED
-#define XRPL_TEST_JTX_ENV_SS_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -60,5 +59,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/JSONRPCClient.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_HTTPCLIENT_H_INCLUDED
-#define XRPL_TEST_HTTPCLIENT_H_INCLUDED
+#pragma once
 
 #include <test/jtx/AbstractClient.h>
 
@@ -16,5 +15,3 @@ makeJSONRPCClient(Config const& cfg, unsigned rpc_version = 2);
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/JTx.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_JTX_H_INCLUDED
-#define XRPL_TEST_JTX_JTX_H_INCLUDED
+#pragma once
 
 #include <test/jtx/basic_prop.h>
 #include <test/jtx/requires.h>
@@ -159,5 +158,3 @@ private:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/ManualTimeKeeper.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_MANUALTIMEKEEPER_H_INCLUDED
-#define XRPL_TEST_MANUALTIMEKEEPER_H_INCLUDED
+#pragma once
 
 #include <xrpld/core/TimeKeeper.h>
 
@@ -31,5 +30,3 @@ public:
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/Oracle.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_ORACLE_H_INCLUDED
-#define XRPL_TEST_JTX_ORACLE_H_INCLUDED
+#pragma once
 
 #include <test/jtx.h>
 
@@ -181,5 +180,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif  // XRPL_TEST_JTX_ORACLE_H_INCLUDED

src/test/jtx/PathSet.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_LEDGER_TESTS_PATHSET_H_INCLUDED
-#define XRPL_LEDGER_TESTS_PATHSET_H_INCLUDED
+#pragma once
 
 #include <test/jtx.h>
 
@@ -159,5 +158,3 @@ private:
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/SignerUtils.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_SIGNERUTILS_H_INCLUDED
-#define XRPL_TEST_JTX_SIGNERUTILS_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 
@@ -47,5 +46,3 @@ sortSigners(std::vector<Reg>& signers)
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/TestHelpers.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_TESTHELPERS_H_INCLUDED
-#define XRPL_TEST_JTX_TESTHELPERS_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -735,5 +734,3 @@ pay(AccountID const& account, uint256 const& loanID, STAmount const& amount, std
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif  // XRPL_TEST_JTX_TESTHELPERS_H_INCLUDED

src/test/jtx/TestSuite.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_BASICS_TESTSUITE_H_INCLUDED
-#define XRPL_BASICS_TESTSUITE_H_INCLUDED
+#pragma once
 
 #include <xrpl/beast/unit_test.h>
 
@@ -112,5 +111,3 @@ private:
 };
 
 }  // namespace xrpl
-
-#endif

src/test/jtx/TrustedPublisherServer.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_TRUSTED_PUBLISHER_SERVER_H_INCLUDED
-#define XRPL_TEST_TRUSTED_PUBLISHER_SERVER_H_INCLUDED
+#pragma once
 
 #include <test/jtx/envconfig.h>
 
@@ -647,4 +646,3 @@ make_TrustedPublisherServer(
 
 }  // namespace test
 }  // namespace xrpl
-#endif

src/test/jtx/WSClient.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_WSCLIENT_H_INCLUDED
-#define XRPL_TEST_WSCLIENT_H_INCLUDED
+#pragma once
 
 #include <test/jtx/AbstractClient.h>
 
@@ -34,5 +33,3 @@ makeWSClient(
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/account_txn_id.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_ACCOUNT_TXN_ID_H_INCLUDED
-#define XRPL_TEST_JTX_ACCOUNT_TXN_ID_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -23,4 +22,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-#endif

src/test/jtx/acctdelete.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_ACCTDELETE_H_INCLUDED
-#define XRPL_TEST_JTX_ACCTDELETE_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -24,5 +23,3 @@ incLgrSeqForAccDel(jtx::Env& env, jtx::Account const& acc, std::uint32_t margin
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/amount.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_AMOUNT_H_INCLUDED
-#define XRPL_TEST_JTX_AMOUNT_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/tags.h>
@@ -588,5 +587,3 @@ extern any_t const any;
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/attester.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_ATTESTER_H_INCLUDED
-#define XRPL_TEST_JTX_ATTESTER_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/Buffer.h>
 #include <xrpl/protocol/AccountID.h>
@@ -44,5 +43,3 @@ sign_create_account_attestation(
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/balance.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_BALANCE_H_INCLUDED
-#define XRPL_TEST_JTX_BALANCE_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 #include <test/jtx/tags.h>
@@ -43,5 +42,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/basic_prop.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_BASIC_PROP_H_INCLUDED
-#define XRPL_TEST_JTX_BASIC_PROP_H_INCLUDED
+#pragma once
 
 #include <memory>
 
@@ -42,5 +41,3 @@ struct prop_type : basic_prop
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/batch.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_BATCH_H_INCLUDED
-#define XRPL_TEST_JTX_BATCH_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -133,5 +132,3 @@ public:
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/check.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_CHECK_H_INCLUDED
-#define XRPL_TEST_JTX_CHECK_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -42,5 +41,3 @@ using checks = owner_count<ltCHECK>;
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/credentials.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_CREDENTIALS_H_INCLUDED
-#define XRPL_TEST_JTX_CREDENTIALS_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -74,5 +73,3 @@ ledgerEntry(jtx::Env& env, std::string const& credIdx);
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/delivermin.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_DELIVERMIN_H_INCLUDED
-#define XRPL_TEST_JTX_DELIVERMIN_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -27,5 +26,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/deposit.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_DEPOSIT_H_INCLUDED
-#define XRPL_TEST_JTX_DEPOSIT_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -59,5 +58,3 @@ unauthCredentials(jtx::Account const& account, std::vector<AuthorizeCredentials>
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/did.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_DID_H_INCLUDED
-#define XRPL_TEST_JTX_DID_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -81,5 +80,3 @@ del(jtx::Account const& account);
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/directory.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_DIRECTORY_H_INCLUDED
-#define XRPL_TEST_JTX_DIRECTORY_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -57,5 +56,3 @@ maximumPageIndex(Env const& env) -> std::uint64_t
 }  // namespace directory
 
 }  // namespace xrpl::test::jtx
-
-#endif

src/test/jtx/envconfig.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_ENVCONFIG_H_INCLUDED
-#define XRPL_TEST_JTX_ENVCONFIG_H_INCLUDED
+#pragma once
 
 #include <xrpld/core/Config.h>
 
@@ -112,5 +111,3 @@ makeConfig(std::map<std::string, std::string> extraTxQ = {}, std::map<std::strin
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/escrow.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_ESCROW_H_INCLUDED
-#define XRPL_TEST_JTX_ESCROW_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -86,5 +85,3 @@ auto const fulfillment = JTxFieldWrapper<blobField>(sfFulfillment);
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/fee.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_FEE_H_INCLUDED
-#define XRPL_TEST_JTX_FEE_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 #include <test/jtx/tags.h>
@@ -51,5 +50,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/flags.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_FLAGS_H_INCLUDED
-#define XRPL_TEST_JTX_FLAGS_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -139,5 +138,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/invoice_id.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_INVOICE_ID_H_INCLUDED
-#define XRPL_TEST_JTX_INVOICE_ID_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -23,4 +22,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-#endif

src/test/jtx/jtx_json.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_JSON_H_INCLUDED
-#define XRPL_TEST_JTX_JSON_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -41,5 +40,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/last_ledger_sequence.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_LAST_LEDGER_SEQUENCE_H_INCLUDED
-#define XRPL_TEST_JTX_LAST_LEDGER_SEQUENCE_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -24,5 +23,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/ledgerStateFix.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_LEDGER_STATE_FIX_H_INCLUDED
-#define XRPL_TEST_JTX_LEDGER_STATE_FIX_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -21,5 +20,3 @@ nftPageLinks(jtx::Account const& acct, jtx::Account const& owner);
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/memo.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_MEMO_H_INCLUDED
-#define XRPL_TEST_JTX_MEMO_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -74,5 +73,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/mpt.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_MPT_H_INCLUDED
-#define XRPL_TEST_JTX_MPT_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -299,5 +298,3 @@ private:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/multisign.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_MULTISIGN_H_INCLUDED
-#define XRPL_TEST_JTX_MULTISIGN_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/SignerUtils.h>
@@ -97,5 +96,3 @@ using siglists = owner_count<ltSIGNER_LIST>;
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/noop.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_NOOP_H_INCLUDED
-#define XRPL_TEST_JTX_NOOP_H_INCLUDED
+#pragma once
 
 #include <test/jtx/flags.h>
 
@@ -17,5 +16,3 @@ noop(Account const& account)
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/offer.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_OFFER_H_INCLUDED
-#define XRPL_TEST_JTX_OFFER_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 
@@ -21,5 +20,3 @@ offer_cancel(Account const& account, std::uint32_t offerSeq);
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/owners.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_OWNERS_H_INCLUDED
-#define XRPL_TEST_JTX_OWNERS_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -69,5 +68,3 @@ using offers = owner_count<ltOFFER>;
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/paths.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_PATHS_H_INCLUDED
-#define XRPL_TEST_JTX_PATHS_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -94,5 +93,3 @@ path::append(T const& t, Args const&... args)
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/pay.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_PAY_H_INCLUDED
-#define XRPL_TEST_JTX_PAY_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
@@ -19,5 +18,3 @@ pay(Account const& account, Account const& to, AnyAmount amount);
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/permissioned_domains.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_PERMISSIONED_DOMAINS_H_INCLUDED
-#define XRPL_TEST_JTX_PERMISSIONED_DOMAINS_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -47,5 +46,3 @@ getNewDomain(std::shared_ptr<STObject const> const& meta);
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/prop.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_PROP_H_INCLUDED
-#define XRPL_TEST_JTX_PROP_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -30,5 +29,3 @@ struct prop
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/quality.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_QUALITY_H_INCLUDED
-#define XRPL_TEST_JTX_QUALITY_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -66,5 +65,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/rate.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_RATE_H_INCLUDED
-#define XRPL_TEST_JTX_RATE_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 
@@ -16,5 +15,3 @@ rate(Account const& account, double multiplier);
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/regkey.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_REGKEY_H_INCLUDED
-#define XRPL_TEST_JTX_REGKEY_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/tags.h>
@@ -21,5 +20,3 @@ regkey(Account const& account, Account const& signer);
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/require.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_REQUIRE_H_INCLUDED
-#define XRPL_TEST_JTX_REQUIRE_H_INCLUDED
+#pragma once
 
 #include <test/jtx/requires.h>
 
@@ -64,5 +63,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/requires.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_REQUIRES_H_INCLUDED
-#define XRPL_TEST_JTX_REQUIRES_H_INCLUDED
+#pragma once
 
 #include <functional>
 #include <vector>
@@ -16,5 +15,3 @@ using requires_t = std::vector<require_t>;
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/rpc.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_RPC_H_INCLUDED
-#define XRPL_TEST_JTX_RPC_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -59,5 +58,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/sendmax.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_SENDMAX_H_INCLUDED
-#define XRPL_TEST_JTX_SENDMAX_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -27,5 +26,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/seq.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_SEQ_H_INCLUDED
-#define XRPL_TEST_JTX_SEQ_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 #include <test/jtx/tags.h>
@@ -37,5 +36,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/sig.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_SIG_H_INCLUDED
-#define XRPL_TEST_JTX_SIG_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -59,5 +58,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/tag.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_TAG_H_INCLUDED
-#define XRPL_TEST_JTX_TAG_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -42,5 +41,3 @@ public:
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/tags.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_TAGS_H_INCLUDED
-#define XRPL_TEST_JTX_TAGS_H_INCLUDED
+#pragma once
 
 namespace xrpl {
 namespace test {
@@ -44,5 +43,3 @@ static increment_t const increment;
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/ter.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_TER_H_INCLUDED
-#define XRPL_TEST_JTX_TER_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -36,5 +35,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/testline.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_TESTLINE_H_INCLUDED
-#define XRPL_TEST_JTX_TESTLINE_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -30,5 +29,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/ticket.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_TICKET_H_INCLUDED
-#define XRPL_TEST_JTX_TICKET_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -48,5 +47,3 @@ using tickets = owner_count<ltTICKET>;
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/token.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_NFT_H_INCLUDED
-#define XRPL_TEST_JTX_NFT_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
@@ -218,5 +217,3 @@ modify(jtx::Account const& account, uint256 const& nftokenID);
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif  // XRPL_TEST_JTX_NFT_H_INCLUDED

src/test/jtx/trust.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_TRUST_H_INCLUDED
-#define XRPL_TEST_JTX_TRUST_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 
@@ -24,5 +23,3 @@ claw(Account const& account, STAmount const& amount, std::optional<Account> cons
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/txflags.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_TXFLAGS_H_INCLUDED
-#define XRPL_TEST_JTX_TXFLAGS_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Env.h>
 
@@ -25,5 +24,3 @@ public:
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/utility.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_UTILITY_H_INCLUDED
-#define XRPL_TEST_JTX_UTILITY_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 
@@ -58,5 +57,3 @@ cmdToJSONRPC(std::vector<std::string> const& args, beast::Journal j, unsigned in
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/vault.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_VAULT_H_INCLUDED
-#define XRPL_TEST_JTX_VAULT_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
@@ -86,5 +85,3 @@ struct Vault
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/jtx/xchain_bridge.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_TEST_JTX_XCHAINBRIDGE_H_INCLUDED
-#define XRPL_TEST_JTX_XCHAINBRIDGE_H_INCLUDED
+#pragma once
 
 #include <test/jtx/Account.h>
 #include <test/jtx/amount.h>
@@ -219,5 +218,3 @@ struct XChainBridgeObjects
 }  // namespace jtx
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/nodestore/TestBase.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_NODESTORE_BASE_H_INCLUDED
-#define XRPL_NODESTORE_BASE_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/random.h>
@@ -197,5 +196,3 @@ public:
 
 }  // namespace NodeStore
 }  // namespace xrpl
-
-#endif

src/test/protocol/Issue_test.cpp

@@ -17,14 +17,6 @@
 #define STL_SET_HAS_EMPLACE 0
 #endif
 
-#ifndef XRPL_ASSETS_ENABLE_STD_HASH
-#if BEAST_MAC || BEAST_IOS
-#define XRPL_ASSETS_ENABLE_STD_HASH 0
-#else
-#define XRPL_ASSETS_ENABLE_STD_HASH 1
-#endif
-#endif
-
 namespace xrpl {
 
 class Issue_test : public beast::unit_test::suite

src/test/rpc/GRPCTestClientBase.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_GRPCTESTCLIENTBASE_H
-#define XRPL_GRPCTESTCLIENTBASE_H
+#pragma once
 
 #include <test/jtx/envconfig.h>
 
@@ -26,4 +25,3 @@ struct GRPCTestClientBase
 
 }  // namespace test
 }  // namespace xrpl
-#endif  // XRPL_GRPCTESTCLIENTBASE_H

src/test/shamap/common.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_SHAMAP_TESTS_COMMON_H_INCLUDED
-#define XRPL_SHAMAP_TESTS_COMMON_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/chrono.h>
 #include <xrpl/nodestore/DummyScheduler.h>
@@ -100,5 +99,3 @@ public:
 
 }  // namespace tests
 }  // namespace xrpl
-
-#endif

src/test/unit_test/FileDirGuard.h

@@ -1,5 +1,4 @@
-#ifndef TEST_UNIT_TEST_DIRGUARD_H
-#define TEST_UNIT_TEST_DIRGUARD_H
+#pragma once
 
 #include <test/jtx/TestSuite.h>
 
@@ -154,5 +153,3 @@ public:
 
 }  // namespace detail
 }  // namespace xrpl
-
-#endif  // TEST_UNIT_TEST_DIRGUARD_H

src/test/unit_test/SuiteJournal.h

@@ -1,5 +1,4 @@
-#ifndef TEST_UNIT_TEST_SUITE_JOURNAL_H
-#define TEST_UNIT_TEST_SUITE_JOURNAL_H
+#pragma once
 
 #include <xrpl/beast/unit_test.h>
 #include <xrpl/beast/utility/Journal.h>
@@ -133,5 +132,3 @@ public:
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/test/unit_test/multi_runner.h

@@ -1,5 +1,4 @@
-#ifndef TEST_UNIT_TEST_MULTI_RUNNER_H
-#define TEST_UNIT_TEST_MULTI_RUNNER_H
+#pragma once
 
 #include <xrpl/beast/unit_test/global_suites.h>
 #include <xrpl/beast/unit_test/runner.h>
@@ -334,5 +333,3 @@ multi_runner_child::run_multi(Pred pred)
 
 }  // namespace test
 }  // namespace xrpl
-
-#endif

src/tests/libxrpl/helpers/TestSink.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_DEBUGSINK_H
-#define XRPL_DEBUGSINK_H
+#pragma once
 
 #include <xrpl/beast/utility/Journal.h>
 
@@ -23,4 +22,3 @@ public:
     writeAlways(beast::severities::Severity level, std::string const& text) override;
 };
 }  // namespace xrpl
-#endif  // XRPL_DEBUGSINK_H

src/xrpld/app/consensus/RCLCensorshipDetector.h

@@ -1,5 +1,4 @@
-#ifndef XRPL_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED
-#define XRPL_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED
+#pragma once
 
 #include <xrpl/basics/algorithm.h>
 #include <xrpl/shamap/SHAMap.h>
@@ -122,5 +121,3 @@ public:
 };
 
 }  // namespace xrpl
-
-#endif