Rename featureToStrandV2 to fix1373

src/ripple/app/main/Amendments.cpp

@@ -52,7 +52,7 @@ supportedAmendments ()
         { "E2E6F2866106419B88C50045ACE96368558C345566AC8F2BDF5A5B5587F0E6FA fix1368" },
         { "07D43DCE529B15A10827E5E04943B496762F9A88E3268269D69C44BE49E21104 Escrow" },
         { "86E83A7D2ECE3AD5FA87AB2195AE015C950469ABF0B72EAACED318F74886AE90 CryptoConditionsSuite" },
-        { "48C4451D6C6A138453F056EB6793AFF4B5C57457A37BA63EF3541FF8CE873DC2 ToStrandV2"},
+        { "42EEA5E28A97824821D4EF97081FE36A54E9593C6E4F20CBAE098C69D2E072DC fix1373" },
         { "DC9CA96AEA1DCF83E527D1AFC916EFAF5D27388ECA4060A88817C1238CAEE0BF EnforceInvariants" }
     };
 }

src/ripple/app/paths/impl/BookStep.cpp

@@ -685,7 +685,7 @@ BookStep<TIn, TOut>::check(StrandContext const& ctx) const
         return temBAD_PATH_LOOP;
     }
 
-    if (ctx.view.rules().enabled(featureToStrandV2) &&
+    if (ctx.view.rules().enabled(fix1373) &&
         ctx.seenDirectIssues[1].count(book_.out))
     {
         JLOG(j_.debug()) << "BookStep: loop detected: " << *this;

src/ripple/app/paths/impl/PaySteps.cpp

@@ -104,7 +104,7 @@ toStep (
         JLOG (j.warn())
             << "Found offer/account payment step. Aborting payment strand.";
         assert (0);
-        if (ctx.view.rules().enabled(featureToStrandV2))
+        if (ctx.view.rules().enabled(fix1373))
             return {temBAD_PATH, std::unique_ptr<Step>{}};
         Throw<FlowException> (tefEXCEPTION, "Found offer/account payment step.");
     }
@@ -668,7 +668,7 @@ toStrand (
     bool ownerPaysTransferFee,
     beast::Journal j)
 {
-    if (view.rules().enabled(featureToStrandV2))
+    if (view.rules().enabled(fix1373))
         return toStrandV2(
             view, src, dst, deliver, sendMaxIssue, path, ownerPaysTransferFee, j);
     else

src/ripple/protocol/Feature.h

@@ -48,7 +48,7 @@ extern uint256 const featureTickSize;
 extern uint256 const fix1368;
 extern uint256 const featureEscrow;
 extern uint256 const featureCryptoConditionsSuite;
-extern uint256 const featureToStrandV2;
+extern uint256 const fix1373;
 extern uint256 const featureEnforceInvariants;
 
 } // ripple

src/ripple/protocol/impl/Feature.cpp

@@ -59,7 +59,7 @@ uint256 const featureTickSize = feature("TickSize");
 uint256 const fix1368 = feature("fix1368");
 uint256 const featureEscrow = feature("Escrow");
 uint256 const featureCryptoConditionsSuite = feature("CryptoConditionsSuite");
-uint256 const featureToStrandV2 = feature("ToStrandV2");
+uint256 const fix1373 = feature("fix1373");
 uint256 const featureEnforceInvariants = feature("EnforceInvariants");
 
 } // ripple

src/test/app/CrossingLimits_test.cpp

@@ -159,7 +159,7 @@ public:
         };
         testAll({});
         testAll({featureFlow});
-        testAll({featureFlow, featureToStrandV2});
+        testAll({featureFlow, fix1373});
     }
 };
 

src/test/app/DeliverMin_test.cpp

@@ -113,7 +113,7 @@ public:
     {
         test_convert_all_of_an_asset({});
         test_convert_all_of_an_asset({featureFlow});
-        test_convert_all_of_an_asset({featureFlow, featureToStrandV2});
+        test_convert_all_of_an_asset({featureFlow, fix1373});
     }
 };
 

src/test/app/Discrepancy_test.cpp

@@ -146,7 +146,7 @@ public:
     {
         testXRPDiscrepancy ({});
         testXRPDiscrepancy ({featureFlow});
-        testXRPDiscrepancy ({featureFlow, featureToStrandV2});
+        testXRPDiscrepancy ({featureFlow, fix1373});
     }
 };
 

src/test/app/Flow_test.cpp

@@ -1228,7 +1228,7 @@ struct Flow_test : public beast::unit_test::suite
         };
         testWithFeats();
         testWithFeats(featureFlow);
-        testWithFeats(featureFlow, featureToStrandV2);
+        testWithFeats(featureFlow, fix1373);
     }
 };
 

src/test/app/Freeze_test.cpp

@@ -532,7 +532,7 @@ public:
         };
         testAll({});
         testAll({featureFlow});
-        testAll({featureFlow, featureToStrandV2});
+        testAll({featureFlow, fix1373});
     }
 };
 

src/test/app/Offer_test.cpp

@@ -1923,7 +1923,7 @@ public:
         };
         testAll({});
         testAll({featureFlow});
-        testAll({featureFlow, featureToStrandV2});
+        testAll({featureFlow, fix1373});
     }
 };
 

src/test/app/PayStrand_test.cpp

@@ -645,7 +645,7 @@ struct PayStrand_test : public beast::unit_test::suite
         using RippleCalc = ::ripple::path::RippleCalc;
 
         ExistingElementPool eep;
-        Env env(*this, features(featureToStrandV2));
+        Env env(*this, features(fix1373));
 
         auto const closeTime = fix1298Time() +
             100 * env.closed()->info().closeTimeResolution;
@@ -1264,7 +1264,7 @@ struct PayStrand_test : public beast::unit_test::suite
         auto const USD = gw["USD"];
         auto const EUR = gw["EUR"];
 
-        if (hasFeature(featureToStrandV2, fs))
+        if (hasFeature(fix1373, fs))
         {
             Env env(*this, features(fs));
             env.fund(XRP(10000), alice, bob, gw);
@@ -1363,7 +1363,7 @@ struct PayStrand_test : public beast::unit_test::suite
 
             auto const expectedResult = [&] {
                 if (hasFeature(featureFlow, fs) &&
-                    !hasFeature(featureToStrandV2, fs))
+                    !hasFeature(fix1373, fs))
                     return tesSUCCESS;
                 return temBAD_PATH_LOOP;
             }();
@@ -1404,12 +1404,12 @@ struct PayStrand_test : public beast::unit_test::suite
     {
         testAllPairs();
         testToStrand({featureFlow});
-        testToStrand({featureFlow, featureToStrandV2});
+        testToStrand({featureFlow, fix1373});
         testRIPD1373({});
-        testRIPD1373({featureFlow, featureToStrandV2});
+        testRIPD1373({featureFlow, fix1373});
         testLoop({});
         testLoop({featureFlow});
-        testLoop({featureFlow, featureToStrandV2});
+        testLoop({featureFlow, fix1373});
     }
 };
 

src/test/app/SetAuth_test.cpp

@@ -77,7 +77,7 @@ struct SetAuth_test : public beast::unit_test::suite
     {
         testAuth({});
         testAuth({featureFlow});
-        testAuth({featureFlow, featureToStrandV2});
+        testAuth({featureFlow, fix1373});
     }
 };
 

src/test/app/TrustAndBalance_test.cpp

@@ -508,7 +508,7 @@ public:
         };
         testWithFeatures({});
         testWithFeatures({featureFlow});
-        testWithFeatures({featureFlow, featureToStrandV2});
+        testWithFeatures({featureFlow, fix1373});
     }
 };
 

src/test/ledger/BookDirs_test.cpp

@@ -95,7 +95,7 @@ struct BookDirs_test : public beast::unit_test::suite
     void run() override
     {
         test_bookdir({});
-        test_bookdir({featureFlow, featureToStrandV2});
+        test_bookdir({featureFlow, fix1373});
     }
 };
 

src/test/ledger/PaymentSandbox_test.cpp

@@ -344,7 +344,7 @@ public:
             testReserve(fs);
         };
         testAll({});
-        testAll({featureFlow, featureToStrandV2});
+        testAll({featureFlow, fix1373});
     }
 };
 

src/test/rpc/GatewayBalances_test.cpp

@@ -154,7 +154,7 @@ public:
     run() override
     {
         testGWB({});
-        testGWB({featureFlow, featureToStrandV2});
+        testGWB({featureFlow, fix1373});
     }
 };
 

src/test/rpc/NoRipple_test.cpp

@@ -219,7 +219,7 @@ public:
         };
         withFeatsTests({});
         withFeatsTests({featureFlow});
-        withFeatsTests({featureFlow, featureToStrandV2});
+        withFeatsTests({featureFlow, fix1373});
     }
 };