Remove comments about featureFeeEscalation enabled 19May2016

XRPLF · Jan 30, 2020 · c48be14 · c48be14
1 parent ecbbabf
commit c48be14
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/ripple/app/misc/impl/TxQ.cpp b/src/ripple/app/misc/impl/TxQ.cpp
@@ -563,9 +563,6 @@ TxQ::tryClearAccountQueue(Application& app, OpenView& view,
 
 /*
     How the decision to apply, queue, or reject is made:
-    0. Is `featureFeeEscalation` enabled?
-        Yes: Continue to next step.
-        No: Fallback to `ripple::apply`. Stop.
     1. Does `preflight` indicate that the tx is valid?
         No: Return the `TER` from `preflight`. Stop.
         Yes: Continue to next step.
@@ -1170,9 +1167,6 @@ TxQ::apply(Application& app, OpenView& view,
 }
 
 /*
-    0. Is `featureFeeEscalation` enabled?
-        Yes: Continue to next step.
-        No: Stop.
     1. Update the fee metrics based on the fee levels of the
         txs in the validated ledger and whether consensus is
         slow.
@@ -1229,9 +1223,6 @@ TxQ::processClosedLedger(Application& app,
 /*
     How the txs are moved from the queue to the new open ledger.
 
-    0. Is `featureFeeEscalation` enabled?
-        Yes: Continue to next step.
-        No: Don't do anything to the open ledger. Stop.
     1. Iterate over the txs from highest fee level to lowest.
         For each tx:
         a) Is this the first tx in the queue for this account?

diff --git a/src/ripple/protocol/Feature.h b/src/ripple/protocol/Feature.h
@@ -53,7 +53,7 @@ class FeatureCollections
         "MultiSign",
         "Tickets",
         "TrustSetAuth",
-        "FeeEscalation",
+        "FeeEscalation",               // Unconditionally supported.
         "OwnerPaysFee",
         "CompareFlowV1V2",
         "PayChan",

diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/ripple/protocol/impl/Feature.cpp
@@ -82,12 +82,20 @@ detail::supportedAmendments ()
 {
     // Commented out amendments will be supported in a future release (and
     // uncommented at that time).
+    //
+    // There are also unconditionally supported amendments in the list.
+    // Those are amendments that were enabled some time ago and the
+    // amendment conditional code has been removed.
+    //
+    // ** WARNING **
+    // Unconditionally supported amendments need to remain in the list.
+    // Removing them will cause servers to become amendment blocked.
     static std::vector<std::string> const supported
     {
         "MultiSign",
 //        "Tickets",
         "TrustSetAuth",
-        "FeeEscalation", // Looks unused, but do not remove; Servers will be amendment blocked.
+        "FeeEscalation",               // Unconditionally supported.
 //        "OwnerPaysFee",
         "PayChan",
         "Flow",