diff --git a/include/xrpl/protocol/detail/features.macro b/include/xrpl/protocol/detail/features.macro index 996f5e983..9daba3dfb 100644 --- a/include/xrpl/protocol/detail/features.macro +++ b/include/xrpl/protocol/detail/features.macro @@ -47,7 +47,7 @@ XRPL_FEATURE(PriceOracle, Supported::yes, VoteBehavior::DefaultNo XRPL_FIX (InnerObjTemplate, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (NFTokenReserve, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (FillOrKill, Supported::yes, VoteBehavior::DefaultNo) -XRPL_FEATURE(DID, Supported::yes, VoteBehavior::DefaultNo) +XRPL_FEATURE(DID, Supported::no, VoteBehavior::DefaultNo) XRPL_FIX (DisallowIncomingV1, Supported::yes, VoteBehavior::DefaultNo) XRPL_FEATURE(XChainBridge, Supported::no, VoteBehavior::DefaultNo) XRPL_FEATURE(AMM, Supported::yes, VoteBehavior::DefaultNo) diff --git a/src/test/app/AccountDelete_test.cpp b/src/test/app/AccountDelete_test.cpp index aa1939e7b..5fa016878 100644 --- a/src/test/app/AccountDelete_test.cpp +++ b/src/test/app/AccountDelete_test.cpp @@ -110,7 +110,7 @@ public: testcase("Basics"); - Env env(*this, features); + Env env(*this, features | featureDID); Account const alice("alice"); Account const becky("becky"); Account const carol("carol"); diff --git a/src/test/app/DID_test.cpp b/src/test/app/DID_test.cpp index 518f54e84..82e286ef4 100644 --- a/src/test/app/DID_test.cpp +++ b/src/test/app/DID_test.cpp @@ -386,7 +386,7 @@ struct DID_test : public beast::unit_test::suite run() override { using namespace test::jtx; - FeatureBitset const all{supported_amendments()}; + FeatureBitset const all{supported_amendments() | featureDID}; testEnabled(all); testAccountReserve(all); testSetInvalid(all); diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp index 5c64350f1..ca9941c70 100644 --- a/src/test/rpc/AccountObjects_test.cpp +++ b/src/test/rpc/AccountObjects_test.cpp @@ -576,7 +576,9 @@ public: auto const USD = gw["USD"]; Env env( - *this, features | featureXChainBridge | featurePermissionedDomains); + *this, + features | featureXChainBridge | featureDID | + featurePermissionedDomains); // Make a lambda we can use to get "account_objects" easily. auto acctObjs = [&env]( diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp index c3ba2c0af..47829ba02 100644 --- a/src/test/rpc/LedgerRPC_test.cpp +++ b/src/test/rpc/LedgerRPC_test.cpp @@ -2792,7 +2792,7 @@ public: testcase("ledger_entry Request DID"); using namespace test::jtx; using namespace std::literals::chrono_literals; - Env env{*this}; + Env env{*this, supported_amendments() | featureDID}; Account const alice{"alice"}; env.fund(XRP(10000), alice);