Revert "Keep Worldstate Storage open for Bonsai archive latest layer (h…

…yperledger#5039)" (hyperledger#5073) This reverts commit e715010. Signed-off-by: Simon Dudley <[email protected]> Signed-off-by: garyschulte <[email protected]>
garyschulte · Feb 14, 2023 · 5ec2957 · 5ec2957
1 parent cc9cf94
commit 5ec2957
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,7 +28,6 @@ tests are updated to use EC private keys instead of RSA keys.
 
 ### Bug Fixes
 - Mitigation fix for stale bonsai code storage leading to log rolling issues on contract recreates [#4906](https://github.com/hyperledger/besu/pull/4906)
-- Ensure latest cached layered worldstate is subscribed to storage, fix problem with RPC calls using 'latest' [#5039](https://github.com/hyperledger/besu/pull/5039)  
 
 
 ## 23.1.0-RC1

diff --git a/...eum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiInMemoryWorldState.java b/...eum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiInMemoryWorldState.java
@@ -167,12 +167,7 @@ public void persist(final BlockHeader blockHeader) {
     final Hash newWorldStateRootHash = rootHash(localUpdater);
     archive
         .getTrieLogManager()
-        .saveTrieLog(
-            archive,
-            localUpdater,
-            newWorldStateRootHash,
-            blockHeader,
-            (BonsaiPersistedWorldState) this.copy());
+        .saveTrieLog(archive, localUpdater, newWorldStateRootHash, blockHeader, this);
     worldStateRootHash = newWorldStateRootHash;
     worldStateBlockHash = blockHeader.getBlockHash();
     isPersisted = true;

diff --git a/...reum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiLayeredWorldState.java b/...reum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiLayeredWorldState.java
@@ -76,29 +76,9 @@ public Optional<BonsaiWorldView> getNextWorldView() {
   }
 
   public void setNextWorldView(final Optional<BonsaiWorldView> nextWorldView) {
-    maybeUnSubscribe();
     this.nextWorldView = nextWorldView;
   }
 
-  private void maybeUnSubscribe() {
-    nextWorldView
-        .filter(WorldState.class::isInstance)
-        .map(WorldState.class::cast)
-        .ifPresent(
-            ws -> {
-              try {
-                ws.close();
-              } catch (final Exception e) {
-                // no-op
-              }
-            });
-  }
-
-  @Override
-  public void close() throws Exception {
-    maybeUnSubscribe();
-  }
-
   public TrieLogLayer getTrieLog() {
     return trieLog;
   }

diff --git a/.../hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java b/.../hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java
@@ -428,11 +428,7 @@ private TransactionAddedStatus addTransaction(
             LOG,
             "Transaction {} not added because nonce too far in the future for sender {}",
             transaction::toTraceLog,
-            () ->
-                maybeSenderAccount
-                    .map(Account::getAddress)
-                    .map(Address::toString)
-                    .orElse("unknown"));
+            maybeSenderAccount::toString);
         return NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
       }