Revert "Acceptance tests to use bonsai (hyperledger#6619)" (hyperledg…

…er#6677) This reverts commit 647750c. Signed-off-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Justin Florentine <justin+github@florentine.us>
jflo · Mar 8, 2024 · 2367538 · 2367538
1 parent 240edd4
commit 2367538
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/...l/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java b/...l/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java
@@ -25,6 +25,7 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.ImmutableDataStorageConfiguration;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
 import org.hyperledger.besu.tests.acceptance.dsl.StaticNodesUtils;
@@ -113,9 +114,9 @@ public void startNode(final BesuNode node) {
 
     params.addAll(
         DataStorageOptions.fromConfig(
-                node.getDataStorageConfiguration() == null
-                    ? DataStorageConfiguration.DEFAULT_BONSAI_CONFIG
-                    : node.getDataStorageConfiguration())
+                ImmutableDataStorageConfiguration.builder()
+                    .from(DataStorageConfiguration.DEFAULT_FOREST_CONFIG)
+                    .build())
             .getCLIOptions());
 
     if (node.getMiningParameters().isMiningEnabled()) {

diff --git a/...sl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java b/...sl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java
@@ -207,12 +207,6 @@ public void startNode(final BesuNode node) {
 
     final PluginTransactionValidatorFactory pluginTransactionValidatorFactory =
         getPluginTransactionValidatorFactory(besuPluginContext);
-
-    final DataStorageConfiguration dataStorageConfiguration =
-        node.getDataStorageConfiguration() == null
-            ? DataStorageConfiguration.DEFAULT_BONSAI_CONFIG
-            : node.getDataStorageConfiguration();
-
     builder
         .synchronizerConfiguration(new SynchronizerConfiguration.Builder().build())
         .dataDirectory(node.homeDirectory())
@@ -221,7 +215,7 @@ public void startNode(final BesuNode node) {
         .nodeKey(new NodeKey(new KeyPairSecurityModule(KeyPairUtil.loadKeyPair(dataDir))))
         .metricsSystem(metricsSystem)
         .transactionPoolConfiguration(txPoolConfig)
-        .dataStorageConfiguration(dataStorageConfiguration)
+        .dataStorageConfiguration(DataStorageConfiguration.DEFAULT_FOREST_CONFIG)
         .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
         .clock(Clock.systemUTC())
         .isRevertReasonEnabled(node.isRevertReasonEnabled())

diff --git a/...yperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java b/...yperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java
@@ -75,7 +75,7 @@ public class BesuNodeConfigurationBuilder {
   private Optional<PermissioningConfiguration> permissioningConfiguration = Optional.empty();
   private ApiConfiguration apiConfiguration = ImmutableApiConfiguration.builder().build();
   private DataStorageConfiguration dataStorageConfiguration =
-      DataStorageConfiguration.DEFAULT_BONSAI_CONFIG;
+      DataStorageConfiguration.DEFAULT_FOREST_CONFIG;
   private String keyFilePath = null;
   private boolean devMode = true;
   private GenesisConfigurationProvider genesisConfigProvider = ignore -> Optional.empty();

diff --git a/...ests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java b/...ests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java
@@ -19,7 +19,6 @@
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder;
 
@@ -71,8 +70,6 @@ protected BesuNodeConfigurationBuilder configureNode(
     return nodeBuilder
         .devMode(false)
         .dataPath(hostDataPath)
-        .dataStorageConfiguration(
-            DataStorageConfiguration.DEFAULT_FOREST_CONFIG) // existing db is forest
         .genesisConfigProvider((nodes) -> Optional.of(genesisData))
         .jsonRpcEnabled();
   }