Make TrieLogManager the default implementation and remove the interface

Signed-off-by: Simon Dudley <[email protected]>
siladu · Oct 23, 2023 · 0bb66f1 · 0bb66f1
1 parent 7a6552c
commit 0bb66f1
Show file tree

Hide file tree

Showing 5 changed files with 177 additions and 228 deletions.
diff --git a/...eum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateProvider.java b/...eum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateProvider.java
@@ -23,7 +23,6 @@
 import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
 import org.hyperledger.besu.ethereum.bonsai.cache.CachedWorldStorageManager;
 import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
-import org.hyperledger.besu.ethereum.bonsai.trielog.DefaultTrieLogManager;
 import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogManager;
 import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
 import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
@@ -97,7 +96,7 @@ public BonsaiWorldStateProvider(
         new CachedWorldStorageManager(this, worldStateStorage, metricsSystem);
     // TODO: de-dup constructors
     this.trieLogManager =
-        new DefaultTrieLogManager(
+        new TrieLogManager(
             blockchain, worldStateStorage, maxLayersToLoad.orElse(RETAINED_LAYERS), pluginContext);
     this.blockchain = blockchain;
     this.worldStateStorage = worldStateStorage;

diff --git a/...ore/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/DefaultTrieLogManager.java b/...ore/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/DefaultTrieLogManager.java