Cleanup and rebase

stellar · Nov 11, 2024 · 36fc351 · 36fc351
1 parent 594a04e
commit 36fc351
Show file tree

Hide file tree

Showing 7 changed files with 647 additions and 645 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/rust/soroban/p22 b/src/rust/soroban/p22
diff --git a/src/rust/src/dep-trees/p22-expect.txt b/src/rust/src/dep-trees/p22-expect.txt
@@ -1,4 +1,4 @@
-soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
+soroban-env-host v22.0.0-rc.3 (src/rust/soroban/p22/soroban-env-host)
 ├── ark-bls12-381 v0.4.0
 │   ├── ark-ec v0.4.2
 │   │   ├── ark-ff v0.4.2
@@ -222,17 +222,17 @@ soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
 │   ├── digest v0.10.7 (*)
 │   └── keccak v0.1.4
 │       └── cpufeatures v0.2.8 (*)
-├── soroban-builtin-sdk-macros v22.0.0 (proc-macro) (src/rust/soroban/p22/soroban-builtin-sdk-macros)
+├── soroban-builtin-sdk-macros v22.0.0-rc.3 (proc-macro) (src/rust/soroban/p22/soroban-builtin-sdk-macros)
 │   ├── itertools v0.10.5
 │   │   └── either v1.8.1
 │   ├── proc-macro2 v1.0.69 (*)
 │   ├── quote v1.0.33 (*)
 │   └── syn v2.0.39 (*)
-├── soroban-env-common v22.0.0 (src/rust/soroban/p22/soroban-env-common)
+├── soroban-env-common v22.0.0-rc.3 (src/rust/soroban/p22/soroban-env-common)
 │   ├── ethnum v1.5.0
 │   ├── num-derive v0.4.1 (proc-macro) (*)
 │   ├── num-traits v0.2.17 (*)
-│   ├── soroban-env-macros v22.0.0 (proc-macro) (src/rust/soroban/p22/soroban-env-macros)
+│   ├── soroban-env-macros v22.0.0-rc.3 (proc-macro) (src/rust/soroban/p22/soroban-env-macros)
 │   │   ├── itertools v0.10.5 (*)
 │   │   ├── proc-macro2 v1.0.69 (*)
 │   │   ├── quote v1.0.33 (*)
@@ -245,7 +245,7 @@ soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
 │   │   │   ├── itoa v1.0.6
 │   │   │   ├── ryu v1.0.13
 │   │   │   └── serde v1.0.192 (*)
-│   │   ├── stellar-xdr v22.0.0
+│   │   ├── stellar-xdr v22.0.0-rc.1.1
 │   │   │   ├── escape-bytes v0.1.1
 │   │   │   ├── hex v0.4.3
 │   │   │   └── stellar-strkey v0.0.9
@@ -275,7 +275,7 @@ soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
 │   │   └── wasmparser-nostd v0.100.2
 │   │       └── indexmap-nostd v0.4.0
 │   ├── static_assertions v1.1.0
-│   ├── stellar-xdr v22.0.0
+│   ├── stellar-xdr v22.0.0-rc.1.1
 │   │   ├── base64 v0.13.1
 │   │   ├── escape-bytes v0.1.1
 │   │   ├── hex v0.4.3

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();
     }