Fix misc pool exception and relevant test (#5098)

Author: marta-lokhova

src/history/StateSnapshot.cpp

@@ -54,9 +54,12 @@ bool
 StateSnapshot::writeSCPMessages() const
 {
     ZoneScoped;
+    bool canUseMisc = mApp.getDatabase().canUseMiscDB();
     std::unique_ptr<soci::session> snapSess(
         (mApp.getDatabase().canUsePool()
-             ? std::make_unique<soci::session>(mApp.getDatabase().getMiscPool())
+             ? std::make_unique<soci::session>(
+                   canUseMisc ? mApp.getDatabase().getMiscPool()
+                              : mApp.getDatabase().getPool())
              : nullptr));
     soci::session& sess(snapSess ? *snapSess
                                  : mApp.getDatabase().getRawMiscSession());

src/history/test/HistoryTests.cpp

@@ -1096,16 +1096,6 @@ TEST_CASE("Publish throttles catchup", "[history][catchup][acceptance]")
 TEST_CASE("History catchup with different modes",
           "[history][catchup][acceptance]")
 {
-    CatchupSimulation catchupSimulation{};
-
-    auto checkpointLedger = catchupSimulation.getLastCheckpointLedger(3);
-    catchupSimulation.ensureOnlineCatchupPossible(checkpointLedger, 5);
-
-    std::vector<Application::pointer> apps;
-
-    std::vector<uint32_t> counts = {0, std::numeric_limits<uint32_t>::max(),
-                                    60};
-
     std::vector<Config::TestDbMode> dbModes = {
         Config::TESTDB_BUCKET_DB_PERSISTENT};
 #ifdef USE_POSTGRES
@@ -1115,14 +1105,31 @@ TEST_CASE("History catchup with different modes",
 
     for (auto dbMode : dbModes)
     {
-        for (auto count : counts)
+        SECTION(std::string("DB mode: ") + dbModeName(dbMode))
         {
-            auto a = catchupSimulation.createCatchupApplication(
-                count, dbMode,
-                std::string("full, ") + resumeModeName(count) + ", " +
-                    dbModeName(dbMode));
-            REQUIRE(catchupSimulation.catchupOnline(a, checkpointLedger, 5));
-            apps.push_back(a);
+            CatchupSimulation catchupSimulation{
+                VirtualClock::VIRTUAL_TIME,
+                std::make_shared<TmpDirHistoryConfigurator>(), true, dbMode};
+
+            auto checkpointLedger =
+                catchupSimulation.getLastCheckpointLedger(3);
+            catchupSimulation.ensureOnlineCatchupPossible(checkpointLedger, 5);
+
+            std::vector<Application::pointer> apps;
+
+            std::vector<uint32_t> counts = {
+                0, std::numeric_limits<uint32_t>::max(), 60};
+
+            for (auto count : counts)
+            {
+                auto a = catchupSimulation.createCatchupApplication(
+                    count, dbMode,
+                    std::string("full, ") + resumeModeName(count) + ", " +
+                        dbModeName(dbMode));
+                REQUIRE(
+                    catchupSimulation.catchupOnline(a, checkpointLedger, 5));
+                apps.push_back(a);
+            }
         }
     }
 }