From 94c644ff3c8c6ad1ac77e41b6790074c8c599009 Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Mon, 4 Mar 2024 11:33:56 -0500 Subject: [PATCH] Revert "Acceptance tests to use bonsai (#6619)" This reverts commit 647750c201dcd06fac51028bfb93e6242c2e222b. --- .../tests/acceptance/dsl/node/ProcessBesuNodeRunner.java | 7 ++++--- .../tests/acceptance/dsl/node/ThreadBesuNodeRunner.java | 8 +------- .../node/configuration/BesuNodeConfigurationBuilder.java | 2 +- .../tests/acceptance/AbstractPreexistingNodeTest.java | 3 --- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java index d85076ee28b..2b80ebea568 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java +++ b/acceptance-tests/dsl/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/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java index 0104e1ded76..c4b36df2a92 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java +++ b/acceptance-tests/dsl/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/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java index d83743ff447..1a9a16f36f5 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java @@ -75,7 +75,7 @@ public class BesuNodeConfigurationBuilder { private Optional 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/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java index c7af349ee4f..a407b389e44 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java +++ b/acceptance-tests/tests/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(); }