[FOLD] Resolve merge conflicts

gregtatcam · Oct 23, 2023 · 404b1b4 · 404b1b4
1 parent 7a7c9cc
commit 404b1b4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/ripple/app/tx/impl/XChainBridge.cpp b/src/ripple/app/tx/impl/XChainBridge.cpp
@@ -505,7 +505,7 @@ transferHelper(
         /*default path*/ true,
         /*partial payment*/ false,
         /*owner pays transfer fee*/ true,
-        /*offer crossing*/ false,
+        /*offer crossing*/ OfferCrossing::no,
         /*limit quality*/ std::nullopt,
         /*sendmax*/ std::nullopt,
         j);

diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
@@ -5403,7 +5403,16 @@ class Offer4_test : public Offer0_test
     void
     run() override
     {
-        Offer0_test::run(4, true);
+        Offer0_test::run(4);
+    }
+};
+
+class Offer5_test : public Offer0_test
+{
+    void
+    run() override
+    {
+        Offer0_test::run(5, true);
     }
 };
 
@@ -5435,6 +5444,7 @@ BEAST_DEFINE_TESTSUITE_PRIO(Offer1, tx, ripple, 4);
 BEAST_DEFINE_TESTSUITE_PRIO(Offer2, tx, ripple, 4);
 BEAST_DEFINE_TESTSUITE_PRIO(Offer3, tx, ripple, 4);
 BEAST_DEFINE_TESTSUITE_PRIO(Offer4, tx, ripple, 4);
+BEAST_DEFINE_TESTSUITE_PRIO(Offer5, tx, ripple, 4);
 BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(Offer_manual, tx, ripple, 20);
 
 }  // namespace test