Cleanup for consistency with develop

gregtatcam · Jul 22, 2024 · 4528a13 · 4528a13
1 parent f7c4cfc
commit 4528a13
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 405 deletions.
diff --git a/include/xrpl/protocol/Asset.h b/include/xrpl/protocol/Asset.h
diff --git a/include/xrpl/protocol/Feature.h b/include/xrpl/protocol/Feature.h
@@ -80,7 +80,7 @@ namespace detail {
 // Feature.cpp. Because it's only used to reserve storage, and determine how
 // large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than
 // the actual number of amendments. A LogicError on startup will verify this.
-static constexpr std::size_t numFeatures = 79;
+static constexpr std::size_t numFeatures = 78;
 
 /** Amendments that this server supports and the default voting behavior.
    Whether they are enabled depends on the Rules defined in the validated
@@ -370,7 +370,6 @@ extern uint256 const featureNFTokenMintOffer;
 extern uint256 const fixReducedOffersV2;
 extern uint256 const fixEnforceNFTokenTrustline;
 extern uint256 const fixInnerObjTemplate2;
-extern uint256 const featureInvariantsV1_1;
 extern uint256 const featureMPTokensV1;
 
 }  // namespace ripple

diff --git a/include/xrpl/protocol/Indexes.h b/include/xrpl/protocol/Indexes.h
@@ -29,7 +29,6 @@
 #include <xrpl/protocol/STXChainBridge.h>
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/UintTypes.h>
-#include <xrpl/protocol/jss.h>
 #include <cstdint>
 
 namespace ripple {
@@ -337,26 +336,6 @@ getTicketIndex(AccountID const& account, std::uint32_t uSequence);
 uint256
 getTicketIndex(AccountID const& account, SeqProxy ticketSeq);
 
-template <class... keyletParams>
-struct keyletDesc
-{
-    std::function<Keylet(keyletParams...)> function;
-    Json::StaticString expectedLEName;
-    bool includeInTests;
-};
-
-// This list should include all of the keylet functions that take a single
-// AccountID parameter.
-std::array<keyletDesc<AccountID const&>, 6> const directAccountKeylets{
-    {{&keylet::account, jss::AccountRoot, false},
-     {&keylet::ownerDir, jss::DirectoryNode, true},
-     {&keylet::signers, jss::SignerList, true},
-     // It's normally impossible to create an item at nftpage_min, but
-     // test it anyway, since the invariant checks for it.
-     {&keylet::nftpage_min, jss::NFTokenPage, true},
-     {&keylet::nftpage_max, jss::NFTokenPage, true},
-     {&keylet::did, jss::DID, true}}};
-
 uint192
 getMptID(AccountID const& account, std::uint32_t sequence);
 

diff --git a/include/xrpl/protocol/Issue.h b/include/xrpl/protocol/Issue.h
@@ -38,9 +38,13 @@ class Issue
     Currency currency{};
     AccountID account{};
 
-    Issue() = default;
+    Issue()
+    {
+    }
 
-    Issue(Currency const& c, AccountID const& a);
+    Issue(Currency const& c, AccountID const& a) : currency(c), account(a)
+    {
+    }
 
     AccountID const&
     getIssuer() const;

diff --git a/include/xrpl/protocol/detail/STVar.h b/include/xrpl/protocol/detail/STVar.h
@@ -49,7 +49,7 @@ extern nonPresentObject_t nonPresentObject;
 class STVar
 {
 private:
-    // The largest "small object" we can accommodate
+    // The largest "small object" we can accomodate
     static std::size_t constexpr max_size = 72;
 
     std::aligned_storage<max_size>::type d_;

diff --git a/src/libxrpl/protocol/Asset.cpp b/src/libxrpl/protocol/Asset.cpp
diff --git a/src/libxrpl/protocol/Feature.cpp b/src/libxrpl/protocol/Feature.cpp
@@ -497,9 +497,6 @@ REGISTER_FEATURE(NFTokenMintOffer,              Supported::yes, VoteBehavior::De
 REGISTER_FIX    (fixReducedOffersV2,            Supported::yes, VoteBehavior::DefaultNo);
 REGISTER_FIX    (fixEnforceNFTokenTrustline,    Supported::yes, VoteBehavior::DefaultNo);
 REGISTER_FIX    (fixInnerObjTemplate2,          Supported::yes, VoteBehavior::DefaultNo);
-// InvariantsV1_1 will be changes to Supported::yes when all the
-// invariants expected to be included under it are complete.
-REGISTER_FEATURE(InvariantsV1_1,                Supported::no, VoteBehavior::DefaultNo);
 REGISTER_FEATURE(MPTokensV1,                    Supported::yes, VoteBehavior::DefaultNo);
 
 // The following amendments are obsolete, but must remain supported

diff --git a/src/libxrpl/protocol/Issue.cpp b/src/libxrpl/protocol/Issue.cpp
@@ -26,10 +26,6 @@
 
 namespace ripple {
 
-Issue::Issue(Currency const& c, AccountID const& a) : currency(c), account(a)
-{
-}
-
 AccountID const&
 Issue::getIssuer() const
 {