Remove dead code now that in-memory mode is dropped

stellar · Jan 3, 2025 · a757b61 · a757b61
1 parent 229beb4
commit a757b61
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 60 deletions.
diff --git a/src/catchup/ApplyBucketsWork.cpp b/src/catchup/ApplyBucketsWork.cpp
@@ -207,20 +207,6 @@ ApplyBucketsWork::doWork()
     if (!mAssumeStateWork)
     {
         // Step 2: apply buckets.
-        if (mApp.getLedgerManager().rebuildingInMemoryState() && !mDelayChecked)
-        {
-            mDelayChecked = true;
-            auto delay = mApp.getConfig()
-                             .ARTIFICIALLY_DELAY_BUCKET_APPLICATION_FOR_TESTING;
-            if (delay != std::chrono::seconds::zero())
-            {
-                CLOG_INFO(History, "Delay bucket application by {} seconds",
-                          delay.count());
-                setupWaitingCallback(delay);
-                return State::WORK_WAITING;
-            }
-        }
-
         auto isCurr = mBucketToApplyIndex % 2 == 0;
         if (mBucketApplicator)
         {

diff --git a/src/catchup/ApplyBucketsWork.h b/src/catchup/ApplyBucketsWork.h
@@ -41,7 +41,6 @@ class ApplyBucketsWork : public Work
     std::unordered_set<LedgerKey> mSeenKeys;
     std::vector<std::shared_ptr<LiveBucket>> mBucketsToApply;
     std::unique_ptr<BucketApplicator> mBucketApplicator;
-    bool mDelayChecked{false};
 
     BucketApplicator::Counters mCounters;
     bool const mIsApplyInvariantEnabled;

diff --git a/src/ledger/LedgerManager.h b/src/ledger/LedgerManager.h
@@ -161,11 +161,6 @@ class LedgerManager
     //  and restart merges
     virtual void loadLastKnownLedger(bool restoreBucketlist) = 0;
 
-    // Return true if core is currently rebuilding in-memory state via local
-    // catchup
-    virtual bool rebuildingInMemoryState() = 0;
-    virtual void setupInMemoryStateRebuild() = 0;
-
     // Forcibly switch the application into catchup mode, treating `toLedger`
     // as the destination ledger number and count as the number of past ledgers
     // that should be replayed. Normally this happens automatically when

diff --git a/src/ledger/LedgerManagerImpl.cpp b/src/ledger/LedgerManagerImpl.cpp
@@ -178,20 +178,6 @@ LedgerManagerImpl::setState(State s)
         {
             mApp.getCatchupManager().logAndUpdateCatchupStatus(true);
         }
-
-        if (mState == LM_CATCHING_UP_STATE && !mStartCatchup)
-        {
-            mStartCatchup = std::make_unique<VirtualClock::time_point>(
-                mApp.getClock().now());
-        }
-        else if (mState == LM_SYNCED_STATE && mStartCatchup)
-        {
-            std::chrono::nanoseconds duration =
-                mApp.getClock().now() - *mStartCatchup;
-            mCatchupDuration.Update(duration);
-            CLOG_DEBUG(Perf, "Caught up to the network in {} seconds",
-                       std::chrono::duration<double>(duration).count());
-        }
     }
 }
 
@@ -398,30 +384,6 @@ LedgerManagerImpl::loadLastKnownLedger(bool restoreBucketlist)
     }
 }
 
-bool
-LedgerManagerImpl::rebuildingInMemoryState()
-{
-    return mRebuildInMemoryState;
-}
-
-void
-LedgerManagerImpl::setupInMemoryStateRebuild()
-{
-    if (!mRebuildInMemoryState)
-    {
-        LedgerHeader lh;
-        HistoryArchiveState has;
-        auto& ps = mApp.getPersistentState();
-        ps.setState(PersistentState::kLastClosedLedger,
-                    binToHex(xdrSha256(lh)));
-        ps.setState(PersistentState::kHistoryArchiveState, has.toString());
-        ps.setState(PersistentState::kLastSCPData, "");
-        ps.setState(PersistentState::kLastSCPDataXDR, "");
-        ps.setState(PersistentState::kLedgerUpgrades, "");
-        mRebuildInMemoryState = true;
-    }
-}
-
 Database&
 LedgerManagerImpl::getDatabase()
 {

diff --git a/src/ledger/LedgerManagerImpl.h b/src/ledger/LedgerManagerImpl.h
@@ -189,8 +189,6 @@ class LedgerManagerImpl : public LedgerManager
     void startNewLedger(LedgerHeader const& genesisLedger);
     void startNewLedger() override;
     void loadLastKnownLedger(bool restoreBucketlist) override;
-    virtual bool rebuildingInMemoryState() override;
-    virtual void setupInMemoryStateRebuild() override;
 
     LedgerHeaderHistoryEntry const& getLastClosedLedgerHeader() const override;