From 5865bd017f777491b4a956f9210be0c4161f5442 Mon Sep 17 00:00:00 2001 From: Vito Tumas <5780819+Tapanito@users.noreply.github.com> Date: Fri, 6 Mar 2026 09:25:31 +0100 Subject: [PATCH 1/2] refactor: Update transaction folder structure (#6483) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change reorganizes the `tx/transactors` directory for consistency and discoverability. There are no behavioral changes, this is a pure refactor. Underscores were chosen as the way to separate multi-words as this is the more popular option in C++ projects. Specific changes: - Rename all subdirectories to lowercase/snake_case (`AMM` → `amm`, `Check` → `check`, `NFT` → `nft`, `PermissionedDomain` → `permissioned_domain`, etc.) - Merge `AMM/` and `Offer/` into `dex/`, including `PermissionedDEXHelpers` - Rename `MPT/` → `token/`, absorbing `SetTrust` and `Clawback` - Move top-level transactors into named groups: `account/`, `bridge/`, `credentials/`, `did/`, `escrow/`, `oracle/`, `payment/`, `payment_channel/`, `system/` - Update all include paths across the codebase and `transactions.macro` --- .../xrpl/protocol/detail/transactions.macro | 120 +++++++++--------- include/xrpl/tx/paths/detail/StrandFlow.h | 4 +- .../transactors/{ => account}/DeleteAccount.h | 0 .../tx/transactors/{ => account}/SetAccount.h | 0 .../transactors/{ => account}/SetRegularKey.h | 0 .../transactors/{ => account}/SetSignerList.h | 0 .../transactors/{ => bridge}/XChainBridge.h | 0 .../{Check => check}/CancelCheck.h | 0 .../transactors/{Check => check}/CashCheck.h | 0 .../{Check => check}/CreateCheck.h | 0 .../{ => credentials}/Credentials.h | 0 .../{Delegate => delegate}/DelegateSet.h | 0 .../{Delegate => delegate}/DelegateUtils.h | 0 .../xrpl/tx/transactors/{AMM => dex}/AMMBid.h | 0 .../tx/transactors/{AMM => dex}/AMMClawback.h | 0 .../tx/transactors/{AMM => dex}/AMMContext.h | 0 .../tx/transactors/{AMM => dex}/AMMCreate.h | 0 .../tx/transactors/{AMM => dex}/AMMDelete.h | 0 .../tx/transactors/{AMM => dex}/AMMDeposit.h | 0 .../tx/transactors/{AMM => dex}/AMMHelpers.h | 0 .../tx/transactors/{AMM => dex}/AMMUtils.h | 0 .../tx/transactors/{AMM => dex}/AMMVote.h | 0 .../tx/transactors/{AMM => dex}/AMMWithdraw.h | 0 .../transactors/{Offer => dex}/CancelOffer.h | 0 .../transactors/{Offer => dex}/CreateOffer.h | 0 .../{ => dex}/PermissionedDEXHelpers.h | 0 include/xrpl/tx/transactors/{ => did}/DID.h | 0 .../xrpl/tx/transactors/{ => escrow}/Escrow.h | 0 .../{Lending => lending}/LendingHelpers.h | 0 .../LoanBrokerCoverClawback.h | 0 .../LoanBrokerCoverDeposit.h | 0 .../LoanBrokerCoverWithdraw.h | 0 .../{Lending => lending}/LoanBrokerDelete.h | 0 .../{Lending => lending}/LoanBrokerSet.h | 0 .../{Lending => lending}/LoanDelete.h | 0 .../{Lending => lending}/LoanManage.h | 0 .../{Lending => lending}/LoanPay.h | 0 .../{Lending => lending}/LoanSet.h | 2 +- .../{NFT => nft}/NFTokenAcceptOffer.h | 0 .../tx/transactors/{NFT => nft}/NFTokenBurn.h | 0 .../{NFT => nft}/NFTokenCancelOffer.h | 0 .../{NFT => nft}/NFTokenCreateOffer.h | 0 .../tx/transactors/{NFT => nft}/NFTokenMint.h | 2 +- .../transactors/{NFT => nft}/NFTokenModify.h | 0 .../transactors/{NFT => nft}/NFTokenUtils.h | 0 .../transactors/{ => oracle}/DeleteOracle.h | 0 .../tx/transactors/{ => oracle}/SetOracle.h | 0 .../{ => payment}/DepositPreauth.h | 0 .../tx/transactors/{ => payment}/Payment.h | 0 .../{ => payment_channel}/PayChan.h | 0 .../PermissionedDomainDelete.h | 0 .../PermissionedDomainSet.h | 0 .../xrpl/tx/transactors/{ => system}/Batch.h | 0 .../xrpl/tx/transactors/{ => system}/Change.h | 0 .../transactors/{ => system}/CreateTicket.h | 0 .../transactors/{ => system}/LedgerStateFix.h | 0 .../tx/transactors/{ => token}/Clawback.h | 0 .../{MPT => token}/MPTokenAuthorize.h | 0 .../{MPT => token}/MPTokenIssuanceCreate.h | 0 .../{MPT => token}/MPTokenIssuanceDestroy.h | 0 .../{MPT => token}/MPTokenIssuanceSet.h | 0 .../tx/transactors/{ => token}/SetTrust.h | 0 .../{Vault => vault}/VaultClawback.h | 0 .../{Vault => vault}/VaultCreate.h | 0 .../{Vault => vault}/VaultDelete.h | 0 .../{Vault => vault}/VaultDeposit.h | 0 .../transactors/{Vault => vault}/VaultSet.h | 0 .../{Vault => vault}/VaultWithdraw.h | 0 src/libxrpl/tx/Transactor.cpp | 4 +- src/libxrpl/tx/invariants/AMMInvariant.cpp | 4 +- src/libxrpl/tx/invariants/NFTInvariant.cpp | 2 +- src/libxrpl/tx/paths/Flow.cpp | 2 +- src/libxrpl/tx/paths/OfferStream.cpp | 2 +- .../{ => account}/DeleteAccount.cpp | 14 +- .../transactors/{ => account}/SetAccount.cpp | 4 +- .../{ => account}/SetRegularKey.cpp | 2 +- .../{ => account}/SetSignerList.cpp | 2 +- .../transactors/{ => bridge}/XChainBridge.cpp | 2 +- .../{Check => check}/CancelCheck.cpp | 2 +- .../{Check => check}/CashCheck.cpp | 2 +- .../{Check => check}/CreateCheck.cpp | 2 +- .../{ => credentials}/Credentials.cpp | 2 +- .../{Delegate => delegate}/DelegateSet.cpp | 2 +- .../{Delegate => delegate}/DelegateUtils.cpp | 2 +- .../tx/transactors/{AMM => dex}/AMMBid.cpp | 6 +- .../transactors/{AMM => dex}/AMMClawback.cpp | 8 +- .../tx/transactors/{AMM => dex}/AMMCreate.cpp | 6 +- .../tx/transactors/{AMM => dex}/AMMDelete.cpp | 4 +- .../transactors/{AMM => dex}/AMMDeposit.cpp | 6 +- .../transactors/{AMM => dex}/AMMHelpers.cpp | 2 +- .../tx/transactors/{AMM => dex}/AMMUtils.cpp | 4 +- .../tx/transactors/{AMM => dex}/AMMVote.cpp | 4 +- .../transactors/{AMM => dex}/AMMWithdraw.cpp | 6 +- .../{Offer => dex}/CancelOffer.cpp | 2 +- .../{Offer => dex}/CreateOffer.cpp | 4 +- .../PermissionedDEXHelpers.cpp | 2 +- src/libxrpl/tx/transactors/{ => did}/DID.cpp | 2 +- .../tx/transactors/{ => escrow}/Escrow.cpp | 4 +- .../{Lending => lending}/LendingHelpers.cpp | 4 +- .../LoanBrokerCoverClawback.cpp | 4 +- .../LoanBrokerCoverDeposit.cpp | 4 +- .../LoanBrokerCoverWithdraw.cpp | 6 +- .../{Lending => lending}/LoanBrokerDelete.cpp | 4 +- .../{Lending => lending}/LoanBrokerSet.cpp | 4 +- .../{Lending => lending}/LoanDelete.cpp | 4 +- .../{Lending => lending}/LoanManage.cpp | 4 +- .../{Lending => lending}/LoanPay.cpp | 6 +- .../{Lending => lending}/LoanSet.cpp | 4 +- .../{NFT => nft}/NFTokenAcceptOffer.cpp | 4 +- .../transactors/{NFT => nft}/NFTokenBurn.cpp | 4 +- .../{NFT => nft}/NFTokenCancelOffer.cpp | 4 +- .../{NFT => nft}/NFTokenCreateOffer.cpp | 4 +- .../transactors/{NFT => nft}/NFTokenMint.cpp | 2 +- .../{NFT => nft}/NFTokenModify.cpp | 4 +- .../transactors/{NFT => nft}/NFTokenUtils.cpp | 2 +- .../transactors/{ => oracle}/DeleteOracle.cpp | 2 +- .../tx/transactors/{ => oracle}/SetOracle.cpp | 2 +- .../{ => payment}/DepositPreauth.cpp | 2 +- .../tx/transactors/{ => payment}/Payment.cpp | 6 +- .../{ => payment_channel}/PayChan.cpp | 2 +- .../PermissionedDomainDelete.cpp | 2 +- .../PermissionedDomainSet.cpp | 2 +- .../tx/transactors/{ => system}/Batch.cpp | 2 +- .../tx/transactors/{ => system}/Change.cpp | 2 +- .../transactors/{ => system}/CreateTicket.cpp | 2 +- .../{ => system}/LedgerStateFix.cpp | 4 +- .../tx/transactors/{ => token}/Clawback.cpp | 2 +- .../{MPT => token}/MPTokenAuthorize.cpp | 2 +- .../{MPT => token}/MPTokenIssuanceCreate.cpp | 2 +- .../{MPT => token}/MPTokenIssuanceDestroy.cpp | 2 +- .../{MPT => token}/MPTokenIssuanceSet.cpp | 4 +- .../tx/transactors/{ => token}/SetTrust.cpp | 4 +- .../{Vault => vault}/VaultClawback.cpp | 2 +- .../{Vault => vault}/VaultCreate.cpp | 6 +- .../{Vault => vault}/VaultDelete.cpp | 2 +- .../{Vault => vault}/VaultDeposit.cpp | 4 +- .../transactors/{Vault => vault}/VaultSet.cpp | 2 +- .../{Vault => vault}/VaultWithdraw.cpp | 2 +- src/test/app/AMMCalc_test.cpp | 2 +- src/test/app/AMMClawback_test.cpp | 2 +- src/test/app/AMMExtended_test.cpp | 4 +- src/test/app/AMM_test.cpp | 8 +- src/test/app/Batch_test.cpp | 2 +- src/test/app/FixNFTokenPageLinks_test.cpp | 2 +- src/test/app/LendingHelpers_test.cpp | 6 +- src/test/app/LoanBroker_test.cpp | 2 +- src/test/app/Loan_test.cpp | 6 +- src/test/app/NFTokenAuth_test.cpp | 2 +- src/test/app/NFTokenBurn_test.cpp | 2 +- src/test/app/NFTokenDir_test.cpp | 2 +- src/test/app/NFToken_test.cpp | 2 +- src/test/app/PayStrand_test.cpp | 2 +- src/test/app/PermissionedDEX_test.cpp | 2 +- src/test/app/PermissionedDomains_test.cpp | 2 +- src/test/app/TheoreticalQuality_test.cpp | 2 +- src/test/jtx/impl/AMM.cpp | 4 +- src/test/jtx/impl/ledgerStateFixes.cpp | 2 +- src/test/jtx/impl/token.cpp | 2 +- src/test/rpc/AccountObjects_test.cpp | 2 +- src/xrpld/app/ledger/OrderBookDBImpl.cpp | 2 +- src/xrpld/app/paths/AMMLiquidity.h | 6 +- src/xrpld/app/paths/detail/BookStep.cpp | 2 +- src/xrpld/rpc/detail/RPCHelpers.cpp | 2 +- src/xrpld/rpc/handlers/AMMInfo.cpp | 2 +- src/xrpld/rpc/handlers/AccountObjects.cpp | 2 +- 165 files changed, 222 insertions(+), 222 deletions(-) rename include/xrpl/tx/transactors/{ => account}/DeleteAccount.h (100%) rename include/xrpl/tx/transactors/{ => account}/SetAccount.h (100%) rename include/xrpl/tx/transactors/{ => account}/SetRegularKey.h (100%) rename include/xrpl/tx/transactors/{ => account}/SetSignerList.h (100%) rename include/xrpl/tx/transactors/{ => bridge}/XChainBridge.h (100%) rename include/xrpl/tx/transactors/{Check => check}/CancelCheck.h (100%) rename include/xrpl/tx/transactors/{Check => check}/CashCheck.h (100%) rename include/xrpl/tx/transactors/{Check => check}/CreateCheck.h (100%) rename include/xrpl/tx/transactors/{ => credentials}/Credentials.h (100%) rename include/xrpl/tx/transactors/{Delegate => delegate}/DelegateSet.h (100%) rename include/xrpl/tx/transactors/{Delegate => delegate}/DelegateUtils.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMBid.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMClawback.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMContext.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMCreate.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMDelete.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMDeposit.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMHelpers.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMUtils.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMVote.h (100%) rename include/xrpl/tx/transactors/{AMM => dex}/AMMWithdraw.h (100%) rename include/xrpl/tx/transactors/{Offer => dex}/CancelOffer.h (100%) rename include/xrpl/tx/transactors/{Offer => dex}/CreateOffer.h (100%) rename include/xrpl/tx/transactors/{ => dex}/PermissionedDEXHelpers.h (100%) rename include/xrpl/tx/transactors/{ => did}/DID.h (100%) rename include/xrpl/tx/transactors/{ => escrow}/Escrow.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LendingHelpers.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LoanBrokerCoverClawback.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LoanBrokerCoverDeposit.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LoanBrokerCoverWithdraw.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LoanBrokerDelete.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LoanBrokerSet.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LoanDelete.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LoanManage.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LoanPay.h (100%) rename include/xrpl/tx/transactors/{Lending => lending}/LoanSet.h (96%) rename include/xrpl/tx/transactors/{NFT => nft}/NFTokenAcceptOffer.h (100%) rename include/xrpl/tx/transactors/{NFT => nft}/NFTokenBurn.h (100%) rename include/xrpl/tx/transactors/{NFT => nft}/NFTokenCancelOffer.h (100%) rename include/xrpl/tx/transactors/{NFT => nft}/NFTokenCreateOffer.h (100%) rename include/xrpl/tx/transactors/{NFT => nft}/NFTokenMint.h (94%) rename include/xrpl/tx/transactors/{NFT => nft}/NFTokenModify.h (100%) rename include/xrpl/tx/transactors/{NFT => nft}/NFTokenUtils.h (100%) rename include/xrpl/tx/transactors/{ => oracle}/DeleteOracle.h (100%) rename include/xrpl/tx/transactors/{ => oracle}/SetOracle.h (100%) rename include/xrpl/tx/transactors/{ => payment}/DepositPreauth.h (100%) rename include/xrpl/tx/transactors/{ => payment}/Payment.h (100%) rename include/xrpl/tx/transactors/{ => payment_channel}/PayChan.h (100%) rename include/xrpl/tx/transactors/{PermissionedDomain => permissioned_domain}/PermissionedDomainDelete.h (100%) rename include/xrpl/tx/transactors/{PermissionedDomain => permissioned_domain}/PermissionedDomainSet.h (100%) rename include/xrpl/tx/transactors/{ => system}/Batch.h (100%) rename include/xrpl/tx/transactors/{ => system}/Change.h (100%) rename include/xrpl/tx/transactors/{ => system}/CreateTicket.h (100%) rename include/xrpl/tx/transactors/{ => system}/LedgerStateFix.h (100%) rename include/xrpl/tx/transactors/{ => token}/Clawback.h (100%) rename include/xrpl/tx/transactors/{MPT => token}/MPTokenAuthorize.h (100%) rename include/xrpl/tx/transactors/{MPT => token}/MPTokenIssuanceCreate.h (100%) rename include/xrpl/tx/transactors/{MPT => token}/MPTokenIssuanceDestroy.h (100%) rename include/xrpl/tx/transactors/{MPT => token}/MPTokenIssuanceSet.h (100%) rename include/xrpl/tx/transactors/{ => token}/SetTrust.h (100%) rename include/xrpl/tx/transactors/{Vault => vault}/VaultClawback.h (100%) rename include/xrpl/tx/transactors/{Vault => vault}/VaultCreate.h (100%) rename include/xrpl/tx/transactors/{Vault => vault}/VaultDelete.h (100%) rename include/xrpl/tx/transactors/{Vault => vault}/VaultDeposit.h (100%) rename include/xrpl/tx/transactors/{Vault => vault}/VaultSet.h (100%) rename include/xrpl/tx/transactors/{Vault => vault}/VaultWithdraw.h (100%) rename src/libxrpl/tx/transactors/{ => account}/DeleteAccount.cpp (97%) rename src/libxrpl/tx/transactors/{ => account}/SetAccount.cpp (99%) rename src/libxrpl/tx/transactors/{ => account}/SetRegularKey.cpp (96%) rename src/libxrpl/tx/transactors/{ => account}/SetSignerList.cpp (99%) rename src/libxrpl/tx/transactors/{ => bridge}/XChainBridge.cpp (99%) rename src/libxrpl/tx/transactors/{Check => check}/CancelCheck.cpp (98%) rename src/libxrpl/tx/transactors/{Check => check}/CashCheck.cpp (99%) rename src/libxrpl/tx/transactors/{Check => check}/CreateCheck.cpp (99%) rename src/libxrpl/tx/transactors/{ => credentials}/Credentials.cpp (99%) rename src/libxrpl/tx/transactors/{Delegate => delegate}/DelegateSet.cpp (98%) rename src/libxrpl/tx/transactors/{Delegate => delegate}/DelegateUtils.cpp (95%) rename src/libxrpl/tx/transactors/{AMM => dex}/AMMBid.cpp (98%) rename src/libxrpl/tx/transactors/{AMM => dex}/AMMClawback.cpp (98%) rename src/libxrpl/tx/transactors/{AMM => dex}/AMMCreate.cpp (98%) rename src/libxrpl/tx/transactors/{AMM => dex}/AMMDelete.cpp (92%) rename src/libxrpl/tx/transactors/{AMM => dex}/AMMDeposit.cpp (99%) rename src/libxrpl/tx/transactors/{AMM => dex}/AMMHelpers.cpp (99%) rename src/libxrpl/tx/transactors/{AMM => dex}/AMMUtils.cpp (99%) rename src/libxrpl/tx/transactors/{AMM => dex}/AMMVote.cpp (98%) rename src/libxrpl/tx/transactors/{AMM => dex}/AMMWithdraw.cpp (99%) rename src/libxrpl/tx/transactors/{Offer => dex}/CancelOffer.cpp (96%) rename src/libxrpl/tx/transactors/{Offer => dex}/CreateOffer.cpp (99%) rename src/libxrpl/tx/transactors/{PermissionedDomain => dex}/PermissionedDEXHelpers.cpp (97%) rename src/libxrpl/tx/transactors/{ => did}/DID.cpp (99%) rename src/libxrpl/tx/transactors/{ => escrow}/Escrow.cpp (99%) rename src/libxrpl/tx/transactors/{Lending => lending}/LendingHelpers.cpp (99%) rename src/libxrpl/tx/transactors/{Lending => lending}/LoanBrokerCoverClawback.cpp (98%) rename src/libxrpl/tx/transactors/{Lending => lending}/LoanBrokerCoverDeposit.cpp (96%) rename src/libxrpl/tx/transactors/{Lending => lending}/LoanBrokerCoverWithdraw.cpp (96%) rename src/libxrpl/tx/transactors/{Lending => lending}/LoanBrokerDelete.cpp (97%) rename src/libxrpl/tx/transactors/{Lending => lending}/LoanBrokerSet.cpp (98%) rename src/libxrpl/tx/transactors/{Lending => lending}/LoanDelete.cpp (97%) rename src/libxrpl/tx/transactors/{Lending => lending}/LoanManage.cpp (99%) rename src/libxrpl/tx/transactors/{Lending => lending}/LoanPay.cpp (99%) rename src/libxrpl/tx/transactors/{Lending => lending}/LoanSet.cpp (99%) rename src/libxrpl/tx/transactors/{NFT => nft}/NFTokenAcceptOffer.cpp (99%) rename src/libxrpl/tx/transactors/{NFT => nft}/NFTokenBurn.cpp (96%) rename src/libxrpl/tx/transactors/{NFT => nft}/NFTokenCancelOffer.cpp (95%) rename src/libxrpl/tx/transactors/{NFT => nft}/NFTokenCreateOffer.cpp (94%) rename src/libxrpl/tx/transactors/{NFT => nft}/NFTokenMint.cpp (99%) rename src/libxrpl/tx/transactors/{NFT => nft}/NFTokenModify.cpp (93%) rename src/libxrpl/tx/transactors/{NFT => nft}/NFTokenUtils.cpp (99%) rename src/libxrpl/tx/transactors/{ => oracle}/DeleteOracle.cpp (97%) rename src/libxrpl/tx/transactors/{ => oracle}/SetOracle.cpp (99%) rename src/libxrpl/tx/transactors/{ => payment}/DepositPreauth.cpp (99%) rename src/libxrpl/tx/transactors/{ => payment}/Payment.cpp (99%) rename src/libxrpl/tx/transactors/{ => payment_channel}/PayChan.cpp (99%) rename src/libxrpl/tx/transactors/{PermissionedDomain => permissioned_domain}/PermissionedDomainDelete.cpp (95%) rename src/libxrpl/tx/transactors/{PermissionedDomain => permissioned_domain}/PermissionedDomainSet.cpp (98%) rename src/libxrpl/tx/transactors/{ => system}/Batch.cpp (99%) rename src/libxrpl/tx/transactors/{ => system}/Change.cpp (99%) rename src/libxrpl/tx/transactors/{ => system}/CreateTicket.cpp (98%) rename src/libxrpl/tx/transactors/{ => system}/LedgerStateFix.cpp (93%) rename src/libxrpl/tx/transactors/{ => token}/Clawback.cpp (99%) rename src/libxrpl/tx/transactors/{MPT => token}/MPTokenAuthorize.cpp (98%) rename src/libxrpl/tx/transactors/{MPT => token}/MPTokenIssuanceCreate.cpp (98%) rename src/libxrpl/tx/transactors/{MPT => token}/MPTokenIssuanceDestroy.cpp (95%) rename src/libxrpl/tx/transactors/{MPT => token}/MPTokenIssuanceSet.cpp (98%) rename src/libxrpl/tx/transactors/{ => token}/SetTrust.cpp (99%) rename src/libxrpl/tx/transactors/{Vault => vault}/VaultClawback.cpp (99%) rename src/libxrpl/tx/transactors/{Vault => vault}/VaultCreate.cpp (97%) rename src/libxrpl/tx/transactors/{Vault => vault}/VaultDelete.cpp (99%) rename src/libxrpl/tx/transactors/{Vault => vault}/VaultDeposit.cpp (98%) rename src/libxrpl/tx/transactors/{Vault => vault}/VaultSet.cpp (99%) rename src/libxrpl/tx/transactors/{Vault => vault}/VaultWithdraw.cpp (99%) diff --git a/include/xrpl/protocol/detail/transactions.macro b/include/xrpl/protocol/detail/transactions.macro index b696a1d1c2..08832acde7 100644 --- a/include/xrpl/protocol/detail/transactions.macro +++ b/include/xrpl/protocol/detail/transactions.macro @@ -22,7 +22,7 @@ /** This transaction type executes a payment. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttPAYMENT, 0, Payment, Delegation::delegable, @@ -42,7 +42,7 @@ TRANSACTION(ttPAYMENT, 0, Payment, /** This transaction type creates an escrow object. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate, Delegation::delegable, @@ -73,7 +73,7 @@ TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish, /** This transaction type adjusts various account settings. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttACCOUNT_SET, 3, AccountSet, Delegation::notDelegable, @@ -94,7 +94,7 @@ TRANSACTION(ttACCOUNT_SET, 3, AccountSet, /** This transaction type cancels an existing escrow. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel, Delegation::delegable, @@ -107,7 +107,7 @@ TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel, /** This transaction type sets or clears an account's "regular key". */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey, Delegation::notDelegable, @@ -121,7 +121,7 @@ TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey, /** This transaction type creates an offer to trade one asset for another. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttOFFER_CREATE, 7, OfferCreate, Delegation::delegable, @@ -137,7 +137,7 @@ TRANSACTION(ttOFFER_CREATE, 7, OfferCreate, /** This transaction type cancels existing offers to trade one asset for another. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel, Delegation::delegable, @@ -151,7 +151,7 @@ TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel, /** This transaction type creates a new set of tickets. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttTICKET_CREATE, 10, TicketCreate, Delegation::delegable, @@ -167,7 +167,7 @@ TRANSACTION(ttTICKET_CREATE, 10, TicketCreate, // The SignerEntries are optional because a SignerList is deleted by // setting the SignerQuorum to zero and omitting SignerEntries. #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet, Delegation::notDelegable, @@ -180,7 +180,7 @@ TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet, /** This transaction type creates a new unidirectional XRP payment channel. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate, Delegation::delegable, @@ -222,7 +222,7 @@ TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim, /** This transaction type creates a new check. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCHECK_CREATE, 16, CheckCreate, Delegation::delegable, @@ -238,7 +238,7 @@ TRANSACTION(ttCHECK_CREATE, 16, CheckCreate, /** This transaction type cashes an existing check. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCHECK_CASH, 17, CheckCash, Delegation::delegable, @@ -252,7 +252,7 @@ TRANSACTION(ttCHECK_CASH, 17, CheckCash, /** This transaction type cancels an existing check. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel, Delegation::delegable, @@ -264,7 +264,7 @@ TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel, /** This transaction type grants or revokes authorization to transfer funds. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth, Delegation::delegable, @@ -279,7 +279,7 @@ TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth, /** This transaction type modifies a trustline between two accounts. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttTRUST_SET, 20, TrustSet, Delegation::delegable, @@ -293,7 +293,7 @@ TRANSACTION(ttTRUST_SET, 20, TrustSet, /** This transaction type deletes an existing account. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete, Delegation::notDelegable, @@ -309,7 +309,7 @@ TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete, /** This transaction mints a new NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint, Delegation::delegable, @@ -327,7 +327,7 @@ TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint, /** This transaction burns (i.e. destroys) an existing NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn, Delegation::delegable, @@ -340,7 +340,7 @@ TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn, /** This transaction creates a new offer to buy or sell an NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer, Delegation::delegable, @@ -356,7 +356,7 @@ TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer, /** This transaction cancels an existing offer to buy or sell an existing NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer, Delegation::delegable, @@ -368,7 +368,7 @@ TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer, /** This transaction accepts an existing offer to buy or sell an existing NFT. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer, Delegation::delegable, @@ -382,7 +382,7 @@ TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer, /** This transaction claws back issued tokens. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCLAWBACK, 30, Clawback, Delegation::delegable, @@ -395,7 +395,7 @@ TRANSACTION(ttCLAWBACK, 30, Clawback, /** This transaction claws back tokens from an AMM pool. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback, Delegation::delegable, @@ -410,7 +410,7 @@ TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback, /** This transaction type creates an AMM instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_CREATE, 35, AMMCreate, Delegation::delegable, @@ -424,7 +424,7 @@ TRANSACTION(ttAMM_CREATE, 35, AMMCreate, /** This transaction type deposits into an AMM instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit, Delegation::delegable, @@ -442,7 +442,7 @@ TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit, /** This transaction type withdraws from an AMM instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw, Delegation::delegable, @@ -459,7 +459,7 @@ TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw, /** This transaction type votes for the trading fee */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_VOTE, 38, AMMVote, Delegation::delegable, @@ -473,7 +473,7 @@ TRANSACTION(ttAMM_VOTE, 38, AMMVote, /** This transaction type bids for the auction slot */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_BID, 39, AMMBid, Delegation::delegable, @@ -489,7 +489,7 @@ TRANSACTION(ttAMM_BID, 39, AMMBid, /** This transaction type deletes AMM in the empty state */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMM_DELETE, 40, AMMDelete, Delegation::delegable, @@ -502,7 +502,7 @@ TRANSACTION(ttAMM_DELETE, 40, AMMDelete, /** This transactions creates a crosschain sequence number */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttXCHAIN_CREATE_CLAIM_ID, 41, XChainCreateClaimID, Delegation::delegable, @@ -617,7 +617,7 @@ TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge, /** This transaction type creates or updates a DID */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttDID_SET, 49, DIDSet, Delegation::delegable, @@ -638,7 +638,7 @@ TRANSACTION(ttDID_DELETE, 50, DIDDelete, /** This transaction type creates an Oracle instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttORACLE_SET, 51, OracleSet, Delegation::delegable, @@ -655,7 +655,7 @@ TRANSACTION(ttORACLE_SET, 51, OracleSet, /** This transaction type deletes an Oracle instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttORACLE_DELETE, 52, OracleDelete, Delegation::delegable, @@ -667,7 +667,7 @@ TRANSACTION(ttORACLE_DELETE, 52, OracleDelete, /** This transaction type fixes a problem in the ledger state */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix, Delegation::delegable, @@ -680,7 +680,7 @@ TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix, /** This transaction type creates a MPTokensIssuance instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate, Delegation::delegable, @@ -697,7 +697,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate, /** This transaction type destroys a MPTokensIssuance instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy, Delegation::delegable, @@ -709,7 +709,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy, /** This transaction type sets flags on a MPTokensIssuance or MPToken instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet, Delegation::delegable, @@ -726,7 +726,7 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet, /** This transaction type authorizes a MPToken instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize, Delegation::delegable, @@ -739,7 +739,7 @@ TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize, /** This transaction type create an Credential instance */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate, Delegation::delegable, @@ -775,7 +775,7 @@ TRANSACTION(ttCREDENTIAL_DELETE, 60, CredentialDelete, /** This transaction type modify a NFToken */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify, Delegation::delegable, @@ -789,7 +789,7 @@ TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify, /** This transaction type creates or modifies a Permissioned Domain */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet, Delegation::delegable, @@ -802,7 +802,7 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet, /** This transaction type deletes a Permissioned Domain */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete, Delegation::delegable, @@ -814,7 +814,7 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete, /** This transaction type delegates authorized account specified permissions */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttDELEGATE_SET, 64, DelegateSet, Delegation::notDelegable, @@ -827,7 +827,7 @@ TRANSACTION(ttDELEGATE_SET, 64, DelegateSet, /** This transaction creates a single asset vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_CREATE, 65, VaultCreate, Delegation::delegable, @@ -845,7 +845,7 @@ TRANSACTION(ttVAULT_CREATE, 65, VaultCreate, /** This transaction updates a single asset vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_SET, 66, VaultSet, Delegation::delegable, @@ -860,7 +860,7 @@ TRANSACTION(ttVAULT_SET, 66, VaultSet, /** This transaction deletes a single asset vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_DELETE, 67, VaultDelete, Delegation::delegable, @@ -872,7 +872,7 @@ TRANSACTION(ttVAULT_DELETE, 67, VaultDelete, /** This transaction trades assets for shares with a vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit, Delegation::delegable, @@ -885,7 +885,7 @@ TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit, /** This transaction trades shares for assets with a vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw, Delegation::delegable, @@ -900,7 +900,7 @@ TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw, /** This transaction claws back tokens from a vault. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback, Delegation::delegable, @@ -914,7 +914,7 @@ TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback, /** This transaction type batches together transactions. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttBATCH, 71, Batch, Delegation::notDelegable, @@ -929,7 +929,7 @@ TRANSACTION(ttBATCH, 71, Batch, /** This transaction creates and updates a Loan Broker */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet, Delegation::delegable, @@ -946,7 +946,7 @@ TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet, /** This transaction deletes a Loan Broker */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete, Delegation::delegable, @@ -957,7 +957,7 @@ TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete, /** This transaction deposits First Loss Capital into a Loan Broker */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit, Delegation::delegable, @@ -969,7 +969,7 @@ TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit, /** This transaction withdraws First Loss Capital from a Loan Broker */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw, Delegation::delegable, @@ -984,7 +984,7 @@ TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw, /** This transaction claws back First Loss Capital from a Loan Broker to the issuer of the capital */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback, Delegation::delegable, @@ -996,7 +996,7 @@ TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback, /** This transaction creates a Loan */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_SET, 80, LoanSet, Delegation::delegable, @@ -1023,7 +1023,7 @@ TRANSACTION(ttLOAN_SET, 80, LoanSet, /** This transaction deletes an existing Loan */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_DELETE, 81, LoanDelete, Delegation::delegable, @@ -1034,7 +1034,7 @@ TRANSACTION(ttLOAN_DELETE, 81, LoanDelete, /** This transaction is used to change the delinquency status of an existing Loan */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_MANAGE, 82, LoanManage, Delegation::delegable, @@ -1048,7 +1048,7 @@ TRANSACTION(ttLOAN_MANAGE, 82, LoanManage, /** The Borrower uses this transaction to make a Payment on the Loan. */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttLOAN_PAY, 84, LoanPay, Delegation::delegable, @@ -1063,7 +1063,7 @@ TRANSACTION(ttLOAN_PAY, 84, LoanPay, For details, see: https://xrpl.org/amendments.html */ #if TRANSACTION_INCLUDE -# include +# include #endif TRANSACTION(ttAMENDMENT, 100, EnableAmendment, Delegation::notDelegable, diff --git a/include/xrpl/tx/paths/detail/StrandFlow.h b/include/xrpl/tx/paths/detail/StrandFlow.h index 929aca0663..67e333f2e6 100644 --- a/include/xrpl/tx/paths/detail/StrandFlow.h +++ b/include/xrpl/tx/paths/detail/StrandFlow.h @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/include/xrpl/tx/transactors/DeleteAccount.h b/include/xrpl/tx/transactors/account/DeleteAccount.h similarity index 100% rename from include/xrpl/tx/transactors/DeleteAccount.h rename to include/xrpl/tx/transactors/account/DeleteAccount.h diff --git a/include/xrpl/tx/transactors/SetAccount.h b/include/xrpl/tx/transactors/account/SetAccount.h similarity index 100% rename from include/xrpl/tx/transactors/SetAccount.h rename to include/xrpl/tx/transactors/account/SetAccount.h diff --git a/include/xrpl/tx/transactors/SetRegularKey.h b/include/xrpl/tx/transactors/account/SetRegularKey.h similarity index 100% rename from include/xrpl/tx/transactors/SetRegularKey.h rename to include/xrpl/tx/transactors/account/SetRegularKey.h diff --git a/include/xrpl/tx/transactors/SetSignerList.h b/include/xrpl/tx/transactors/account/SetSignerList.h similarity index 100% rename from include/xrpl/tx/transactors/SetSignerList.h rename to include/xrpl/tx/transactors/account/SetSignerList.h diff --git a/include/xrpl/tx/transactors/XChainBridge.h b/include/xrpl/tx/transactors/bridge/XChainBridge.h similarity index 100% rename from include/xrpl/tx/transactors/XChainBridge.h rename to include/xrpl/tx/transactors/bridge/XChainBridge.h diff --git a/include/xrpl/tx/transactors/Check/CancelCheck.h b/include/xrpl/tx/transactors/check/CancelCheck.h similarity index 100% rename from include/xrpl/tx/transactors/Check/CancelCheck.h rename to include/xrpl/tx/transactors/check/CancelCheck.h diff --git a/include/xrpl/tx/transactors/Check/CashCheck.h b/include/xrpl/tx/transactors/check/CashCheck.h similarity index 100% rename from include/xrpl/tx/transactors/Check/CashCheck.h rename to include/xrpl/tx/transactors/check/CashCheck.h diff --git a/include/xrpl/tx/transactors/Check/CreateCheck.h b/include/xrpl/tx/transactors/check/CreateCheck.h similarity index 100% rename from include/xrpl/tx/transactors/Check/CreateCheck.h rename to include/xrpl/tx/transactors/check/CreateCheck.h diff --git a/include/xrpl/tx/transactors/Credentials.h b/include/xrpl/tx/transactors/credentials/Credentials.h similarity index 100% rename from include/xrpl/tx/transactors/Credentials.h rename to include/xrpl/tx/transactors/credentials/Credentials.h diff --git a/include/xrpl/tx/transactors/Delegate/DelegateSet.h b/include/xrpl/tx/transactors/delegate/DelegateSet.h similarity index 100% rename from include/xrpl/tx/transactors/Delegate/DelegateSet.h rename to include/xrpl/tx/transactors/delegate/DelegateSet.h diff --git a/include/xrpl/tx/transactors/Delegate/DelegateUtils.h b/include/xrpl/tx/transactors/delegate/DelegateUtils.h similarity index 100% rename from include/xrpl/tx/transactors/Delegate/DelegateUtils.h rename to include/xrpl/tx/transactors/delegate/DelegateUtils.h diff --git a/include/xrpl/tx/transactors/AMM/AMMBid.h b/include/xrpl/tx/transactors/dex/AMMBid.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMBid.h rename to include/xrpl/tx/transactors/dex/AMMBid.h diff --git a/include/xrpl/tx/transactors/AMM/AMMClawback.h b/include/xrpl/tx/transactors/dex/AMMClawback.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMClawback.h rename to include/xrpl/tx/transactors/dex/AMMClawback.h diff --git a/include/xrpl/tx/transactors/AMM/AMMContext.h b/include/xrpl/tx/transactors/dex/AMMContext.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMContext.h rename to include/xrpl/tx/transactors/dex/AMMContext.h diff --git a/include/xrpl/tx/transactors/AMM/AMMCreate.h b/include/xrpl/tx/transactors/dex/AMMCreate.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMCreate.h rename to include/xrpl/tx/transactors/dex/AMMCreate.h diff --git a/include/xrpl/tx/transactors/AMM/AMMDelete.h b/include/xrpl/tx/transactors/dex/AMMDelete.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMDelete.h rename to include/xrpl/tx/transactors/dex/AMMDelete.h diff --git a/include/xrpl/tx/transactors/AMM/AMMDeposit.h b/include/xrpl/tx/transactors/dex/AMMDeposit.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMDeposit.h rename to include/xrpl/tx/transactors/dex/AMMDeposit.h diff --git a/include/xrpl/tx/transactors/AMM/AMMHelpers.h b/include/xrpl/tx/transactors/dex/AMMHelpers.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMHelpers.h rename to include/xrpl/tx/transactors/dex/AMMHelpers.h diff --git a/include/xrpl/tx/transactors/AMM/AMMUtils.h b/include/xrpl/tx/transactors/dex/AMMUtils.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMUtils.h rename to include/xrpl/tx/transactors/dex/AMMUtils.h diff --git a/include/xrpl/tx/transactors/AMM/AMMVote.h b/include/xrpl/tx/transactors/dex/AMMVote.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMVote.h rename to include/xrpl/tx/transactors/dex/AMMVote.h diff --git a/include/xrpl/tx/transactors/AMM/AMMWithdraw.h b/include/xrpl/tx/transactors/dex/AMMWithdraw.h similarity index 100% rename from include/xrpl/tx/transactors/AMM/AMMWithdraw.h rename to include/xrpl/tx/transactors/dex/AMMWithdraw.h diff --git a/include/xrpl/tx/transactors/Offer/CancelOffer.h b/include/xrpl/tx/transactors/dex/CancelOffer.h similarity index 100% rename from include/xrpl/tx/transactors/Offer/CancelOffer.h rename to include/xrpl/tx/transactors/dex/CancelOffer.h diff --git a/include/xrpl/tx/transactors/Offer/CreateOffer.h b/include/xrpl/tx/transactors/dex/CreateOffer.h similarity index 100% rename from include/xrpl/tx/transactors/Offer/CreateOffer.h rename to include/xrpl/tx/transactors/dex/CreateOffer.h diff --git a/include/xrpl/tx/transactors/PermissionedDEXHelpers.h b/include/xrpl/tx/transactors/dex/PermissionedDEXHelpers.h similarity index 100% rename from include/xrpl/tx/transactors/PermissionedDEXHelpers.h rename to include/xrpl/tx/transactors/dex/PermissionedDEXHelpers.h diff --git a/include/xrpl/tx/transactors/DID.h b/include/xrpl/tx/transactors/did/DID.h similarity index 100% rename from include/xrpl/tx/transactors/DID.h rename to include/xrpl/tx/transactors/did/DID.h diff --git a/include/xrpl/tx/transactors/Escrow.h b/include/xrpl/tx/transactors/escrow/Escrow.h similarity index 100% rename from include/xrpl/tx/transactors/Escrow.h rename to include/xrpl/tx/transactors/escrow/Escrow.h diff --git a/include/xrpl/tx/transactors/Lending/LendingHelpers.h b/include/xrpl/tx/transactors/lending/LendingHelpers.h similarity index 100% rename from include/xrpl/tx/transactors/Lending/LendingHelpers.h rename to include/xrpl/tx/transactors/lending/LendingHelpers.h diff --git a/include/xrpl/tx/transactors/Lending/LoanBrokerCoverClawback.h b/include/xrpl/tx/transactors/lending/LoanBrokerCoverClawback.h similarity index 100% rename from include/xrpl/tx/transactors/Lending/LoanBrokerCoverClawback.h rename to include/xrpl/tx/transactors/lending/LoanBrokerCoverClawback.h diff --git a/include/xrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.h b/include/xrpl/tx/transactors/lending/LoanBrokerCoverDeposit.h similarity index 100% rename from include/xrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.h rename to include/xrpl/tx/transactors/lending/LoanBrokerCoverDeposit.h diff --git a/include/xrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.h b/include/xrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.h similarity index 100% rename from include/xrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.h rename to include/xrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.h diff --git a/include/xrpl/tx/transactors/Lending/LoanBrokerDelete.h b/include/xrpl/tx/transactors/lending/LoanBrokerDelete.h similarity index 100% rename from include/xrpl/tx/transactors/Lending/LoanBrokerDelete.h rename to include/xrpl/tx/transactors/lending/LoanBrokerDelete.h diff --git a/include/xrpl/tx/transactors/Lending/LoanBrokerSet.h b/include/xrpl/tx/transactors/lending/LoanBrokerSet.h similarity index 100% rename from include/xrpl/tx/transactors/Lending/LoanBrokerSet.h rename to include/xrpl/tx/transactors/lending/LoanBrokerSet.h diff --git a/include/xrpl/tx/transactors/Lending/LoanDelete.h b/include/xrpl/tx/transactors/lending/LoanDelete.h similarity index 100% rename from include/xrpl/tx/transactors/Lending/LoanDelete.h rename to include/xrpl/tx/transactors/lending/LoanDelete.h diff --git a/include/xrpl/tx/transactors/Lending/LoanManage.h b/include/xrpl/tx/transactors/lending/LoanManage.h similarity index 100% rename from include/xrpl/tx/transactors/Lending/LoanManage.h rename to include/xrpl/tx/transactors/lending/LoanManage.h diff --git a/include/xrpl/tx/transactors/Lending/LoanPay.h b/include/xrpl/tx/transactors/lending/LoanPay.h similarity index 100% rename from include/xrpl/tx/transactors/Lending/LoanPay.h rename to include/xrpl/tx/transactors/lending/LoanPay.h diff --git a/include/xrpl/tx/transactors/Lending/LoanSet.h b/include/xrpl/tx/transactors/lending/LoanSet.h similarity index 96% rename from include/xrpl/tx/transactors/Lending/LoanSet.h rename to include/xrpl/tx/transactors/lending/LoanSet.h index e9916b9d6b..86101d0735 100644 --- a/include/xrpl/tx/transactors/Lending/LoanSet.h +++ b/include/xrpl/tx/transactors/lending/LoanSet.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace xrpl { diff --git a/include/xrpl/tx/transactors/NFT/NFTokenAcceptOffer.h b/include/xrpl/tx/transactors/nft/NFTokenAcceptOffer.h similarity index 100% rename from include/xrpl/tx/transactors/NFT/NFTokenAcceptOffer.h rename to include/xrpl/tx/transactors/nft/NFTokenAcceptOffer.h diff --git a/include/xrpl/tx/transactors/NFT/NFTokenBurn.h b/include/xrpl/tx/transactors/nft/NFTokenBurn.h similarity index 100% rename from include/xrpl/tx/transactors/NFT/NFTokenBurn.h rename to include/xrpl/tx/transactors/nft/NFTokenBurn.h diff --git a/include/xrpl/tx/transactors/NFT/NFTokenCancelOffer.h b/include/xrpl/tx/transactors/nft/NFTokenCancelOffer.h similarity index 100% rename from include/xrpl/tx/transactors/NFT/NFTokenCancelOffer.h rename to include/xrpl/tx/transactors/nft/NFTokenCancelOffer.h diff --git a/include/xrpl/tx/transactors/NFT/NFTokenCreateOffer.h b/include/xrpl/tx/transactors/nft/NFTokenCreateOffer.h similarity index 100% rename from include/xrpl/tx/transactors/NFT/NFTokenCreateOffer.h rename to include/xrpl/tx/transactors/nft/NFTokenCreateOffer.h diff --git a/include/xrpl/tx/transactors/NFT/NFTokenMint.h b/include/xrpl/tx/transactors/nft/NFTokenMint.h similarity index 94% rename from include/xrpl/tx/transactors/NFT/NFTokenMint.h rename to include/xrpl/tx/transactors/nft/NFTokenMint.h index c3a7db4581..d4eeba2bf0 100644 --- a/include/xrpl/tx/transactors/NFT/NFTokenMint.h +++ b/include/xrpl/tx/transactors/nft/NFTokenMint.h @@ -2,7 +2,7 @@ #include #include -#include +#include namespace xrpl { diff --git a/include/xrpl/tx/transactors/NFT/NFTokenModify.h b/include/xrpl/tx/transactors/nft/NFTokenModify.h similarity index 100% rename from include/xrpl/tx/transactors/NFT/NFTokenModify.h rename to include/xrpl/tx/transactors/nft/NFTokenModify.h diff --git a/include/xrpl/tx/transactors/NFT/NFTokenUtils.h b/include/xrpl/tx/transactors/nft/NFTokenUtils.h similarity index 100% rename from include/xrpl/tx/transactors/NFT/NFTokenUtils.h rename to include/xrpl/tx/transactors/nft/NFTokenUtils.h diff --git a/include/xrpl/tx/transactors/DeleteOracle.h b/include/xrpl/tx/transactors/oracle/DeleteOracle.h similarity index 100% rename from include/xrpl/tx/transactors/DeleteOracle.h rename to include/xrpl/tx/transactors/oracle/DeleteOracle.h diff --git a/include/xrpl/tx/transactors/SetOracle.h b/include/xrpl/tx/transactors/oracle/SetOracle.h similarity index 100% rename from include/xrpl/tx/transactors/SetOracle.h rename to include/xrpl/tx/transactors/oracle/SetOracle.h diff --git a/include/xrpl/tx/transactors/DepositPreauth.h b/include/xrpl/tx/transactors/payment/DepositPreauth.h similarity index 100% rename from include/xrpl/tx/transactors/DepositPreauth.h rename to include/xrpl/tx/transactors/payment/DepositPreauth.h diff --git a/include/xrpl/tx/transactors/Payment.h b/include/xrpl/tx/transactors/payment/Payment.h similarity index 100% rename from include/xrpl/tx/transactors/Payment.h rename to include/xrpl/tx/transactors/payment/Payment.h diff --git a/include/xrpl/tx/transactors/PayChan.h b/include/xrpl/tx/transactors/payment_channel/PayChan.h similarity index 100% rename from include/xrpl/tx/transactors/PayChan.h rename to include/xrpl/tx/transactors/payment_channel/PayChan.h diff --git a/include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.h b/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.h similarity index 100% rename from include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.h rename to include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.h diff --git a/include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.h b/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.h similarity index 100% rename from include/xrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.h rename to include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.h diff --git a/include/xrpl/tx/transactors/Batch.h b/include/xrpl/tx/transactors/system/Batch.h similarity index 100% rename from include/xrpl/tx/transactors/Batch.h rename to include/xrpl/tx/transactors/system/Batch.h diff --git a/include/xrpl/tx/transactors/Change.h b/include/xrpl/tx/transactors/system/Change.h similarity index 100% rename from include/xrpl/tx/transactors/Change.h rename to include/xrpl/tx/transactors/system/Change.h diff --git a/include/xrpl/tx/transactors/CreateTicket.h b/include/xrpl/tx/transactors/system/CreateTicket.h similarity index 100% rename from include/xrpl/tx/transactors/CreateTicket.h rename to include/xrpl/tx/transactors/system/CreateTicket.h diff --git a/include/xrpl/tx/transactors/LedgerStateFix.h b/include/xrpl/tx/transactors/system/LedgerStateFix.h similarity index 100% rename from include/xrpl/tx/transactors/LedgerStateFix.h rename to include/xrpl/tx/transactors/system/LedgerStateFix.h diff --git a/include/xrpl/tx/transactors/Clawback.h b/include/xrpl/tx/transactors/token/Clawback.h similarity index 100% rename from include/xrpl/tx/transactors/Clawback.h rename to include/xrpl/tx/transactors/token/Clawback.h diff --git a/include/xrpl/tx/transactors/MPT/MPTokenAuthorize.h b/include/xrpl/tx/transactors/token/MPTokenAuthorize.h similarity index 100% rename from include/xrpl/tx/transactors/MPT/MPTokenAuthorize.h rename to include/xrpl/tx/transactors/token/MPTokenAuthorize.h diff --git a/include/xrpl/tx/transactors/MPT/MPTokenIssuanceCreate.h b/include/xrpl/tx/transactors/token/MPTokenIssuanceCreate.h similarity index 100% rename from include/xrpl/tx/transactors/MPT/MPTokenIssuanceCreate.h rename to include/xrpl/tx/transactors/token/MPTokenIssuanceCreate.h diff --git a/include/xrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.h b/include/xrpl/tx/transactors/token/MPTokenIssuanceDestroy.h similarity index 100% rename from include/xrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.h rename to include/xrpl/tx/transactors/token/MPTokenIssuanceDestroy.h diff --git a/include/xrpl/tx/transactors/MPT/MPTokenIssuanceSet.h b/include/xrpl/tx/transactors/token/MPTokenIssuanceSet.h similarity index 100% rename from include/xrpl/tx/transactors/MPT/MPTokenIssuanceSet.h rename to include/xrpl/tx/transactors/token/MPTokenIssuanceSet.h diff --git a/include/xrpl/tx/transactors/SetTrust.h b/include/xrpl/tx/transactors/token/SetTrust.h similarity index 100% rename from include/xrpl/tx/transactors/SetTrust.h rename to include/xrpl/tx/transactors/token/SetTrust.h diff --git a/include/xrpl/tx/transactors/Vault/VaultClawback.h b/include/xrpl/tx/transactors/vault/VaultClawback.h similarity index 100% rename from include/xrpl/tx/transactors/Vault/VaultClawback.h rename to include/xrpl/tx/transactors/vault/VaultClawback.h diff --git a/include/xrpl/tx/transactors/Vault/VaultCreate.h b/include/xrpl/tx/transactors/vault/VaultCreate.h similarity index 100% rename from include/xrpl/tx/transactors/Vault/VaultCreate.h rename to include/xrpl/tx/transactors/vault/VaultCreate.h diff --git a/include/xrpl/tx/transactors/Vault/VaultDelete.h b/include/xrpl/tx/transactors/vault/VaultDelete.h similarity index 100% rename from include/xrpl/tx/transactors/Vault/VaultDelete.h rename to include/xrpl/tx/transactors/vault/VaultDelete.h diff --git a/include/xrpl/tx/transactors/Vault/VaultDeposit.h b/include/xrpl/tx/transactors/vault/VaultDeposit.h similarity index 100% rename from include/xrpl/tx/transactors/Vault/VaultDeposit.h rename to include/xrpl/tx/transactors/vault/VaultDeposit.h diff --git a/include/xrpl/tx/transactors/Vault/VaultSet.h b/include/xrpl/tx/transactors/vault/VaultSet.h similarity index 100% rename from include/xrpl/tx/transactors/Vault/VaultSet.h rename to include/xrpl/tx/transactors/vault/VaultSet.h diff --git a/include/xrpl/tx/transactors/Vault/VaultWithdraw.h b/include/xrpl/tx/transactors/vault/VaultWithdraw.h similarity index 100% rename from include/xrpl/tx/transactors/Vault/VaultWithdraw.h rename to include/xrpl/tx/transactors/vault/VaultWithdraw.h diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp index 9da1028b3a..3ddac350e8 100644 --- a/src/libxrpl/tx/Transactor.cpp +++ b/src/libxrpl/tx/Transactor.cpp @@ -14,8 +14,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/invariants/AMMInvariant.cpp b/src/libxrpl/tx/invariants/AMMInvariant.cpp index d98c0a6f50..60d05f298c 100644 --- a/src/libxrpl/tx/invariants/AMMInvariant.cpp +++ b/src/libxrpl/tx/invariants/AMMInvariant.cpp @@ -3,8 +3,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/invariants/NFTInvariant.cpp b/src/libxrpl/tx/invariants/NFTInvariant.cpp index db06896023..67f1e51231 100644 --- a/src/libxrpl/tx/invariants/NFTInvariant.cpp +++ b/src/libxrpl/tx/invariants/NFTInvariant.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/paths/Flow.cpp b/src/libxrpl/tx/paths/Flow.cpp index 2178997049..3e9adca814 100644 --- a/src/libxrpl/tx/paths/Flow.cpp +++ b/src/libxrpl/tx/paths/Flow.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/paths/OfferStream.cpp b/src/libxrpl/tx/paths/OfferStream.cpp index 9d2a94e3a8..596ae36b96 100644 --- a/src/libxrpl/tx/paths/OfferStream.cpp +++ b/src/libxrpl/tx/paths/OfferStream.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/DeleteAccount.cpp b/src/libxrpl/tx/transactors/account/DeleteAccount.cpp similarity index 97% rename from src/libxrpl/tx/transactors/DeleteAccount.cpp rename to src/libxrpl/tx/transactors/account/DeleteAccount.cpp index 79ce03ca9a..a9f7dbe674 100644 --- a/src/libxrpl/tx/transactors/DeleteAccount.cpp +++ b/src/libxrpl/tx/transactors/account/DeleteAccount.cpp @@ -8,13 +8,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/SetAccount.cpp b/src/libxrpl/tx/transactors/account/SetAccount.cpp similarity index 99% rename from src/libxrpl/tx/transactors/SetAccount.cpp rename to src/libxrpl/tx/transactors/account/SetAccount.cpp index 64b52d12d5..32eb2afbb8 100644 --- a/src/libxrpl/tx/transactors/SetAccount.cpp +++ b/src/libxrpl/tx/transactors/account/SetAccount.cpp @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/SetRegularKey.cpp b/src/libxrpl/tx/transactors/account/SetRegularKey.cpp similarity index 96% rename from src/libxrpl/tx/transactors/SetRegularKey.cpp rename to src/libxrpl/tx/transactors/account/SetRegularKey.cpp index e26e6b1bd5..08175b196f 100644 --- a/src/libxrpl/tx/transactors/SetRegularKey.cpp +++ b/src/libxrpl/tx/transactors/account/SetRegularKey.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/SetSignerList.cpp b/src/libxrpl/tx/transactors/account/SetSignerList.cpp similarity index 99% rename from src/libxrpl/tx/transactors/SetSignerList.cpp rename to src/libxrpl/tx/transactors/account/SetSignerList.cpp index 858fb33bff..d5b41c6acf 100644 --- a/src/libxrpl/tx/transactors/SetSignerList.cpp +++ b/src/libxrpl/tx/transactors/account/SetSignerList.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/libxrpl/tx/transactors/XChainBridge.cpp b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp similarity index 99% rename from src/libxrpl/tx/transactors/XChainBridge.cpp rename to src/libxrpl/tx/transactors/bridge/XChainBridge.cpp index 44a1974f93..9c18630b61 100644 --- a/src/libxrpl/tx/transactors/XChainBridge.cpp +++ b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/libxrpl/tx/transactors/Check/CancelCheck.cpp b/src/libxrpl/tx/transactors/check/CancelCheck.cpp similarity index 98% rename from src/libxrpl/tx/transactors/Check/CancelCheck.cpp rename to src/libxrpl/tx/transactors/check/CancelCheck.cpp index c9a947ae6a..645327a4c5 100644 --- a/src/libxrpl/tx/transactors/Check/CancelCheck.cpp +++ b/src/libxrpl/tx/transactors/check/CancelCheck.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Check/CashCheck.cpp b/src/libxrpl/tx/transactors/check/CashCheck.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Check/CashCheck.cpp rename to src/libxrpl/tx/transactors/check/CashCheck.cpp index c459ef9b67..1628b284a9 100644 --- a/src/libxrpl/tx/transactors/Check/CashCheck.cpp +++ b/src/libxrpl/tx/transactors/check/CashCheck.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include diff --git a/src/libxrpl/tx/transactors/Check/CreateCheck.cpp b/src/libxrpl/tx/transactors/check/CreateCheck.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Check/CreateCheck.cpp rename to src/libxrpl/tx/transactors/check/CreateCheck.cpp index 7ec4746d20..9e883e7fbb 100644 --- a/src/libxrpl/tx/transactors/Check/CreateCheck.cpp +++ b/src/libxrpl/tx/transactors/check/CreateCheck.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Credentials.cpp b/src/libxrpl/tx/transactors/credentials/Credentials.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Credentials.cpp rename to src/libxrpl/tx/transactors/credentials/Credentials.cpp index ce95d8144c..079b75a9fe 100644 --- a/src/libxrpl/tx/transactors/Credentials.cpp +++ b/src/libxrpl/tx/transactors/credentials/Credentials.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include diff --git a/src/libxrpl/tx/transactors/Delegate/DelegateSet.cpp b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp similarity index 98% rename from src/libxrpl/tx/transactors/Delegate/DelegateSet.cpp rename to src/libxrpl/tx/transactors/delegate/DelegateSet.cpp index 69ec707dd2..afb84c1c1e 100644 --- a/src/libxrpl/tx/transactors/Delegate/DelegateSet.cpp +++ b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Delegate/DelegateUtils.cpp b/src/libxrpl/tx/transactors/delegate/DelegateUtils.cpp similarity index 95% rename from src/libxrpl/tx/transactors/Delegate/DelegateUtils.cpp rename to src/libxrpl/tx/transactors/delegate/DelegateUtils.cpp index eceb73503f..d9d74a1212 100644 --- a/src/libxrpl/tx/transactors/Delegate/DelegateUtils.cpp +++ b/src/libxrpl/tx/transactors/delegate/DelegateUtils.cpp @@ -1,5 +1,5 @@ #include -#include +#include namespace xrpl { NotTEC diff --git a/src/libxrpl/tx/transactors/AMM/AMMBid.cpp b/src/libxrpl/tx/transactors/dex/AMMBid.cpp similarity index 98% rename from src/libxrpl/tx/transactors/AMM/AMMBid.cpp rename to src/libxrpl/tx/transactors/dex/AMMBid.cpp index 8ba7970472..d73e65ec3a 100644 --- a/src/libxrpl/tx/transactors/AMM/AMMBid.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMBid.cpp @@ -4,9 +4,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/AMM/AMMClawback.cpp b/src/libxrpl/tx/transactors/dex/AMMClawback.cpp similarity index 98% rename from src/libxrpl/tx/transactors/AMM/AMMClawback.cpp rename to src/libxrpl/tx/transactors/dex/AMMClawback.cpp index c9ea1e44eb..168583ff69 100644 --- a/src/libxrpl/tx/transactors/AMM/AMMClawback.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMClawback.cpp @@ -4,10 +4,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/libxrpl/tx/transactors/AMM/AMMCreate.cpp b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp similarity index 98% rename from src/libxrpl/tx/transactors/AMM/AMMCreate.cpp rename to src/libxrpl/tx/transactors/dex/AMMCreate.cpp index 53933df629..1c5b2bae6f 100644 --- a/src/libxrpl/tx/transactors/AMM/AMMCreate.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp @@ -5,9 +5,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/AMM/AMMDelete.cpp b/src/libxrpl/tx/transactors/dex/AMMDelete.cpp similarity index 92% rename from src/libxrpl/tx/transactors/AMM/AMMDelete.cpp rename to src/libxrpl/tx/transactors/dex/AMMDelete.cpp index 39b7c9a11b..da0ea4cb80 100644 --- a/src/libxrpl/tx/transactors/AMM/AMMDelete.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMDelete.cpp @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/AMM/AMMDeposit.cpp b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp similarity index 99% rename from src/libxrpl/tx/transactors/AMM/AMMDeposit.cpp rename to src/libxrpl/tx/transactors/dex/AMMDeposit.cpp index dad1bc536a..4edd199134 100644 --- a/src/libxrpl/tx/transactors/AMM/AMMDeposit.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp @@ -3,9 +3,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/AMM/AMMHelpers.cpp b/src/libxrpl/tx/transactors/dex/AMMHelpers.cpp similarity index 99% rename from src/libxrpl/tx/transactors/AMM/AMMHelpers.cpp rename to src/libxrpl/tx/transactors/dex/AMMHelpers.cpp index 5d5af6da03..c232f82543 100644 --- a/src/libxrpl/tx/transactors/AMM/AMMHelpers.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMHelpers.cpp @@ -1,4 +1,4 @@ -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/AMM/AMMUtils.cpp b/src/libxrpl/tx/transactors/dex/AMMUtils.cpp similarity index 99% rename from src/libxrpl/tx/transactors/AMM/AMMUtils.cpp rename to src/libxrpl/tx/transactors/dex/AMMUtils.cpp index 55d71ced4f..ce44c9ffd6 100644 --- a/src/libxrpl/tx/transactors/AMM/AMMUtils.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMUtils.cpp @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/AMM/AMMVote.cpp b/src/libxrpl/tx/transactors/dex/AMMVote.cpp similarity index 98% rename from src/libxrpl/tx/transactors/AMM/AMMVote.cpp rename to src/libxrpl/tx/transactors/dex/AMMVote.cpp index 549d9705b5..d784b67f88 100644 --- a/src/libxrpl/tx/transactors/AMM/AMMVote.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMVote.cpp @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/AMM/AMMWithdraw.cpp b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp similarity index 99% rename from src/libxrpl/tx/transactors/AMM/AMMWithdraw.cpp rename to src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp index f58dbaefc6..cf35de321d 100644 --- a/src/libxrpl/tx/transactors/AMM/AMMWithdraw.cpp +++ b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp @@ -2,9 +2,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Offer/CancelOffer.cpp b/src/libxrpl/tx/transactors/dex/CancelOffer.cpp similarity index 96% rename from src/libxrpl/tx/transactors/Offer/CancelOffer.cpp rename to src/libxrpl/tx/transactors/dex/CancelOffer.cpp index 3e5d2441e1..2549fd327e 100644 --- a/src/libxrpl/tx/transactors/Offer/CancelOffer.cpp +++ b/src/libxrpl/tx/transactors/dex/CancelOffer.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Offer/CreateOffer.cpp b/src/libxrpl/tx/transactors/dex/CreateOffer.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Offer/CreateOffer.cpp rename to src/libxrpl/tx/transactors/dex/CreateOffer.cpp index 9516926693..515b72eae9 100644 --- a/src/libxrpl/tx/transactors/Offer/CreateOffer.cpp +++ b/src/libxrpl/tx/transactors/dex/CreateOffer.cpp @@ -8,8 +8,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { TxConsequences diff --git a/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDEXHelpers.cpp b/src/libxrpl/tx/transactors/dex/PermissionedDEXHelpers.cpp similarity index 97% rename from src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDEXHelpers.cpp rename to src/libxrpl/tx/transactors/dex/PermissionedDEXHelpers.cpp index 7a4fa62078..37db2d632f 100644 --- a/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDEXHelpers.cpp +++ b/src/libxrpl/tx/transactors/dex/PermissionedDEXHelpers.cpp @@ -1,5 +1,5 @@ #include -#include +#include namespace xrpl { namespace permissioned_dex { diff --git a/src/libxrpl/tx/transactors/DID.cpp b/src/libxrpl/tx/transactors/did/DID.cpp similarity index 99% rename from src/libxrpl/tx/transactors/DID.cpp rename to src/libxrpl/tx/transactors/did/DID.cpp index ade60221df..080a031c79 100644 --- a/src/libxrpl/tx/transactors/DID.cpp +++ b/src/libxrpl/tx/transactors/did/DID.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Escrow.cpp b/src/libxrpl/tx/transactors/escrow/Escrow.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Escrow.cpp rename to src/libxrpl/tx/transactors/escrow/Escrow.cpp index 8ea2de24d9..3d7d408af7 100644 --- a/src/libxrpl/tx/transactors/Escrow.cpp +++ b/src/libxrpl/tx/transactors/escrow/Escrow.cpp @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Lending/LendingHelpers.cpp b/src/libxrpl/tx/transactors/lending/LendingHelpers.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Lending/LendingHelpers.cpp rename to src/libxrpl/tx/transactors/lending/LendingHelpers.cpp index b0626b4650..d7162bbb0e 100644 --- a/src/libxrpl/tx/transactors/Lending/LendingHelpers.cpp +++ b/src/libxrpl/tx/transactors/lending/LendingHelpers.cpp @@ -1,6 +1,6 @@ -#include +#include // DO NOT REMOVE forces header file include to sort first -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverClawback.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp similarity index 98% rename from src/libxrpl/tx/transactors/Lending/LoanBrokerCoverClawback.cpp rename to src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp index 870af54f94..8513ae5999 100644 --- a/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverClawback.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp @@ -1,7 +1,7 @@ -#include +#include // #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp similarity index 96% rename from src/libxrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.cpp rename to src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp index d112959fea..83f7d2d1c6 100644 --- a/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverDeposit.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp @@ -1,7 +1,7 @@ -#include +#include // #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp similarity index 96% rename from src/libxrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.cpp rename to src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp index 43ff3659ef..9140a0dc23 100644 --- a/src/libxrpl/tx/transactors/Lending/LoanBrokerCoverWithdraw.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp @@ -1,9 +1,9 @@ -#include +#include // #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Lending/LoanBrokerDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp similarity index 97% rename from src/libxrpl/tx/transactors/Lending/LoanBrokerDelete.cpp rename to src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp index 989c26d024..85026654da 100644 --- a/src/libxrpl/tx/transactors/Lending/LoanBrokerDelete.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp @@ -1,7 +1,7 @@ -#include +#include // #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Lending/LoanBrokerSet.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp similarity index 98% rename from src/libxrpl/tx/transactors/Lending/LoanBrokerSet.cpp rename to src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp index 1ede32dc23..c825a7fafe 100644 --- a/src/libxrpl/tx/transactors/Lending/LoanBrokerSet.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp @@ -1,7 +1,7 @@ -#include +#include // #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Lending/LoanDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp similarity index 97% rename from src/libxrpl/tx/transactors/Lending/LoanDelete.cpp rename to src/libxrpl/tx/transactors/lending/LoanDelete.cpp index fa3ccba7da..e7d219d6c8 100644 --- a/src/libxrpl/tx/transactors/Lending/LoanDelete.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp @@ -1,7 +1,7 @@ -#include +#include // #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Lending/LoanManage.cpp b/src/libxrpl/tx/transactors/lending/LoanManage.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Lending/LoanManage.cpp rename to src/libxrpl/tx/transactors/lending/LoanManage.cpp index c066c4b3a9..2dacb453b5 100644 --- a/src/libxrpl/tx/transactors/Lending/LoanManage.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanManage.cpp @@ -1,8 +1,8 @@ -#include +#include // #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Lending/LoanPay.cpp b/src/libxrpl/tx/transactors/lending/LoanPay.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Lending/LoanPay.cpp rename to src/libxrpl/tx/transactors/lending/LoanPay.cpp index 6b1f2acf7c..d894c56631 100644 --- a/src/libxrpl/tx/transactors/Lending/LoanPay.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanPay.cpp @@ -1,11 +1,11 @@ -#include +#include // #include #include #include #include -#include -#include +#include +#include #include diff --git a/src/libxrpl/tx/transactors/Lending/LoanSet.cpp b/src/libxrpl/tx/transactors/lending/LoanSet.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Lending/LoanSet.cpp rename to src/libxrpl/tx/transactors/lending/LoanSet.cpp index 5e45bd5a9a..f74522e737 100644 --- a/src/libxrpl/tx/transactors/Lending/LoanSet.cpp +++ b/src/libxrpl/tx/transactors/lending/LoanSet.cpp @@ -1,8 +1,8 @@ -#include +#include // #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/NFT/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp similarity index 99% rename from src/libxrpl/tx/transactors/NFT/NFTokenAcceptOffer.cpp rename to src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp index 90a28a2e7c..32af49355a 100644 --- a/src/libxrpl/tx/transactors/NFT/NFTokenAcceptOffer.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/NFT/NFTokenBurn.cpp b/src/libxrpl/tx/transactors/nft/NFTokenBurn.cpp similarity index 96% rename from src/libxrpl/tx/transactors/NFT/NFTokenBurn.cpp rename to src/libxrpl/tx/transactors/nft/NFTokenBurn.cpp index 65ef9e7542..6d9ee56c51 100644 --- a/src/libxrpl/tx/transactors/NFT/NFTokenBurn.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenBurn.cpp @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/NFT/NFTokenCancelOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp similarity index 95% rename from src/libxrpl/tx/transactors/NFT/NFTokenCancelOffer.cpp rename to src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp index ce2cdf83c5..df0561e076 100644 --- a/src/libxrpl/tx/transactors/NFT/NFTokenCancelOffer.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/src/libxrpl/tx/transactors/NFT/NFTokenCreateOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenCreateOffer.cpp similarity index 94% rename from src/libxrpl/tx/transactors/NFT/NFTokenCreateOffer.cpp rename to src/libxrpl/tx/transactors/nft/NFTokenCreateOffer.cpp index 6fe911ef5b..ca90bcafab 100644 --- a/src/libxrpl/tx/transactors/NFT/NFTokenCreateOffer.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenCreateOffer.cpp @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/NFT/NFTokenMint.cpp b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp similarity index 99% rename from src/libxrpl/tx/transactors/NFT/NFTokenMint.cpp rename to src/libxrpl/tx/transactors/nft/NFTokenMint.cpp index a32a659bbd..a643a6042c 100644 --- a/src/libxrpl/tx/transactors/NFT/NFTokenMint.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include diff --git a/src/libxrpl/tx/transactors/NFT/NFTokenModify.cpp b/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp similarity index 93% rename from src/libxrpl/tx/transactors/NFT/NFTokenModify.cpp rename to src/libxrpl/tx/transactors/nft/NFTokenModify.cpp index 316bcb0f27..af852530e4 100644 --- a/src/libxrpl/tx/transactors/NFT/NFTokenModify.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp @@ -1,7 +1,7 @@ #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/NFT/NFTokenUtils.cpp b/src/libxrpl/tx/transactors/nft/NFTokenUtils.cpp similarity index 99% rename from src/libxrpl/tx/transactors/NFT/NFTokenUtils.cpp rename to src/libxrpl/tx/transactors/nft/NFTokenUtils.cpp index 383929d54e..650fdabf29 100644 --- a/src/libxrpl/tx/transactors/NFT/NFTokenUtils.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenUtils.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/libxrpl/tx/transactors/DeleteOracle.cpp b/src/libxrpl/tx/transactors/oracle/DeleteOracle.cpp similarity index 97% rename from src/libxrpl/tx/transactors/DeleteOracle.cpp rename to src/libxrpl/tx/transactors/oracle/DeleteOracle.cpp index ebaffd334a..5452096b6d 100644 --- a/src/libxrpl/tx/transactors/DeleteOracle.cpp +++ b/src/libxrpl/tx/transactors/oracle/DeleteOracle.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/SetOracle.cpp b/src/libxrpl/tx/transactors/oracle/SetOracle.cpp similarity index 99% rename from src/libxrpl/tx/transactors/SetOracle.cpp rename to src/libxrpl/tx/transactors/oracle/SetOracle.cpp index 140938e2d7..be827c25d5 100644 --- a/src/libxrpl/tx/transactors/SetOracle.cpp +++ b/src/libxrpl/tx/transactors/oracle/SetOracle.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/DepositPreauth.cpp b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp similarity index 99% rename from src/libxrpl/tx/transactors/DepositPreauth.cpp rename to src/libxrpl/tx/transactors/payment/DepositPreauth.cpp index 6857816d1f..cd86a6906c 100644 --- a/src/libxrpl/tx/transactors/DepositPreauth.cpp +++ b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include diff --git a/src/libxrpl/tx/transactors/Payment.cpp b/src/libxrpl/tx/transactors/payment/Payment.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Payment.cpp rename to src/libxrpl/tx/transactors/payment/Payment.cpp index b98bbf11bd..1605c7d886 100644 --- a/src/libxrpl/tx/transactors/Payment.cpp +++ b/src/libxrpl/tx/transactors/payment/Payment.cpp @@ -6,9 +6,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/PayChan.cpp b/src/libxrpl/tx/transactors/payment_channel/PayChan.cpp similarity index 99% rename from src/libxrpl/tx/transactors/PayChan.cpp rename to src/libxrpl/tx/transactors/payment_channel/PayChan.cpp index 265030bebf..f963153e87 100644 --- a/src/libxrpl/tx/transactors/PayChan.cpp +++ b/src/libxrpl/tx/transactors/payment_channel/PayChan.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp similarity index 95% rename from src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.cpp rename to src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp index 861bb934be..2c7e934fc0 100644 --- a/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainDelete.cpp +++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp similarity index 98% rename from src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.cpp rename to src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp index 15bb79b239..c27c884b10 100644 --- a/src/libxrpl/tx/transactors/PermissionedDomain/PermissionedDomainSet.cpp +++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp @@ -1,4 +1,4 @@ -#include +#include // #include #include diff --git a/src/libxrpl/tx/transactors/Batch.cpp b/src/libxrpl/tx/transactors/system/Batch.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Batch.cpp rename to src/libxrpl/tx/transactors/system/Batch.cpp index 67bb1f26e4..ed3dabec75 100644 --- a/src/libxrpl/tx/transactors/Batch.cpp +++ b/src/libxrpl/tx/transactors/system/Batch.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Change.cpp b/src/libxrpl/tx/transactors/system/Change.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Change.cpp rename to src/libxrpl/tx/transactors/system/Change.cpp index 9ae6504718..d1e2d148d6 100644 --- a/src/libxrpl/tx/transactors/Change.cpp +++ b/src/libxrpl/tx/transactors/system/Change.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include diff --git a/src/libxrpl/tx/transactors/CreateTicket.cpp b/src/libxrpl/tx/transactors/system/CreateTicket.cpp similarity index 98% rename from src/libxrpl/tx/transactors/CreateTicket.cpp rename to src/libxrpl/tx/transactors/system/CreateTicket.cpp index b1991c6e77..7334d88be4 100644 --- a/src/libxrpl/tx/transactors/CreateTicket.cpp +++ b/src/libxrpl/tx/transactors/system/CreateTicket.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/LedgerStateFix.cpp b/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp similarity index 93% rename from src/libxrpl/tx/transactors/LedgerStateFix.cpp rename to src/libxrpl/tx/transactors/system/LedgerStateFix.cpp index 28028b6f2b..da04d60142 100644 --- a/src/libxrpl/tx/transactors/LedgerStateFix.cpp +++ b/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Clawback.cpp b/src/libxrpl/tx/transactors/token/Clawback.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Clawback.cpp rename to src/libxrpl/tx/transactors/token/Clawback.cpp index 789017e3ec..c64459faa9 100644 --- a/src/libxrpl/tx/transactors/Clawback.cpp +++ b/src/libxrpl/tx/transactors/token/Clawback.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/MPT/MPTokenAuthorize.cpp b/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp similarity index 98% rename from src/libxrpl/tx/transactors/MPT/MPTokenAuthorize.cpp rename to src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp index 846b25ca38..01513e17e0 100644 --- a/src/libxrpl/tx/transactors/MPT/MPTokenAuthorize.cpp +++ b/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp similarity index 98% rename from src/libxrpl/tx/transactors/MPT/MPTokenIssuanceCreate.cpp rename to src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp index ae697aa670..cf435a30ca 100644 --- a/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceCreate.cpp +++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp similarity index 95% rename from src/libxrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.cpp rename to src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp index 4b4d7c53f5..1df4da47ab 100644 --- a/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceDestroy.cpp +++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceSet.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp similarity index 98% rename from src/libxrpl/tx/transactors/MPT/MPTokenIssuanceSet.cpp rename to src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp index 2ae6bde083..e6b1ffbbc3 100644 --- a/src/libxrpl/tx/transactors/MPT/MPTokenIssuanceSet.cpp +++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/SetTrust.cpp b/src/libxrpl/tx/transactors/token/SetTrust.cpp similarity index 99% rename from src/libxrpl/tx/transactors/SetTrust.cpp rename to src/libxrpl/tx/transactors/token/SetTrust.cpp index 268d626432..b6ae288a8c 100644 --- a/src/libxrpl/tx/transactors/SetTrust.cpp +++ b/src/libxrpl/tx/transactors/token/SetTrust.cpp @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include namespace { diff --git a/src/libxrpl/tx/transactors/Vault/VaultClawback.cpp b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Vault/VaultClawback.cpp rename to src/libxrpl/tx/transactors/vault/VaultClawback.cpp index bce53c706d..bfce93b1dd 100644 --- a/src/libxrpl/tx/transactors/Vault/VaultClawback.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include diff --git a/src/libxrpl/tx/transactors/Vault/VaultCreate.cpp b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp similarity index 97% rename from src/libxrpl/tx/transactors/Vault/VaultCreate.cpp rename to src/libxrpl/tx/transactors/vault/VaultCreate.cpp index 230651fd9b..b1f227ddf3 100644 --- a/src/libxrpl/tx/transactors/Vault/VaultCreate.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Vault/VaultDelete.cpp b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Vault/VaultDelete.cpp rename to src/libxrpl/tx/transactors/vault/VaultDelete.cpp index 0b3aef19a8..ad39ed9cf2 100644 --- a/src/libxrpl/tx/transactors/Vault/VaultDelete.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Vault/VaultDeposit.cpp b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp similarity index 98% rename from src/libxrpl/tx/transactors/Vault/VaultDeposit.cpp rename to src/libxrpl/tx/transactors/vault/VaultDeposit.cpp index c3a9327f2a..58912f5010 100644 --- a/src/libxrpl/tx/transactors/Vault/VaultDeposit.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Vault/VaultSet.cpp b/src/libxrpl/tx/transactors/vault/VaultSet.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Vault/VaultSet.cpp rename to src/libxrpl/tx/transactors/vault/VaultSet.cpp index c27c9aae3c..532edcdcef 100644 --- a/src/libxrpl/tx/transactors/Vault/VaultSet.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultSet.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/libxrpl/tx/transactors/Vault/VaultWithdraw.cpp b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp similarity index 99% rename from src/libxrpl/tx/transactors/Vault/VaultWithdraw.cpp rename to src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp index 3e468df2fc..9f808c2dfc 100644 --- a/src/libxrpl/tx/transactors/Vault/VaultWithdraw.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/test/app/AMMCalc_test.cpp b/src/test/app/AMMCalc_test.cpp index e6e68a95ce..690329d2f3 100644 --- a/src/test/app/AMMCalc_test.cpp +++ b/src/test/app/AMMCalc_test.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include diff --git a/src/test/app/AMMClawback_test.cpp b/src/test/app/AMMClawback_test.cpp index 114a96b081..3034c628f4 100644 --- a/src/test/app/AMMClawback_test.cpp +++ b/src/test/app/AMMClawback_test.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include namespace xrpl { namespace test { diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp index 06f82418da..14be260822 100644 --- a/src/test/app/AMMExtended_test.cpp +++ b/src/test/app/AMMExtended_test.cpp @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp index fc801be816..39a3abcd9e 100644 --- a/src/test/app/AMM_test.cpp +++ b/src/test/app/AMM_test.cpp @@ -10,10 +10,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/test/app/Batch_test.cpp b/src/test/app/Batch_test.cpp index f429299f01..d8a8cd6c5d 100644 --- a/src/test/app/Batch_test.cpp +++ b/src/test/app/Batch_test.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace xrpl { namespace test { diff --git a/src/test/app/FixNFTokenPageLinks_test.cpp b/src/test/app/FixNFTokenPageLinks_test.cpp index 67dadac5e1..8022c52a5d 100644 --- a/src/test/app/FixNFTokenPageLinks_test.cpp +++ b/src/test/app/FixNFTokenPageLinks_test.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/test/app/LendingHelpers_test.cpp b/src/test/app/LendingHelpers_test.cpp index aae60a252a..24661c18fb 100644 --- a/src/test/app/LendingHelpers_test.cpp +++ b/src/test/app/LendingHelpers_test.cpp @@ -8,9 +8,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/test/app/LoanBroker_test.cpp b/src/test/app/LoanBroker_test.cpp index 31cfb5c231..d7c4344ef5 100644 --- a/src/test/app/LoanBroker_test.cpp +++ b/src/test/app/LoanBroker_test.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include namespace xrpl { namespace test { diff --git a/src/test/app/Loan_test.cpp b/src/test/app/Loan_test.cpp index 607e84abeb..5477994c53 100644 --- a/src/test/app/Loan_test.cpp +++ b/src/test/app/Loan_test.cpp @@ -6,9 +6,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/test/app/NFTokenAuth_test.cpp b/src/test/app/NFTokenAuth_test.cpp index 6fc92bc6cd..b973530f41 100644 --- a/src/test/app/NFTokenAuth_test.cpp +++ b/src/test/app/NFTokenAuth_test.cpp @@ -1,6 +1,6 @@ #include -#include +#include namespace xrpl { diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp index c75e22e954..8cd67bd72b 100644 --- a/src/test/app/NFTokenBurn_test.cpp +++ b/src/test/app/NFTokenBurn_test.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp index c186a3d9e5..551b987204 100644 --- a/src/test/app/NFTokenDir_test.cpp +++ b/src/test/app/NFTokenDir_test.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp index 6d30fc6854..7ff2e7d1cb 100644 --- a/src/test/app/NFToken_test.cpp +++ b/src/test/app/NFToken_test.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp index 2cc2a188c3..a45da5f5f6 100644 --- a/src/test/app/PayStrand_test.cpp +++ b/src/test/app/PayStrand_test.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include diff --git a/src/test/app/PermissionedDEX_test.cpp b/src/test/app/PermissionedDEX_test.cpp index 8ecc66911c..3cb732b9d1 100644 --- a/src/test/app/PermissionedDEX_test.cpp +++ b/src/test/app/PermissionedDEX_test.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/test/app/PermissionedDomains_test.cpp b/src/test/app/PermissionedDomains_test.cpp index 39ce85d23d..d2a14ce82a 100644 --- a/src/test/app/PermissionedDomains_test.cpp +++ b/src/test/app/PermissionedDomains_test.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp index 9b6d86dd5f..024ee0742e 100644 --- a/src/test/app/TheoreticalQuality_test.cpp +++ b/src/test/app/TheoreticalQuality_test.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace xrpl { namespace test { diff --git a/src/test/jtx/impl/AMM.cpp b/src/test/jtx/impl/AMM.cpp index faf47259dc..bb159d6bc1 100644 --- a/src/test/jtx/impl/AMM.cpp +++ b/src/test/jtx/impl/AMM.cpp @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include namespace xrpl { namespace test { diff --git a/src/test/jtx/impl/ledgerStateFixes.cpp b/src/test/jtx/impl/ledgerStateFixes.cpp index 04860a5e3a..e5a7495a44 100644 --- a/src/test/jtx/impl/ledgerStateFixes.cpp +++ b/src/test/jtx/impl/ledgerStateFixes.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include namespace xrpl { namespace test { diff --git a/src/test/jtx/impl/token.cpp b/src/test/jtx/impl/token.cpp index 59f8c822fb..9db79361eb 100644 --- a/src/test/jtx/impl/token.cpp +++ b/src/test/jtx/impl/token.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include namespace xrpl { namespace test { diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp index 7c1877136d..090f2a43b9 100644 --- a/src/test/rpc/AccountObjects_test.cpp +++ b/src/test/rpc/AccountObjects_test.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include diff --git a/src/xrpld/app/ledger/OrderBookDBImpl.cpp b/src/xrpld/app/ledger/OrderBookDBImpl.cpp index a4eb0fb1ca..b82fa3896b 100644 --- a/src/xrpld/app/ledger/OrderBookDBImpl.cpp +++ b/src/xrpld/app/ledger/OrderBookDBImpl.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace xrpl { diff --git a/src/xrpld/app/paths/AMMLiquidity.h b/src/xrpld/app/paths/AMMLiquidity.h index 5c3ff2a8e6..71b8dbb12a 100644 --- a/src/xrpld/app/paths/AMMLiquidity.h +++ b/src/xrpld/app/paths/AMMLiquidity.h @@ -4,9 +4,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace xrpl { diff --git a/src/xrpld/app/paths/detail/BookStep.cpp b/src/xrpld/app/paths/detail/BookStep.cpp index 4124fdfa30..dca38f8df5 100644 --- a/src/xrpld/app/paths/detail/BookStep.cpp +++ b/src/xrpld/app/paths/detail/BookStep.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include diff --git a/src/xrpld/rpc/detail/RPCHelpers.cpp b/src/xrpld/rpc/detail/RPCHelpers.cpp index 14e1108955..385bc7f4af 100644 --- a/src/xrpld/rpc/detail/RPCHelpers.cpp +++ b/src/xrpld/rpc/detail/RPCHelpers.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/xrpld/rpc/handlers/AMMInfo.cpp b/src/xrpld/rpc/handlers/AMMInfo.cpp index 3b843c9410..4e91c9c308 100644 --- a/src/xrpld/rpc/handlers/AMMInfo.cpp +++ b/src/xrpld/rpc/handlers/AMMInfo.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include diff --git a/src/xrpld/rpc/handlers/AccountObjects.cpp b/src/xrpld/rpc/handlers/AccountObjects.cpp index 9dcdf7bdf6..e01822e901 100644 --- a/src/xrpld/rpc/handlers/AccountObjects.cpp +++ b/src/xrpld/rpc/handlers/AccountObjects.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include From 7b12c00e6bdae511dd965f0f81c83972368d84cc Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 6 Mar 2026 12:50:00 +0000 Subject: [PATCH 2/2] chore: Add custom cmake definitions for gersemi (#6491) This change adds definitions for our custom functions/macros, so gersemi will nicely format them too. --- .gersemi/definitions.cmake | 98 ++++++++++++++++++++++++++++++++++++++ .gersemirc | 1 + cmake/XrplAddTest.cmake | 7 ++- cmake/XrplCore.cmake | 19 ++++++-- cmake/XrplCov.cmake | 20 ++++---- cmake/XrplDocs.cmake | 6 ++- cmake/add_module.cmake | 14 ++++-- 7 files changed, 142 insertions(+), 23 deletions(-) create mode 100644 .gersemi/definitions.cmake create mode 100644 .gersemirc diff --git a/.gersemi/definitions.cmake b/.gersemi/definitions.cmake new file mode 100644 index 0000000000..13061629a4 --- /dev/null +++ b/.gersemi/definitions.cmake @@ -0,0 +1,98 @@ +# Custom CMake command definitions for gersemi formatting. +# These stubs teach gersemi the signatures of project-specific commands +# so it can format their invocations correctly. + +function(git_branch branch_val) +endfunction() + +function(isolate_headers target A B scope) +endfunction() + +function(create_symbolic_link target link) +endfunction() + +function(xrpl_add_test name) +endfunction() + +macro(exclude_from_default target_) +endmacro() + +macro(exclude_if_included target_) +endmacro() + +function(target_protobuf_sources target prefix) + set(options APPEND_PATH DESCRIPTORS) + set(oneValueArgs + LANGUAGE + OUT_VAR + EXPORT_MACRO + TARGET + PROTOC_OUT_DIR + PLUGIN + PLUGIN_OPTIONS + PROTOC_EXE + ) + set(multiValueArgs + PROTOS + IMPORT_DIRS + GENERATE_EXTENSIONS + PROTOC_OPTIONS + DEPENDENCIES + ) + cmake_parse_arguments( + THIS_FUNCTION_PREFIX + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN} + ) +endfunction() + +function(add_module parent name) +endfunction() + +function(target_link_modules parent scope) +endfunction() + +function(setup_target_for_coverage_gcovr) + set(options NONE) + set(oneValueArgs BASE_DIRECTORY NAME FORMAT) + set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES) + cmake_parse_arguments( + THIS_FUNCTION_PREFIX + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN} + ) +endfunction() + +function(add_code_coverage_to_target name scope) +endfunction() + +function(verbose_find_path variable name) + set(options + NO_CACHE + REQUIRED + OPTIONAL + NO_DEFAULT_PATH + NO_PACKAGE_ROOT_PATH + NO_CMAKE_PATH + NO_CMAKE_ENVIRONMENT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + NO_CMAKE_SYSTEM_PATH + NO_CMAKE_INSTALL_PREFIX + CMAKE_FIND_ROOT_PATH_BOTH + ONLY_CMAKE_FIND_ROOT_PATH + NO_CMAKE_FIND_ROOT_PATH + ) + set(oneValueArgs REGISTRY_VIEW VALIDATOR DOC) + set(multiValueArgs NAMES HINTS PATHS PATH_SUFFIXES) + cmake_parse_arguments( + THIS_FUNCTION_PREFIX + "${options}" + "${oneValueArgs}" + "${multiValueArgs}" + ${ARGN} + ) +endfunction() diff --git a/.gersemirc b/.gersemirc new file mode 100644 index 0000000000..5abd52ffd5 --- /dev/null +++ b/.gersemirc @@ -0,0 +1 @@ +definitions: [.gersemi] diff --git a/cmake/XrplAddTest.cmake b/cmake/XrplAddTest.cmake index 0f8f9e2c01..2f1209e03c 100644 --- a/cmake/XrplAddTest.cmake +++ b/cmake/XrplAddTest.cmake @@ -11,7 +11,12 @@ function(xrpl_add_test name) ) add_executable(${target} ${ARGN} ${sources}) - isolate_headers(${target} "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/tests/${name}" PRIVATE) + isolate_headers( + ${target} + "${CMAKE_SOURCE_DIR}" + "${CMAKE_SOURCE_DIR}/tests/${name}" + PRIVATE + ) add_test(NAME ${target} COMMAND ${target}) endfunction() diff --git a/cmake/XrplCore.cmake b/cmake/XrplCore.cmake index 1c8f5e33d6..580c4155eb 100644 --- a/cmake/XrplCore.cmake +++ b/cmake/XrplCore.cmake @@ -10,16 +10,25 @@ include(target_protobuf_sources) # so we just build them as a separate library. add_library(xrpl.libpb) set_target_properties(xrpl.libpb PROPERTIES UNITY_BUILD OFF) -target_protobuf_sources(xrpl.libpb xrpl/proto LANGUAGE cpp IMPORT_DIRS include/xrpl/proto - PROTOS include/xrpl/proto/xrpl.proto +target_protobuf_sources( + xrpl.libpb + xrpl/proto + LANGUAGE cpp + IMPORT_DIRS include/xrpl/proto + PROTOS include/xrpl/proto/xrpl.proto ) file(GLOB_RECURSE protos "include/xrpl/proto/org/*.proto") -target_protobuf_sources(xrpl.libpb xrpl/proto LANGUAGE cpp IMPORT_DIRS include/xrpl/proto - PROTOS "${protos}" +target_protobuf_sources( + xrpl.libpb + xrpl/proto + LANGUAGE cpp + IMPORT_DIRS include/xrpl/proto + PROTOS "${protos}" ) target_protobuf_sources( - xrpl.libpb xrpl/proto + xrpl.libpb + xrpl/proto LANGUAGE grpc IMPORT_DIRS include/xrpl/proto PROTOS "${protos}" diff --git a/cmake/XrplCov.cmake b/cmake/XrplCov.cmake index 109f5049fd..d81d7e689f 100644 --- a/cmake/XrplCov.cmake +++ b/cmake/XrplCov.cmake @@ -39,19 +39,15 @@ list( ) setup_target_for_coverage_gcovr( - NAME - coverage - FORMAT - ${coverage_format} + NAME coverage + FORMAT ${coverage_format} EXCLUDE - "src/test" - "src/tests" - "include/xrpl/beast/test" - "include/xrpl/beast/unit_test" - "${CMAKE_BINARY_DIR}/pb-xrpl.libpb" - DEPENDENCIES - xrpld - xrpl.tests + "src/test" + "src/tests" + "include/xrpl/beast/test" + "include/xrpl/beast/unit_test" + "${CMAKE_BINARY_DIR}/pb-xrpl.libpb" + DEPENDENCIES xrpld xrpl.tests ) add_code_coverage_to_target(opts INTERFACE) diff --git a/cmake/XrplDocs.cmake b/cmake/XrplDocs.cmake index aefffba81b..7b3e9b3b30 100644 --- a/cmake/XrplDocs.cmake +++ b/cmake/XrplDocs.cmake @@ -42,7 +42,11 @@ function(verbose_find_path variable name) endif() endfunction() -verbose_find_path(doxygen_plantuml_jar_path plantuml.jar PATH_SUFFIXES share/plantuml) +verbose_find_path( + doxygen_plantuml_jar_path + plantuml.jar + PATH_SUFFIXES share/plantuml +) verbose_find_path(doxygen_dot_path dot) # https://en.cppreference.com/w/Cppreference:Archives diff --git a/cmake/add_module.cmake b/cmake/add_module.cmake index 5b1864a0bb..316d6c627b 100644 --- a/cmake/add_module.cmake +++ b/cmake/add_module.cmake @@ -25,10 +25,16 @@ function(add_module parent name) ${target} PUBLIC "$" ) - isolate_headers(${target} "${CMAKE_CURRENT_SOURCE_DIR}/include" - "${CMAKE_CURRENT_SOURCE_DIR}/include/${parent}/${name}" PUBLIC + isolate_headers( + ${target} + "${CMAKE_CURRENT_SOURCE_DIR}/include" + "${CMAKE_CURRENT_SOURCE_DIR}/include/${parent}/${name}" + PUBLIC ) - isolate_headers(${target} "${CMAKE_CURRENT_SOURCE_DIR}/src" - "${CMAKE_CURRENT_SOURCE_DIR}/src/lib${parent}/${name}" PRIVATE + isolate_headers( + ${target} + "${CMAKE_CURRENT_SOURCE_DIR}/src" + "${CMAKE_CURRENT_SOURCE_DIR}/src/lib${parent}/${name}" + PRIVATE ) endfunction()