[FOLD] Address @ximinez feedback

* Refactor auction slot amendment creation on initialize
* Update a comment in amm test utils

Author: gregtatcam

src/ripple/app/misc/impl/AMMUtils.cpp

@@ -303,22 +303,13 @@ initializeFeeAuctionVote(
     // AMM creator gets the auction slot for free.
     // AuctionSlot is created on AMMCreate and updated on AMMDeposit
     // when AMM is in an empty state
-    STObject& auctionSlot = [&]() -> STObject& {
-        if (!rules.enabled(fixInnerObjTemplate))
-        {
-            return ammSle->peekFieldObject(sfAuctionSlot);
-        }
-        else
-        {
-            if (!ammSle->isFieldPresent(sfAuctionSlot))
-            {
-                STObject auctionSlot =
-                    STObject::makeInnerObject(sfAuctionSlot, rules);
-                ammSle->set(std::move(auctionSlot));
-            }
-            return ammSle->peekFieldObject(sfAuctionSlot);
-        }
-    }();
+    if (rules.enabled(fixInnerObjTemplate) &&
+        !ammSle->isFieldPresent(sfAuctionSlot))
+    {
+        STObject auctionSlot = STObject::makeInnerObject(sfAuctionSlot, rules);
+        ammSle->set(std::move(auctionSlot));
+    }
+    STObject& auctionSlot = ammSle->peekFieldObject(sfAuctionSlot);
     auctionSlot.setAccountID(sfAccount, account);
     // current + sec in 24h
     auto const expiration = std::chrono::duration_cast<std::chrono::seconds>(

src/test/jtx/impl/AMM.cpp

@@ -787,8 +787,10 @@ AMM::expectAuctionSlot(auto&& cb) const
                 static_cast<STObject const&>(amm->peekAtField(sfAuctionSlot));
             if (auctionSlot.isFieldPresent(sfAccount))
             {
-                // this could fail in pre-fixInnerObjTemplate test if one
-                // the fail-cases. access as optional to avoid the failure
+                // This could fail in pre-fixInnerObjTemplate tests
+                // if the submitted transactions recreate one of
+                // the failure scenarios. Access as optional
+                // to avoid the failure.
                 auto const slotFee = auctionSlot[~sfDiscountedFee].value_or(0);
                 auto const slotInterval = ammAuctionTimeSlot(
                     env_.app().timeKeeper().now().time_since_epoch().count(),