Revert "fix(test): expect config-forced amendments only where the Env forces them"

This reverts commit 067ad43b36.

src/test/rpc/ServerDefinitions_test.cpp

@@ -24,8 +24,6 @@
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/jss.h>
 
-#include <set>
-
 namespace ripple {
 
 namespace test {
@@ -184,14 +182,6 @@ public:
         std::map<std::string, VoteBehavior> const& votes =
             ripple::detail::supportedAmendments();
 
-        // The jtx fixture does not force every supported amendment through
-        // config (this lineage keeps ConsensusEntropy out of the default set),
-        // so "enabled" is expected exactly for what the Env's config forces.
-        std::set<std::string> forced;
-        for (auto const& h : env.app().config().features)
-            if (auto const fname = featureToName(h); !fname.empty())
-                forced.insert(fname);
-
         auto jrr = env.rpc("server_definitions")[jss::result];
         if (!BEAST_EXPECT(jrr.isMember(jss::features)))
             return;
@@ -205,11 +195,9 @@ public:
             bool expectObsolete =
                 (votes.at(feature[jss::name].asString()) ==
                  VoteBehavior::Obsolete);
-            bool const expectForced =
-                forced.count(feature[jss::name].asString()) != 0;
             BEAST_EXPECTS(
                 feature.isMember(jss::enabled) &&
-                    feature[jss::enabled].asBool() == expectForced,
+                    feature[jss::enabled].asBool(),
                 feature[jss::name].asString() + " enabled");
             BEAST_EXPECTS(
                 feature.isMember(jss::ledger_enabled) &&

src/xrpld/rpc/handlers/ServerDefinitions.cpp

@@ -23,8 +23,8 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/AmendmentTable.h>
 #include <xrpld/app/misc/NetworkOPs.h>
-#include <xrpld/core/Config.h>
 #include <xrpld/rpc/Context.h>
+#include <xrpld/core/Config.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/json/json_writer.h>