diff --git a/include/xrpl/protocol/detail/features.macro b/include/xrpl/protocol/detail/features.macro index d25eebee3..608350eee 100644 --- a/include/xrpl/protocol/detail/features.macro +++ b/include/xrpl/protocol/detail/features.macro @@ -48,7 +48,6 @@ XRPL_FEATURE(NFTokenMintOffer, Supported::yes, VoteBehavior::DefaultNo XRPL_FIX (AMMv1_1, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (PreviousTxnID, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (XChainRewardRounding, Supported::yes, VoteBehavior::DefaultNo) -XRPL_FIX (EmptyDID, Supported::yes, VoteBehavior::DefaultNo) XRPL_FEATURE(PriceOracle, Supported::yes, VoteBehavior::DefaultNo) XRPL_FIX (AMMOverflowOffer, Supported::yes, VoteBehavior::DefaultYes) XRPL_FIX (InnerObjTemplate, Supported::yes, VoteBehavior::DefaultNo) diff --git a/src/test/app/DID_test.cpp b/src/test/app/DID_test.cpp index 3f9cce1d3..518f54e84 100644 --- a/src/test/app/DID_test.cpp +++ b/src/test/app/DID_test.cpp @@ -168,13 +168,9 @@ struct DID_test : public beast::unit_test::suite BEAST_EXPECT(ownerCount(env, alice) == 0); // some empty fields, some optional fields - // pre-fix amendment - auto const fixEnabled = env.current()->rules().enabled(fixEmptyDID); - env(did::set(alice), - did::uri(""), - fixEnabled ? ter(tecEMPTY_DID) : ter(tesSUCCESS)); + env(did::set(alice), did::uri(""), ter(tecEMPTY_DID)); env.close(); - auto const expectedOwnerReserve = fixEnabled ? 0 : 1; + auto const expectedOwnerReserve = 0; BEAST_EXPECT(ownerCount(env, alice) == expectedOwnerReserve); // Modifying a DID to become empty is checked in testSetModify @@ -391,18 +387,11 @@ struct DID_test : public beast::unit_test::suite { using namespace test::jtx; FeatureBitset const all{supported_amendments()}; - FeatureBitset const emptyDID{fixEmptyDID}; testEnabled(all); testAccountReserve(all); testSetInvalid(all); testDeleteInvalid(all); testSetModify(all); - - testEnabled(all - emptyDID); - testAccountReserve(all - emptyDID); - testSetInvalid(all - emptyDID); - testDeleteInvalid(all - emptyDID); - testSetModify(all - emptyDID); } }; diff --git a/src/xrpld/app/tx/detail/DID.cpp b/src/xrpld/app/tx/detail/DID.cpp index 6e5a3108c..ff3a34d3d 100644 --- a/src/xrpld/app/tx/detail/DID.cpp +++ b/src/xrpld/app/tx/detail/DID.cpp @@ -161,8 +161,7 @@ DIDSet::doApply() set(sfURI); set(sfDIDDocument); set(sfData); - if (ctx_.view().rules().enabled(fixEmptyDID) && - !sleDID->isFieldPresent(sfURI) && + if (!sleDID->isFieldPresent(sfURI) && !sleDID->isFieldPresent(sfDIDDocument) && !sleDID->isFieldPresent(sfData)) {