From 42fda85fbc602d3fb296abdd5b76057635b97c86 Mon Sep 17 00:00:00 2001
From: Ed Hennis <ed@ripple.com>
Date: Thu, 21 May 2026 12:02:42 +0100
Subject: [PATCH] Fix more AMM tests, and to not exclude fixCleanup3_2_0

---
 src/libxrpl/basics/Number.cpp           | 1 -
 src/test/jtx/AMMTest.h                  | 6 ++----
 src/test/jtx/impl/AMMTest.cpp           | 2 +-
 src/test/rpc/GetAggregatePrice_test.cpp | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/libxrpl/basics/Number.cpp b/src/libxrpl/basics/Number.cpp
index 56fe79e1d3..11f5934b04 100644
--- a/src/libxrpl/basics/Number.cpp
+++ b/src/libxrpl/basics/Number.cpp
@@ -404,7 +404,6 @@ Number::Guard::doRoundUp(
                     safeToIncrement(mantissa),
                     "xrpl::Number::Guard::doRoundUp",
                     "can't recurse more than once");
-                // Here be dragons
                 doRoundUp(
                     negative,
                     mantissa,
diff --git a/src/test/jtx/AMMTest.h b/src/test/jtx/AMMTest.h
index fc8cd1b1e6..a2e6c38db3 100644
--- a/src/test/jtx/AMMTest.h
+++ b/src/test/jtx/AMMTest.h
@@ -21,8 +21,7 @@ struct TestAMMArg
     std::vector<FeatureBitset> features = {
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas
-        jtx::testableAmendments() - featureSingleAssetVault - featureLendingProtocol -
-        fixCleanup3_2_0};
+        jtx::testableAmendments() - featureSingleAssetVault - featureLendingProtocol};
 
     bool noLog = false;
 };
@@ -88,8 +87,7 @@ public:
     {
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas
-        return jtx::testableAmendments() - featureSingleAssetVault - featureLendingProtocol -
-            fixCleanup3_2_0;
+        return jtx::testableAmendments() - featureSingleAssetVault - featureLendingProtocol;
     }
 
 protected:
diff --git a/src/test/jtx/impl/AMMTest.cpp b/src/test/jtx/impl/AMMTest.cpp
index 3bb4cca484..5801e8fb44 100644
--- a/src/test/jtx/impl/AMMTest.cpp
+++ b/src/test/jtx/impl/AMMTest.cpp
@@ -143,7 +143,7 @@ AMMTestBase::testAMM(std::function<void(jtx::AMM&, jtx::Env&)> const& cb, TestAM
         // mantissas
         Env env{
             *this,
-            features - featureSingleAssetVault - featureLendingProtocol - fixCleanup3_2_0,
+            features - featureSingleAssetVault - featureLendingProtocol,
             arg.noLog ? std::make_unique<CaptureLogs>(&logs) : nullptr};
 
         auto const [asset1, asset2] = arg.pool ? *arg.pool : std::make_pair(XRP(10000), USD(10000));
diff --git a/src/test/rpc/GetAggregatePrice_test.cpp b/src/test/rpc/GetAggregatePrice_test.cpp
index cfa8ce78d4..37ecc54172 100644
--- a/src/test/rpc/GetAggregatePrice_test.cpp
+++ b/src/test/rpc/GetAggregatePrice_test.cpp
@@ -175,8 +175,7 @@ public:
         // or time threshold
         {
             auto const all = testableAmendments();
-            for (auto const& feats :
-                 {all - featureSingleAssetVault - featureLendingProtocol - fixCleanup3_2_0, all})
+            for (auto const& feats : {all - featureSingleAssetVault - featureLendingProtocol, all})
             {
                 for (auto const mantissaSize : MantissaRange::getAllScales())
                 {