Cleanup and rebase

stellar · Nov 11, 2024 · 3f365af · 3f365af
1 parent 594a04e
commit 3f365af
Show file tree

Hide file tree

Showing 5 changed files with 640 additions and 638 deletions.
diff --git a/src/bucket/BucketOutputIterator.cpp b/src/bucket/BucketOutputIterator.cpp
@@ -52,7 +52,7 @@ BucketOutputIterator<BucketT>::BucketOutputIterator(std::string const& tmpDir,
             bme.metaEntry() = mMeta;
             put(bme);
         }
-        else
+        else if constexpr (std::is_same_v<BucketT, HotArchiveBucket>)
         {
             releaseAssertOrThrow(protocolVersionStartsFrom(
                 meta.ledgerVersion,

diff --git a/src/main/CommandLine.cpp b/src/main/CommandLine.cpp
@@ -1927,9 +1927,11 @@ runApplyLoad(CommandLineArgs const& args)
 
                 for (size_t i = 0; i < 100; ++i)
                 {
-                    app.getBucketManager().getBucketList().resolveAllFutures();
+                    app.getBucketManager()
+                        .getLiveBucketList()
+                        .resolveAllFutures();
                     releaseAssert(app.getBucketManager()
-                                      .getBucketList()
+                                      .getLiveBucketList()
                                       .futuresAllResolved());
                     al.benchmark();
                 }

diff --git a/src/simulation/test/LoadGeneratorTests.cpp b/src/simulation/test/LoadGeneratorTests.cpp
@@ -870,9 +870,9 @@ TEST_CASE("apply load", "[loadgen][applyload]")
     cpuInsRatioExclVm.Clear();
     for (size_t i = 0; i < 100; ++i)
     {
-        app->getBucketManager().getBucketList().resolveAllFutures();
+        app->getBucketManager().getLiveBucketList().resolveAllFutures();
         releaseAssert(
-            app->getBucketManager().getBucketList().futuresAllResolved());
+            app->getBucketManager().getLiveBucketList().futuresAllResolved());
 
         al.benchmark();
     }