Further simplifications

Author: marta-lokhova

src/catchup/CatchupConfiguration.cpp

@@ -10,29 +10,21 @@
 namespace stellar
 {
 
-void
-CatchupConfiguration::checkInvariants() const
-{
-}
-
 CatchupConfiguration::CatchupConfiguration(LedgerNumHashPair ledgerHashPair,
                                            uint32_t count, Mode mode)
     : mCount{count}, mLedgerHashPair{ledgerHashPair}, mMode{mode}
 {
-    checkInvariants();
 }
 
 CatchupConfiguration::CatchupConfiguration(uint32_t toLedger, uint32_t count,
                                            Mode mode)
     : mCount{count}, mLedgerHashPair{toLedger, std::nullopt}, mMode{mode}
 {
-    checkInvariants();
 }
 
 CatchupConfiguration
 CatchupConfiguration::resolve(uint32_t remoteCheckpoint) const
 {
-    checkInvariants();
     auto cfg = *this;
     if (toLedger() == CatchupConfiguration::CURRENT)
     {

src/catchup/CatchupConfiguration.h

@@ -102,7 +102,6 @@ class CatchupConfiguration
     uint32_t mCount;
     LedgerNumHashPair mLedgerHashPair;
     Mode mMode;
-    void checkInvariants() const;
 };
 
 uint32_t parseLedger(std::string const& str);

src/herder/HerderImpl.cpp

@@ -306,7 +306,7 @@ HerderImpl::processExternalized(uint64 slotIndex, StellarValue const& value,
         mPendingEnvelopes.getTxSet(value.txSetHash);
 
     // save the SCP messages in the database
-    if (mApp.getConfig().modeStoresHistory())
+    if (mApp.getConfig().MODE_STORES_HISTORY_MISC)
     {
         ZoneNamedN(updateSCPHistoryZone, "update SCP history", true);
         if (slotIndex != 0)

src/ledger/LedgerManagerImpl.cpp

@@ -921,7 +921,7 @@ LedgerManagerImpl::applyLedger(LedgerCloseData const& ledgerData,
     // Subtle: after this call, `header` is invalidated, and is not safe to use
     auto txResultSet = applyTransactions(*applicableTxSet, mutableTxResults,
                                          ltx, ledgerCloseMeta);
-    if (mApp.getConfig().modeStoresHistory())
+    if (mApp.getConfig().MODE_STORES_HISTORY_MISC)
     {
         auto ledgerSeq = ltx.loadHeader().current().ledgerSeq;
         mApp.getHistoryManager().appendTransactionSet(ledgerSeq, txSet,

src/main/ApplicationImpl.cpp

@@ -725,7 +725,7 @@ ApplicationImpl::validateAndLogConfig()
 
     if (getHistoryArchiveManager().publishEnabled())
     {
-        if (!mConfig.modeStoresHistory())
+        if (!mConfig.MODE_STORES_HISTORY_MISC)
         {
             throw std::invalid_argument(
                 "Core is not configured to store history, but "

src/main/CommandHandler.cpp

@@ -85,7 +85,7 @@ CommandHandler::CommandHandler(Application& app) : mApp(app)
     }
 
     mServer->add404(std::bind(&CommandHandler::fileNotFound, this, _1, _2));
-    if (mApp.getConfig().modeStoresHistory())
+    if (mApp.getConfig().MODE_STORES_HISTORY_MISC)
     {
         addRoute("maintenance", &CommandHandler::maintenance);
     }

src/main/Config.cpp

@@ -2389,12 +2389,6 @@ Config::modeDoesCatchupWithBucketList() const
     return MODE_DOES_CATCHUP && MODE_ENABLES_BUCKETLIST;
 }
 
-bool
-Config::modeStoresHistory() const
-{
-    return MODE_STORES_HISTORY_MISC;
-}
-
 bool
 Config::parallelLedgerClose() const
 {

src/main/Config.h

@@ -802,7 +802,6 @@ class Config : public std::enable_shared_from_this<Config>
 
     bool modeDoesCatchupWithBucketList() const;
     bool isPersistingBucketListDBIndexes() const;
-    bool modeStoresHistory() const;
     void logBasicInfo() const;
     bool parallelLedgerClose() const;
     void setNoListen();