Fix acceptance tests (#4615)

* Update catchup tests to reflect the new LM policy for being in sync
* Rename CatchupManager to LedgerApplyManager to more accurately capture
module's responsibilities

src/catchup/ApplyBucketsWork.cpp

@@ -8,8 +8,8 @@
 #include "bucket/LiveBucket.h"
 #include "bucket/LiveBucketList.h"
 #include "catchup/AssumeStateWork.h"
-#include "catchup/CatchupManager.h"
 #include "catchup/IndexBucketsWork.h"
+#include "catchup/LedgerApplyManager.h"
 #include "crypto/Hex.h"
 #include "crypto/SecretKey.h"
 #include "historywork/Progress.h"
@@ -169,7 +169,7 @@ ApplyBucketsWork::prepareForNextBucket()
 {
     ZoneScoped;
     mBucketApplicator.reset();
-    mApp.getCatchupManager().bucketsApplied();
+    mApp.getLedgerApplyManager().bucketsApplied();
     mBucketToApplyIndex++;
     // If mBucketToApplyIndex is even, we are progressing to the next
     // level

src/catchup/ApplyBufferedLedgersWork.cpp

@@ -39,7 +39,7 @@ ApplyBufferedLedgersWork::onRun()
     }
 
     std::optional<LedgerCloseData> maybeLcd =
-        mApp.getCatchupManager().maybeGetNextBufferedLedgerToApply();
+        mApp.getLedgerApplyManager().maybeGetNextBufferedLedgerToApply();
 
     if (!maybeLcd)
     {

src/catchup/ApplyCheckpointWork.cpp

@@ -361,7 +361,7 @@ ApplyCheckpointWork::onRun()
                         lm.getLastClosedLedgerHeader())));
             }
 
-            mApp.getCatchupManager().txSetsApplied();
+            mApp.getLedgerApplyManager().txSetsApplied();
         }
         else
         {

src/catchup/CatchupWork.cpp

@@ -475,7 +475,8 @@ CatchupWork::runCatchupStep()
                 }
             }
             // see if we need to apply buffered ledgers
-            if (mApp.getCatchupManager().maybeGetNextBufferedLedgerToApply())
+            if (mApp.getLedgerApplyManager()
+                    .maybeGetNextBufferedLedgerToApply())
             {
                 mApplyBufferedLedgersWork = addWork<ApplyBufferedLedgersWork>();
                 mCurrentWork = mApplyBufferedLedgersWork;
@@ -632,14 +633,14 @@ CatchupWork::doWork()
 {
     ZoneScoped;
     auto nextState = runCatchupStep();
-    auto& cm = mApp.getCatchupManager();
+    auto& lam = mApp.getLedgerApplyManager();
 
     if (nextState == BasicWork::State::WORK_SUCCESS)
     {
-        releaseAssert(!cm.maybeGetNextBufferedLedgerToApply());
+        releaseAssert(!lam.maybeGetNextBufferedLedgerToApply());
     }
 
-    cm.logAndUpdateCatchupStatus(true);
+    lam.logAndUpdateCatchupStatus(true);
     return nextState;
 }
 

src/catchup/CatchupManager.h → src/catchup/LedgerApplyManager.h

@@ -24,7 +24,7 @@ class Application;
 class CatchupMetrics;
 class FileTransferInfo;
 
-class CatchupManager
+class LedgerApplyManager
 {
   public:
     struct CatchupMetrics
@@ -55,7 +55,7 @@ class CatchupManager
         PROCESSED_ALL_LEDGERS_SEQUENTIALLY,
         WAIT_TO_APPLY_BUFFERED_OR_CATCHUP
     };
-    static std::unique_ptr<CatchupManager> create(Application& app);
+    static std::unique_ptr<LedgerApplyManager> create(Application& app);
 
     // Process ledgers that could not be applied, and determine if catchup
     // should run
@@ -97,16 +97,16 @@ class CatchupManager
     virtual void logAndUpdateCatchupStatus(bool contiguous) = 0;
 
     // This returns the ledger that comes immediately after the LCL (i.e., LCL +
-    // 1) if CatchupManager has it in its buffer. If not, it doesn’t return any
-    // ledger. This method doesn’t tell if the buffer is empty or if it's ever
-    // heard of LCL + 1. It only tells if CatchupManager has LCL + 1 in its
-    // buffer right now.
+    // 1) if LedgerApplyManager has it in its buffer. If not, it doesn’t return
+    // any ledger. This method doesn’t tell if the buffer is empty or if it's
+    // ever heard of LCL + 1. It only tells if LedgerApplyManager has LCL + 1 in
+    // its buffer right now.
     virtual std::optional<LedgerCloseData>
     maybeGetNextBufferedLedgerToApply() = 0;
 
     virtual std::optional<LedgerCloseData> maybeGetLargestBufferedLedger() = 0;
 
-    // This returns the largest ledger sequence that CatchupManager has ever
+    // This returns the largest ledger sequence that LedgerApplyManager has ever
     // heard of.
     virtual uint32_t getLargestLedgerSeqHeard() const = 0;
 
@@ -118,7 +118,7 @@ class CatchupManager
 
     virtual CatchupMetrics const& getCatchupMetrics() = 0;
 
-    virtual ~CatchupManager(){};
+    virtual ~LedgerApplyManager(){};
 
     virtual void historyArchiveStatesDownloaded(uint32_t num = 1) = 0;
     virtual void ledgersVerified(uint32_t num = 1) = 0;