fixup! Update several unit tests to work with the new number rules

Author: ximinez

src/test/app/AMMClawback_test.cpp

@@ -2425,7 +2425,10 @@ class AMMClawback_test : public beast::unit_test::suite
     void
     run() override
     {
-        FeatureBitset const all = jtx::testable_amendments();
+        // For now, just disable SAV entirely, which locks in the small Number
+        // mantissas
+        FeatureBitset const all = jtx::testable_amendments() -
+            featureSingleAssetVault /* - featureLendingProtocol */;
 
         testInvalidRequest();
         testFeatureDisabled(all - featureAMMClawback);

src/test/app/AMM_test.cpp

@@ -34,6 +34,15 @@ struct AMM_test : public jtx::AMMTest
     NumberMantissaScaleGuard const sg_{ripple::MantissaRange::small};
 
 private:
+    FeatureBitset
+    testable_amendments()
+    {
+        // For now, just disable SAV entirely, which locks in the small Number
+        // mantissas
+        return jtx::testable_amendments() -
+            featureSingleAssetVault /* - featureLendingProtocol */;
+    }
+
     void
     testInstanceCreate()
     {
@@ -1368,8 +1377,8 @@ struct AMM_test : public jtx::AMMTest
     {
         testcase("Deposit");
 
-        using namespace jtx;
         auto const all = testable_amendments();
+        using namespace jtx;
 
         // Equal deposit: 1000000 tokens, 10% of the current pool
         testAMM([&](AMM& ammAlice, Env& env) {
@@ -1487,7 +1496,9 @@ struct AMM_test : public jtx::AMMTest
         });
 
         // Single deposit: 100000 tokens worth of XRP
-        testAMM([&](AMM& ammAlice, Env&) {
+        testAMM([&](AMM& ammAlice, Env& env) {
+            BEAST_EXPECT(
+                !env.app().config().features.contains(featureSingleAssetVault));
             ammAlice.deposit(carol, 100'000, XRP(205));
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(10'201), USD(10'000), IOUAmount{10'100'000, 0}));
@@ -1668,8 +1679,8 @@ struct AMM_test : public jtx::AMMTest
     {
         testcase("Invalid Withdraw");
 
-        using namespace jtx;
         auto const all = testable_amendments();
+        using namespace jtx;
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
@@ -2248,8 +2259,8 @@ struct AMM_test : public jtx::AMMTest
     {
         testcase("Withdraw");
 
-        using namespace jtx;
         auto const all = testable_amendments();
+        using namespace jtx;
 
         // Equal withdrawal by Carol: 1000000 of tokens, 10% of the current
         // pool
@@ -2669,8 +2680,8 @@ struct AMM_test : public jtx::AMMTest
     testFeeVote()
     {
         testcase("Fee Vote");
-        using namespace jtx;
         auto const all = testable_amendments();
+        using namespace jtx;
 
         // One vote sets fee to 1%.
         testAMM([&](AMM& ammAlice, Env& env) {
@@ -4846,12 +4857,12 @@ struct AMM_test : public jtx::AMMTest
     testAmendment()
     {
         testcase("Amendment");
-        using namespace jtx;
         FeatureBitset const all{testable_amendments()};
         FeatureBitset const noAMM{all - featureAMM};
         FeatureBitset const noNumber{all - fixUniversalNumber};
         FeatureBitset const noAMMAndNumber{
             all - featureAMM - fixUniversalNumber};
+        using namespace jtx;
 
         for (auto const& feature : {noAMM, noNumber, noAMMAndNumber})
         {
@@ -7037,7 +7048,7 @@ struct AMM_test : public jtx::AMMTest
             {{xrpPool, iouPool}},
             889,
             std::nullopt,
-            {jtx::testable_amendments() | fixAMMv1_1});
+            {testable_amendments() | fixAMMv1_1});
     }
 
     void
@@ -7892,7 +7903,7 @@ struct AMM_test : public jtx::AMMTest
     void
     run() override
     {
-        FeatureBitset const all{jtx::testable_amendments()};
+        FeatureBitset const all{testable_amendments()};
         testInvalidInstance();
         testInstanceCreate();
         testInvalidDeposit(all);

src/test/basics/Number_test.cpp

@@ -81,6 +81,7 @@ class Number_test : public beast::unit_test::suite
         caught = false;
         try
         {
+            [[maybe_unused]]
             Number q =
                 Number{false, minMantissa, 32767, Number::normalized{}} * 100;
         }

src/test/jtx/AMMTest.h

@@ -21,7 +21,12 @@ struct TestAMMArg
     std::optional<std::pair<STAmount, STAmount>> pool = std::nullopt;
     std::uint16_t tfee = 0;
     std::optional<jtx::ter> ter = std::nullopt;
-    std::vector<FeatureBitset> features = {testable_amendments()};
+    std::vector<FeatureBitset> features = {
+        // For now, just disable SAV entirely, which locks in the small Number
+        // mantissas
+        jtx::testable_amendments() -
+        featureSingleAssetVault /* - featureLendingProtocol */};
+
     bool noLog = false;
 };