diff --git a/src/history/HistoryTestsUtils.cpp b/src/history/HistoryTestsUtils.cpp index a6f751ade0..7266abd611 100644 --- a/src/history/HistoryTestsUtils.cpp +++ b/src/history/HistoryTestsUtils.cpp @@ -427,7 +427,7 @@ CatchupSimulation::catchupApplication(uint32_t initLedger, uint32_t count, CLOG(INFO, "History") << "force-starting catchup at initLedger=" << initLedger; - lm.startCatchUp({initLedger, count}, manual); + lm.startCatchup({initLedger, count}, manual); } // Push publishing side forward one-ledger into a history block if it's diff --git a/src/ledger/LedgerManager.h b/src/ledger/LedgerManager.h index f841415dbc..2f6cb5f158 100644 --- a/src/ledger/LedgerManager.h +++ b/src/ledger/LedgerManager.h @@ -150,7 +150,7 @@ class LedgerManager // LedgerManager detects it is desynchronized from SCP's consensus ledger. // This method is present in the public interface to permit testing and // command line catchups. - virtual void startCatchUp(CatchupConfiguration configuration, + virtual void startCatchup(CatchupConfiguration configuration, bool manualCatchup) = 0; // Called by the history subsystem during catchup: this method asks the diff --git a/src/ledger/LedgerManagerImpl.cpp b/src/ledger/LedgerManagerImpl.cpp index b8b971d076..f15f3b39de 100644 --- a/src/ledger/LedgerManagerImpl.cpp +++ b/src/ledger/LedgerManagerImpl.cpp @@ -437,7 +437,7 @@ LedgerManagerImpl::valueExternalized(LedgerCloseData const& ledgerData) // that way we will have a way to verify history consistency - // compare previousLedgerHash of buffered ledger with last one // downloaded from history - startCatchUp({ledgerData.getLedgerSeq() - 1, getCatchupCount(mApp)}, + startCatchup({ledgerData.getLedgerSeq() - 1, getCatchupCount(mApp)}, false); } break; @@ -479,7 +479,7 @@ LedgerManagerImpl::valueExternalized(LedgerCloseData const& ledgerData) } void -LedgerManagerImpl::startCatchUp(CatchupConfiguration configuration, +LedgerManagerImpl::startCatchup(CatchupConfiguration configuration, bool manualCatchup) { auto lastClosedLedger = getLastClosedLedgerNum(); diff --git a/src/ledger/LedgerManagerImpl.h b/src/ledger/LedgerManagerImpl.h index ac3c11abc1..2a3358e5c2 100644 --- a/src/ledger/LedgerManagerImpl.h +++ b/src/ledger/LedgerManagerImpl.h @@ -100,7 +100,7 @@ class LedgerManagerImpl : public LedgerManager Database& getDatabase() override; - void startCatchUp(CatchupConfiguration configuration, + void startCatchup(CatchupConfiguration configuration, bool manualCatchup) override; HistoryManager::LedgerVerificationStatus diff --git a/src/main/CommandHandler.cpp b/src/main/CommandHandler.cpp index 6f51ce3f5a..4b00b972db 100644 --- a/src/main/CommandHandler.cpp +++ b/src/main/CommandHandler.cpp @@ -567,7 +567,7 @@ CommandHandler::catchup(std::string const& params, std::string& retStr) } } - mApp.getLedgerManager().startCatchUp({ledger, count}, true); + mApp.getLedgerManager().startCatchup({ledger, count}, true); retStr = (std::string("Started catchup to ledger ") + std::to_string(ledger) + std::string(" in mode ") + std::string( diff --git a/src/main/main.cpp b/src/main/main.cpp index 69d81dde04..588a836661 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -287,7 +287,7 @@ catchup(Application::pointer app, uint32_t to, uint32_t count, try { - app->getLedgerManager().startCatchUp({to, count}, true); + app->getLedgerManager().startCatchup({to, count}, true); } catch (std::invalid_argument const&) {