Fix unit-test merge conflict

gregtatcam · Nov 14, 2024 · 07bc1c3 · 07bc1c3
1 parent 6936e1e
commit 07bc1c3
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp
@@ -422,7 +422,6 @@ struct AMM_test : public jtx::AMMTest
         testcase("Invalid Deposit");
 
         using namespace jtx;
-        auto const all = supported_amendments();
 
         testAMM([&](AMM& ammAlice, Env& env) {
             // Invalid flags
@@ -856,7 +855,7 @@ struct AMM_test : public jtx::AMMTest
             std::nullopt,
             0,
             std::nullopt,
-            {all, all - fixAMMv1_3});
+            {features, features - fixAMMv1_3});
 
         // Invalid AMM
         testAMM([&](AMM& ammAlice, Env& env) {