close worldstate clone correctly

Signed-off-by: Karim Taam <karim.t2am@gmail.com>
garyschulte · Jul 12, 2024 · b4f58e4 · b4f58e4
1 parent ed0a683
commit b4f58e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/...ger/besu/ethereum/mainnet/parallelization/ParallelizedConcurrentTransactionProcessor.java b/...ger/besu/ethereum/mainnet/parallelization/ParallelizedConcurrentTransactionProcessor.java
@@ -136,10 +136,10 @@ public void runTransaction(
       final BlockHashOperation.BlockHashLookup blockHashLookup,
       final Wei blobGasPrice,
       final PrivateMetadataUpdater privateMetadataUpdater) {
-    try {
-      final DiffBasedWorldState roundWorldState =
-              new BonsaiWorldState((BonsaiWorldState) worldState, new NoopBonsaiCachedMerkleTrieLoader());
-
+    try (final DiffBasedWorldState roundWorldState =
+                 new BonsaiWorldState(
+                         (BonsaiWorldState) worldState, new NoopBonsaiCachedMerkleTrieLoader())) {
+      roundWorldState.freeze(); // make the clone frozen
       final ParallelizedTransactionContext.Builder contextBuilder =
               new ParallelizedTransactionContext.Builder();
       final DiffBasedWorldStateUpdateAccumulator<?> roundWorldStateUpdater =
@@ -195,9 +195,6 @@ public void traceBeforeRewardTransaction(
       }
       parallelizedTransactionContextByLocation.put(
               transactionLocation, parallelizedTransactionContext);
-      roundWorldState.close();
-    } catch (Exception exception) {
-      // no-op
     }
   }
 

diff --git a/.../java/org/hyperledger/besu/ethereum/trie/diffbased/bonsai/worldview/BonsaiWorldState.java b/.../java/org/hyperledger/besu/ethereum/trie/diffbased/bonsai/worldview/BonsaiWorldState.java
@@ -76,18 +76,6 @@ public BonsaiWorldState(
         diffBasedWorldStateConfig);
   }
 
-  public BonsaiWorldState(
-      final BonsaiWorldState worldState,
-      final DiffBasedWorldStateConfig diffBasedWorldStateConfig) {
-    this(
-        new BonsaiWorldStateLayerStorage(worldState.getWorldStateStorage()),
-        worldState.bonsaiCachedMerkleTrieLoader,
-        worldState.cachedWorldStorageManager,
-        worldState.trieLogManager,
-        worldState.accumulator.getEvmConfiguration(),
-        diffBasedWorldStateConfig);
-  }
-
   public BonsaiWorldState(
       final BonsaiWorldState worldState,
       final BonsaiCachedMerkleTrieLoader cachedMerkleTrieLoader) {