refactor: Combine AMMHelpers and AMMUtils - #6733
Merged
Merged
Conversation
mvadari
added
the
Trivial
mvadari
changed the title
AMMHelpers and AMMUtilsAMMHelpers and AMMUtils
Contributor
There was a problem hiding this comment.
Pull request overview
This PR consolidates AMM-related helper logic by merging the former AMMUtils.{h,cpp} contents into AMMHelpers.{h,cpp}, and updates call sites to include the unified header.
Changes:
- Removed
AMMUtils.{h,cpp}and moved its implementations/declarations intoAMMHelpers.{h,cpp}. - Updated production code and tests to include
AMMHelpers.hinstead ofAMMUtils.h. - Kept behavior the same (refactor-only), adjusting only file organization and includes.
Reviewed changes
Copilot reviewed 20 out of 20 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp | Switch include from AMMUtils.h to AMMHelpers.h. |
| src/xrpld/app/ledger/OrderBookDBImpl.cpp | Switch include from AMMUtils.h to AMMHelpers.h. |
| src/test/jtx/impl/AMM.cpp | Remove AMMUtils.h include (now covered by AMMHelpers.h). |
| src/test/app/AMMExtended_test.cpp | Switch include from AMMUtils.h to AMMHelpers.h. |
| src/test/app/AMMClawback_test.cpp | Switch include from AMMUtils.h to AMMHelpers.h. |
| src/test/app/AMM_test.cpp | Remove AMMUtils.h include (now covered by AMMHelpers.h). |
| src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp | Remove AMMUtils.h include (now covered by AMMHelpers.h). |
| src/libxrpl/tx/transactors/dex/AMMVote.cpp | Switch include from AMMUtils.h to AMMHelpers.h. |
| src/libxrpl/tx/transactors/dex/AMMDeposit.cpp | Remove AMMUtils.h include (now covered by AMMHelpers.h). |
| src/libxrpl/tx/transactors/dex/AMMDelete.cpp | Switch include from AMMUtils.h to AMMHelpers.h. |
| src/libxrpl/tx/transactors/dex/AMMCreate.cpp | Remove AMMUtils.h include (now covered by AMMHelpers.h). |
| src/libxrpl/tx/transactors/dex/AMMClawback.cpp | Remove AMMUtils.h include (now covered by AMMHelpers.h). |
| src/libxrpl/tx/transactors/dex/AMMBid.cpp | Remove AMMUtils.h include (now covered by AMMHelpers.h). |
| src/libxrpl/tx/paths/BookStep.cpp | Switch include from AMMUtils.h to AMMHelpers.h. |
| src/libxrpl/tx/invariants/AMMInvariant.cpp | Remove AMMUtils.h include (now covered by AMMHelpers.h). |
| src/libxrpl/ledger/helpers/AMMUtils.cpp | Deleted; implementations moved into AMMHelpers.cpp. |
| src/libxrpl/ledger/helpers/AMMHelpers.cpp | Receives the moved implementations previously in AMMUtils.cpp. |
| include/xrpl/tx/paths/AMMLiquidity.h | Remove AMMUtils.h include (now covered by AMMHelpers.h). |
| include/xrpl/ledger/helpers/AMMUtils.h | Deleted; declarations moved into AMMHelpers.h. |
| include/xrpl/ledger/helpers/AMMHelpers.h | Receives the moved declarations previously in AMMUtils.h. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
bthomee
approved these changes
Apr 7, 2026
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #6733 +/- ##
=========================================
- Coverage 81.6% 81.6% -0.0%
=========================================
Files 1011 1010 -1
Lines 75979 75979
Branches 7634 7635 +1
=========================================
- Hits 61985 61976 -9
- Misses 13994 14003 +9
... and 6 files with indirect coverage changes 🚀 New features to boost your workflow:
|
|
This PR has conflicts, please resolve them in order for the PR to be reviewed. |
mvadari
force-pushed
the
mvadari/combine-amm-helpers
branch
from
April 8, 2026 17:14
1902c7c to
dfe52c3
Compare
|
All conflicts have been resolved. Assigned reviewers can now start or resume their review. |
mvadari
added
the
Ready to merge
bthomee
approved these changes
Apr 8, 2026
marek-foss-neti
pushed a commit
to marek-foss-neti/rippled
that referenced
this pull request
May 5, 2026
beartec-jpg
pushed a commit
to beartec-jpg/FalconLedger
that referenced
this pull request
Jun 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
High Level Overview of Change
This PR combines the
AMMHelpers.{h,cpp}andAMMUtils.{h,cpp}into one set of files,AMMHelpers.{h,cpp}.This is a pure refactor. There are no functionality changes, only moving code around and updating headers.
Context of Change
There is no reason (in fact, it's rather confusing) to have an
AMMHelpersand anAMMUtilsfile.#6638
API Impact
N/A