Revert "Dagger controller tests (#7341)" (#7497)

This reverts commit 38a025b870.

# Conflicts:
#	acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/AllowListContainsKeyAndValue.java

@@ -24,16 +24,11 @@ import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import java.nio.file.Path;
 import java.util.Collection;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class AllowListContainsKeyAndValue implements Condition {
   private final ALLOWLIST_TYPE allowlistType;
   private final Collection<String> allowlistValues;
   private final Path configFilePath;
 
-  private static final Logger LOG = LoggerFactory.getLogger(AllowListContainsKeyAndValue.class);
-
   public AllowListContainsKeyAndValue(
       final ALLOWLIST_TYPE allowlistType,
       final Collection<String> allowlistValues,
@@ -52,7 +47,6 @@ public class AllowListContainsKeyAndValue implements Condition {
               allowlistType, allowlistValues, configFilePath);
     } catch (final Exception e) {
       result = false;
-      LOG.error("Error verifying allowlist contains key and value", e);
     }
     assertThat(result).isTrue();
   }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java

@@ -18,13 +18,8 @@ import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
 
 import org.hyperledger.besu.Runner;
 import org.hyperledger.besu.RunnerBuilder;
-import org.hyperledger.besu.chainexport.RlpBlockExporter;
-import org.hyperledger.besu.chainimport.JsonBlockImporter;
-import org.hyperledger.besu.chainimport.RlpBlockImporter;
-import org.hyperledger.besu.cli.BesuCommand;
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.cli.config.NetworkName;
-import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.controller.BesuControllerBuilder;
@@ -36,28 +31,23 @@ import org.hyperledger.besu.ethereum.api.ApiConfiguration;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.InProcessRpcConfiguration;
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
-import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.plugins.PluginConfiguration;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
-import org.hyperledger.besu.ethereum.eth.transactions.BlobCacheModule;
 import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
-import org.hyperledger.besu.ethereum.trie.diffbased.bonsai.cache.BonsaiCachedMerkleTrieLoaderModule;
 import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
-import org.hyperledger.besu.metrics.MetricsSystemModule;
+import org.hyperledger.besu.metrics.MetricsSystemFactory;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
-import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 import org.hyperledger.besu.plugin.services.BesuEvents;
 import org.hyperledger.besu.plugin.services.BlockchainService;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.PermissioningService;
 import org.hyperledger.besu.plugin.services.PicoCLIOptions;
 import org.hyperledger.besu.plugin.services.PrivacyPluginService;
@@ -81,27 +71,17 @@ import org.hyperledger.besu.services.StorageServiceImpl;
 import org.hyperledger.besu.services.TransactionPoolValidatorServiceImpl;
 import org.hyperledger.besu.services.TransactionSelectionServiceImpl;
 import org.hyperledger.besu.services.TransactionSimulationServiceImpl;
-import org.hyperledger.besu.services.kvstore.InMemoryStoragePlugin;
 
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Clock;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
 
-import dagger.Component;
-import dagger.Module;
-import dagger.Provides;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.vertx.core.Vertx;
 import org.slf4j.Logger;
@@ -117,6 +97,60 @@ public class ThreadBesuNodeRunner implements BesuNodeRunner {
 
   private final Map<Node, BesuPluginContextImpl> besuPluginContextMap = new ConcurrentHashMap<>();
 
+  private BesuPluginContextImpl buildPluginContext(
+      final BesuNode node,
+      final StorageServiceImpl storageService,
+      final SecurityModuleServiceImpl securityModuleService,
+      final TransactionSimulationServiceImpl transactionSimulationServiceImpl,
+      final TransactionSelectionServiceImpl transactionSelectionServiceImpl,
+      final TransactionPoolValidatorServiceImpl transactionPoolValidatorServiceImpl,
+      final BlockchainServiceImpl blockchainServiceImpl,
+      final RpcEndpointServiceImpl rpcEndpointServiceImpl,
+      final BesuConfiguration commonPluginConfiguration,
+      final PermissioningServiceImpl permissioningService) {
+    final CommandLine commandLine = new CommandLine(CommandSpec.create());
+    final BesuPluginContextImpl besuPluginContext = new BesuPluginContextImpl();
+    besuPluginContext.addService(StorageService.class, storageService);
+    besuPluginContext.addService(SecurityModuleService.class, securityModuleService);
+    besuPluginContext.addService(PicoCLIOptions.class, new PicoCLIOptionsImpl(commandLine));
+    besuPluginContext.addService(RpcEndpointService.class, rpcEndpointServiceImpl);
+    besuPluginContext.addService(
+        TransactionSelectionService.class, transactionSelectionServiceImpl);
+    besuPluginContext.addService(
+        TransactionPoolValidatorService.class, transactionPoolValidatorServiceImpl);
+    besuPluginContext.addService(
+        TransactionSimulationService.class, transactionSimulationServiceImpl);
+    besuPluginContext.addService(BlockchainService.class, blockchainServiceImpl);
+    besuPluginContext.addService(BesuConfiguration.class, commonPluginConfiguration);
+
+    final Path pluginsPath;
+    final String pluginDir = System.getProperty("besu.plugins.dir");
+    if (pluginDir == null || pluginDir.isEmpty()) {
+      pluginsPath = node.homeDirectory().resolve("plugins");
+      final File pluginsDirFile = pluginsPath.toFile();
+      if (!pluginsDirFile.isDirectory()) {
+        pluginsDirFile.mkdirs();
+        pluginsDirFile.deleteOnExit();
+      }
+      System.setProperty("besu.plugins.dir", pluginsPath.toString());
+    } else {
+      pluginsPath = Path.of(pluginDir);
+    }
+
+    besuPluginContext.addService(BesuConfiguration.class, commonPluginConfiguration);
+    besuPluginContext.addService(PermissioningService.class, permissioningService);
+    besuPluginContext.addService(PrivacyPluginService.class, new PrivacyPluginServiceImpl());
+
+    besuPluginContext.registerPlugins(
+        new PluginConfiguration.Builder().pluginsDir(pluginsPath).build());
+
+    commandLine.parseArgs(node.getConfiguration().getExtraCLIOptions().toArray(new String[0]));
+
+    // register built-in plugins
+    new RocksDBPlugin().register(besuPluginContext);
+    return besuPluginContext;
+  }
+
   @Override
   public void startNode(final BesuNode node) {
 
@@ -129,9 +163,8 @@ public class ThreadBesuNodeRunner implements BesuNodeRunner {
       throw new UnsupportedOperationException("commands are not supported with thread runner");
     }
 
-    AcceptanceTestBesuComponent component =
+    final StorageServiceImpl storageService = new StorageServiceImpl();
-        DaggerThreadBesuNodeRunner_AcceptanceTestBesuComponent.create();
+    final SecurityModuleServiceImpl securityModuleService = new SecurityModuleServiceImpl();
-
     final TransactionSimulationServiceImpl transactionSimulationServiceImpl =
         new TransactionSimulationServiceImpl();
     final TransactionSelectionServiceImpl transactionSelectionServiceImpl =
@@ -154,22 +187,49 @@ public class ThreadBesuNodeRunner implements BesuNodeRunner {
         .withMiningParameters(miningParameters);
 
     final BesuPluginContextImpl besuPluginContext =
-        besuPluginContextMap.computeIfAbsent(node, n -> component.getBesuPluginContext());
+        besuPluginContextMap.computeIfAbsent(
+            node,
+            n ->
+                buildPluginContext(
+                    node,
+                    storageService,
+                    securityModuleService,
+                    transactionSimulationServiceImpl,
+                    transactionSelectionServiceImpl,
+                    transactionPoolValidatorServiceImpl,
+                    blockchainServiceImpl,
+                    rpcEndpointServiceImpl,
+                    commonPluginConfiguration,
+                    permissioningService));
 
     GlobalOpenTelemetry.resetForTest();
-    final ObservableMetricsSystem metricsSystem = component.getObservableMetricsSystem();
+    final ObservableMetricsSystem metricsSystem =
+        MetricsSystemFactory.create(node.getMetricsConfiguration());
     final List<EnodeURL> bootnodes =
         node.getConfiguration().getBootnodes().stream()
             .map(EnodeURLImpl::fromURI)
             .collect(Collectors.toList());
-
+    final NetworkName network = node.getNetwork() == null ? NetworkName.DEV : node.getNetwork();
-    final EthNetworkConfig.Builder networkConfigBuilder = component.ethNetworkConfigBuilder();
+    final EthNetworkConfig.Builder networkConfigBuilder =
-    networkConfigBuilder.setBootNodes(bootnodes);
+        new EthNetworkConfig.Builder(EthNetworkConfig.getNetworkConfig(network))
+            .setBootNodes(bootnodes);
     node.getConfiguration()
         .getGenesisConfig()
         .map(GenesisConfigFile::fromConfig)
         .ifPresent(networkConfigBuilder::setGenesisConfigFile);
     final EthNetworkConfig ethNetworkConfig = networkConfigBuilder.build();
+    final SynchronizerConfiguration synchronizerConfiguration =
+        new SynchronizerConfiguration.Builder().build();
+    final BesuControllerBuilder builder =
+        new BesuController.Builder()
+            .fromEthNetworkConfig(ethNetworkConfig, synchronizerConfiguration.getSyncMode());
+
+    final KeyValueStorageProvider storageProvider =
+        new KeyValueStorageProviderBuilder()
+            .withStorageFactory(storageService.getByName("rocksdb").get())
+            .withCommonConfiguration(commonPluginConfiguration)
+            .withMetricsSystem(metricsSystem)
+            .build();
 
     final TransactionPoolConfiguration txPoolConfig =
         ImmutableTransactionPoolConfiguration.builder()
@@ -178,20 +238,35 @@ public class ThreadBesuNodeRunner implements BesuNodeRunner {
             .transactionPoolValidatorService(transactionPoolValidatorServiceImpl)
             .build();
 
-    final BesuControllerBuilder builder = component.besuControllerBuilder();
-    builder.isRevertReasonEnabled(node.isRevertReasonEnabled());
-    builder.networkConfiguration(node.getNetworkingConfiguration());
-    builder.transactionPoolConfiguration(txPoolConfig);
-    builder.dataDirectory(dataDir);
-    builder.nodeKey(new NodeKey(new KeyPairSecurityModule(KeyPairUtil.loadKeyPair(dataDir))));
-    builder.privacyParameters(node.getPrivacyParameters());
     final InProcessRpcConfiguration inProcessRpcConfiguration = node.inProcessRpcConfiguration();
 
+    final int maxPeers = 25;
+
+    builder
+        .synchronizerConfiguration(new SynchronizerConfiguration.Builder().build())
+        .dataDirectory(node.homeDirectory())
+        .miningParameters(miningParameters)
+        .privacyParameters(node.getPrivacyParameters())
+        .nodeKey(new NodeKey(new KeyPairSecurityModule(KeyPairUtil.loadKeyPair(dataDir))))
+        .metricsSystem(metricsSystem)
+        .transactionPoolConfiguration(txPoolConfig)
+        .dataStorageConfiguration(DataStorageConfiguration.DEFAULT_FOREST_CONFIG)
+        .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
+        .clock(Clock.systemUTC())
+        .isRevertReasonEnabled(node.isRevertReasonEnabled())
+        .storageProvider(storageProvider)
+        .gasLimitCalculator(GasLimitCalculator.constant())
+        .evmConfiguration(EvmConfiguration.DEFAULT)
+        .maxPeers(maxPeers)
+        .maxRemotelyInitiatedPeers(15)
+        .networkConfiguration(node.getNetworkingConfiguration())
+        .randomPeerPriority(false);
+
     node.getGenesisConfig()
         .map(GenesisConfigFile::fromConfig)
         .ifPresent(builder::genesisConfigFile);
 
-    final BesuController besuController = component.besuController();
+    final BesuController besuController = builder.build();
 
     initTransactionSimulationService(
         transactionSimulationServiceImpl, besuController, node.getApiConfiguration());
@@ -225,10 +300,11 @@ public class ThreadBesuNodeRunner implements BesuNodeRunner {
                 .collect(Collectors.toList()))
         .besuPluginContext(besuPluginContext)
         .autoLogBloomCaching(false)
-        .storageProvider(besuController.getStorageProvider())
+        .storageProvider(storageProvider)
         .rpcEndpointService(rpcEndpointServiceImpl)
         .inProcessRpcConfiguration(inProcessRpcConfiguration);
     node.engineRpcConfiguration().ifPresent(runnerBuilder::engineJsonRpcConfiguration);
+
     besuPluginContext.beforeExternalServices();
     final Runner runner = runnerBuilder.build();
 
@@ -321,230 +397,4 @@ public class ThreadBesuNodeRunner implements BesuNodeRunner {
   public String getConsoleContents() {
     throw new RuntimeException("Console contents can only be captured in process execution");
   }
-
-  @Module
-  @SuppressWarnings("CloseableProvides")
-  static class BesuControllerModule {
-    @Provides
-    @Singleton
-    public SynchronizerConfiguration provideSynchronizationConfiguration() {
-      final SynchronizerConfiguration synchronizerConfiguration =
-          SynchronizerConfiguration.builder().build();
-      return synchronizerConfiguration;
-    }
-
-    @Singleton
-    @Provides
-    public BesuControllerBuilder provideBesuControllerBuilder(
-        final EthNetworkConfig ethNetworkConfig,
-        final SynchronizerConfiguration synchronizerConfiguration) {
-
-      final BesuControllerBuilder builder =
-          new BesuController.Builder()
-              .fromEthNetworkConfig(ethNetworkConfig, synchronizerConfiguration.getSyncMode());
-      return builder;
-    }
-
-    @Provides
-    public BesuController provideBesuController(
-        final SynchronizerConfiguration synchronizerConfiguration,
-        final BesuControllerBuilder builder,
-        final ObservableMetricsSystem metricsSystem,
-        final KeyValueStorageProvider storageProvider,
-        final MiningParameters miningParameters) {
-
-      builder
-          .synchronizerConfiguration(synchronizerConfiguration)
-          .metricsSystem(metricsSystem)
-          .dataStorageConfiguration(DataStorageConfiguration.DEFAULT_FOREST_CONFIG)
-          .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-          .clock(Clock.systemUTC())
-          .storageProvider(storageProvider)
-          .gasLimitCalculator(GasLimitCalculator.constant())
-          .evmConfiguration(EvmConfiguration.DEFAULT)
-          .maxPeers(25)
-          .maxRemotelyInitiatedPeers(15)
-          .miningParameters(miningParameters)
-          .randomPeerPriority(false)
-          .besuComponent(null);
-      return builder.build();
-    }
-
-    @Provides
-    @Singleton
-    public EthNetworkConfig.Builder provideEthNetworkConfigBuilder() {
-      final EthNetworkConfig.Builder networkConfigBuilder =
-          new EthNetworkConfig.Builder(EthNetworkConfig.getNetworkConfig(NetworkName.DEV));
-      return networkConfigBuilder;
-    }
-
-    @Provides
-    public EthNetworkConfig provideEthNetworkConfig(
-        final EthNetworkConfig.Builder networkConfigBuilder) {
-
-      final EthNetworkConfig ethNetworkConfig = networkConfigBuilder.build();
-      return ethNetworkConfig;
-    }
-
-    @Provides
-    @Named("besuPluginContext")
-    public BesuPluginContextImpl providePluginContext(
-        final StorageServiceImpl storageService,
-        final SecurityModuleServiceImpl securityModuleService,
-        final TransactionSimulationServiceImpl transactionSimulationServiceImpl,
-        final TransactionSelectionServiceImpl transactionSelectionServiceImpl,
-        final TransactionPoolValidatorServiceImpl transactionPoolValidatorServiceImpl,
-        final BlockchainServiceImpl blockchainServiceImpl,
-        final RpcEndpointServiceImpl rpcEndpointServiceImpl,
-        final BesuConfiguration commonPluginConfiguration,
-        final PermissioningServiceImpl permissioningService) {
-      final CommandLine commandLine = new CommandLine(CommandSpec.create());
-      final BesuPluginContextImpl besuPluginContext = new BesuPluginContextImpl();
-      besuPluginContext.addService(StorageService.class, storageService);
-      besuPluginContext.addService(SecurityModuleService.class, securityModuleService);
-      besuPluginContext.addService(PicoCLIOptions.class, new PicoCLIOptionsImpl(commandLine));
-      besuPluginContext.addService(RpcEndpointService.class, rpcEndpointServiceImpl);
-      besuPluginContext.addService(
-          TransactionSelectionService.class, transactionSelectionServiceImpl);
-      besuPluginContext.addService(
-          TransactionPoolValidatorService.class, transactionPoolValidatorServiceImpl);
-      besuPluginContext.addService(
-          TransactionSimulationService.class, transactionSimulationServiceImpl);
-      besuPluginContext.addService(BlockchainService.class, blockchainServiceImpl);
-      besuPluginContext.addService(BesuConfiguration.class, commonPluginConfiguration);
-
-      final Path pluginsPath;
-      final String pluginDir = System.getProperty("besu.plugins.dir");
-      if (pluginDir == null || pluginDir.isEmpty()) {
-        // pluginsPath = node.homeDirectory().resolve("plugins");
-        pluginsPath = commonPluginConfiguration.getDataPath().resolve("plugins");
-        final File pluginsDirFile = pluginsPath.toFile();
-        if (!pluginsDirFile.isDirectory()) {
-          pluginsDirFile.mkdirs();
-          pluginsDirFile.deleteOnExit();
-        }
-        System.setProperty("besu.plugins.dir", pluginsPath.toString());
-      } else {
-        pluginsPath = Path.of(pluginDir);
-      }
-
-      besuPluginContext.addService(BesuConfiguration.class, commonPluginConfiguration);
-      besuPluginContext.addService(PermissioningService.class, permissioningService);
-      besuPluginContext.addService(PrivacyPluginService.class, new PrivacyPluginServiceImpl());
-
-      besuPluginContext.registerPlugins(
-          new PluginConfiguration.Builder().pluginsDir(pluginsPath).build());
-
-      // register built-in plugins
-      new RocksDBPlugin().register(besuPluginContext);
-      return besuPluginContext;
-    }
-
-    @Provides
-    public KeyValueStorageProvider provideKeyValueStorageProvider(
-        final BesuConfiguration commonPluginConfiguration, final MetricsSystem metricsSystem) {
-
-      final StorageServiceImpl storageService = new StorageServiceImpl();
-      storageService.registerKeyValueStorage(
-          new InMemoryStoragePlugin.InMemoryKeyValueStorageFactory("memory"));
-      final KeyValueStorageProvider storageProvider =
-          new KeyValueStorageProviderBuilder()
-              .withStorageFactory(storageService.getByName("memory").get())
-              .withCommonConfiguration(commonPluginConfiguration)
-              .withMetricsSystem(metricsSystem)
-              .build();
-
-      return storageProvider;
-    }
-
-    @Provides
-    public MiningParameters provideMiningParameters(
-        final TransactionSelectionServiceImpl transactionSelectionServiceImpl) {
-      final var miningParameters =
-          ImmutableMiningParameters.builder()
-              .transactionSelectionService(transactionSelectionServiceImpl)
-              .build();
-
-      return miningParameters;
-    }
-
-    @Provides
-    Path provideDataDir() {
-      try {
-        return Files.createTempDirectory("acctest");
-      } catch (final IOException e) {
-        throw new RuntimeException("Unable to create temporary data directory", e);
-      }
-    }
-
-    @Provides
-    @Inject
-    BesuConfiguration provideBesuConfiguration(final Path dataDir) {
-      final BesuConfigurationImpl commonPluginConfiguration = new BesuConfigurationImpl();
-      commonPluginConfiguration.init(
-          dataDir, dataDir.resolve(DATABASE_PATH), DataStorageConfiguration.DEFAULT_FOREST_CONFIG);
-      return commonPluginConfiguration;
-    }
-
-    @Provides
-    TransactionPoolConfiguration provideTransactionPoolConfiguration(
-        final BesuNode node,
-        final TransactionPoolValidatorServiceImpl transactionPoolValidatorServiceImpl) {
-      return ImmutableTransactionPoolConfiguration.builder()
-          .from(node.getTransactionPoolConfiguration())
-          .strictTransactionReplayProtectionEnabled(node.isStrictTxReplayProtectionEnabled())
-          .transactionPoolValidatorService(transactionPoolValidatorServiceImpl)
-          .build();
-    }
-  }
-
-  @Module
-  static class MockBesuCommandModule {
-
-    @Provides
-    BesuCommand provideBesuCommand(final AcceptanceTestBesuComponent component) {
-      final BesuCommand besuCommand =
-          new BesuCommand(
-              component,
-              RlpBlockImporter::new,
-              JsonBlockImporter::new,
-              RlpBlockExporter::new,
-              new RunnerBuilder(),
-              new BesuController.Builder(),
-              Optional.ofNullable(component.getBesuPluginContext()).orElse(null),
-              System.getenv());
-      besuCommand.toCommandLine();
-      return besuCommand;
-    }
-
-    @Provides
-    @Singleton
-    MetricsConfiguration provideMetricsConfiguration() {
-      return MetricsConfiguration.builder().build();
-    }
-
-    @Provides
-    @Named("besuCommandLogger")
-    @Singleton
-    Logger provideBesuCommandLogger() {
-      return LoggerFactory.getLogger(MockBesuCommandModule.class);
-    }
-  }
-
-  @Singleton
-  @Component(
-      modules = {
-        ThreadBesuNodeRunner.BesuControllerModule.class,
-        ThreadBesuNodeRunner.MockBesuCommandModule.class,
-        BonsaiCachedMerkleTrieLoaderModule.class,
-        MetricsSystemModule.class,
-        BlobCacheModule.class
-      })
-  public interface AcceptanceTestBesuComponent extends BesuComponent {
-    BesuController besuController();
-
-    BesuControllerBuilder besuControllerBuilder(); // TODO: needing this sucks
-
-    EthNetworkConfig.Builder ethNetworkConfigBuilder();
-  }
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java

@@ -276,7 +276,7 @@ public class PrivacyNode implements AutoCloseable {
       final Path dataLocation, final Path dbLocation) {
     final var besuConfiguration = new BesuConfigurationImpl();
     besuConfiguration
-        .init(dataLocation, dbLocation, besuConfig.getDataStorageConfiguration())
+        .init(dataLocation, dbLocation, null)
         .withMiningParameters(besuConfig.getMiningParameters());
     return new PrivacyKeyValueStorageProviderBuilder()
         .withStorageFactory(

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterThreadNodeRunnerAcceptanceTest.java

@@ -38,7 +38,7 @@ public class ClusterThreadNodeRunnerAcceptanceTest extends AcceptanceTestBase {
     final BesuNodeRunner besuNodeRunner = new ThreadBesuNodeRunner();
     noDiscoveryCluster = new Cluster(clusterConfiguration, net, besuNodeRunner);
     final BesuNode noDiscoveryNode = besu.createNodeWithNoDiscovery("noDiscovery");
-    fullNode = besu.createArchiveNode("archive");
+    fullNode = besu.createArchiveNode("node2");
     noDiscoveryCluster.start(noDiscoveryNode, fullNode);
   }
 

besu/build.gradle

@@ -104,8 +104,6 @@ dependencies {
   testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.testcontainers:testcontainers'
   testImplementation 'tech.pegasys.discovery:discovery'
-  testImplementation 'com.google.dagger:dagger'
 
   annotationProcessor 'com.google.dagger:dagger-compiler'
-  testAnnotationProcessor 'com.google.dagger:dagger-compiler'
 }

besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java

@@ -552,7 +552,6 @@ public abstract class BesuControllerBuilder implements MiningParameterOverrides
     checkNotNull(evmConfiguration, "Missing evm config");
     checkNotNull(networkingConfiguration, "Missing network configuration");
     checkNotNull(dataStorageConfiguration, "Missing data storage configuration");
-
     prepForBuild();
 
     final ProtocolSchedule protocolSchedule = createProtocolSchedule();

besu/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java

@@ -34,7 +34,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
 
 /** The Blockchain service implementation. */
 @Unstable
@@ -45,7 +44,6 @@ public class BlockchainServiceImpl implements BlockchainService {
   private MutableBlockchain blockchain;
 
   /** Instantiates a new Blockchain service implementation. */
-  @Inject
   public BlockchainServiceImpl() {}
 
   /**

besu/src/main/java/org/hyperledger/besu/services/PermissioningServiceImpl.java

@@ -19,7 +19,6 @@ import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissi
 import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
 
 import java.util.List;
-import javax.inject.Inject;
 
 import com.google.common.collect.Lists;
 
@@ -30,7 +29,6 @@ public class PermissioningServiceImpl implements PermissioningService {
       Lists.newArrayList();
 
   /** Default Constructor. */
-  @Inject
   public PermissioningServiceImpl() {}
 
   @Override

besu/src/main/java/org/hyperledger/besu/services/RpcEndpointServiceImpl.java

@@ -36,7 +36,6 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +48,6 @@ public class RpcEndpointServiceImpl implements RpcEndpointService {
   private Map<String, JsonRpcMethod> inProcessRpcMethods;
 
   /** Default Constructor. */
-  @Inject
   public RpcEndpointServiceImpl() {}
 
   /**

besu/src/main/java/org/hyperledger/besu/services/SecurityModuleServiceImpl.java

@@ -21,18 +21,15 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
-import javax.inject.Inject;
 
 /** The Security module service implementation. */
 public class SecurityModuleServiceImpl implements SecurityModuleService {
+  private final Map<String, Supplier<SecurityModule>> securityModuleSuppliers =
+      new ConcurrentHashMap<>();
 
   /** Default Constructor. */
-  @Inject
   public SecurityModuleServiceImpl() {}
 
-  private final Map<String, Supplier<SecurityModule>> securityModuleSuppliers =
-      new ConcurrentHashMap<>();
-
   @Override
   public void register(final String name, final Supplier<SecurityModule> securityModuleSupplier) {
     securityModuleSuppliers.put(name, securityModuleSupplier);

besu/src/main/java/org/hyperledger/besu/services/StorageServiceImpl.java

@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Inject;
 
 /** The Storage service implementation. */
 public class StorageServiceImpl implements StorageService {
@@ -32,7 +31,6 @@ public class StorageServiceImpl implements StorageService {
   private final Map<String, KeyValueStorageFactory> factories;
 
   /** Instantiates a new Storage service. */
-  @Inject
   public StorageServiceImpl() {
     this.segments = List.of(KeyValueSegmentIdentifier.values());
     this.factories = new ConcurrentHashMap<>();

besu/src/main/java/org/hyperledger/besu/services/TransactionPoolValidatorServiceImpl.java

@@ -19,17 +19,15 @@ import org.hyperledger.besu.plugin.services.txvalidator.PluginTransactionPoolVal
 import org.hyperledger.besu.plugin.services.txvalidator.PluginTransactionPoolValidatorFactory;
 
 import java.util.Optional;
-import javax.inject.Inject;
 
 /** The Transaction pool validator service implementation. */
 public class TransactionPoolValidatorServiceImpl implements TransactionPoolValidatorService {
 
+  private Optional<PluginTransactionPoolValidatorFactory> factory = Optional.empty();
+
   /** Default Constructor. */
-  @Inject
   public TransactionPoolValidatorServiceImpl() {}
 
-  private Optional<PluginTransactionPoolValidatorFactory> factory = Optional.empty();
-
   @Override
   public PluginTransactionPoolValidator createTransactionValidator() {
     return factory

besu/src/main/java/org/hyperledger/besu/services/TransactionSelectionServiceImpl.java

@@ -19,17 +19,15 @@ import org.hyperledger.besu.plugin.services.txselection.PluginTransactionSelecto
 import org.hyperledger.besu.plugin.services.txselection.PluginTransactionSelectorFactory;
 
 import java.util.Optional;
-import javax.inject.Inject;
 
 /** The Transaction Selection service implementation. */
 public class TransactionSelectionServiceImpl implements TransactionSelectionService {
 
+  private Optional<PluginTransactionSelectorFactory> factory = Optional.empty();
+
   /** Default Constructor. */
-  @Inject
   public TransactionSelectionServiceImpl() {}
 
-  private Optional<PluginTransactionSelectorFactory> factory = Optional.empty();
-
   @Override
   public PluginTransactionSelector createPluginTransactionSelector() {
     return factory

besu/src/main/java/org/hyperledger/besu/services/TransactionSimulationServiceImpl.java

@@ -30,7 +30,6 @@ import org.hyperledger.besu.plugin.data.TransactionSimulationResult;
 import org.hyperledger.besu.plugin.services.TransactionSimulationService;
 
 import java.util.Optional;
-import javax.inject.Inject;
 
 /** TransactionSimulationServiceImpl */
 @Unstable
@@ -44,7 +43,6 @@ public class TransactionSimulationServiceImpl implements TransactionSimulationSe
   private TransactionSimulator transactionSimulator;
 
   /** Create an instance to be configured */
-  @Inject
   public TransactionSimulationServiceImpl() {}
 
   /**

besu/src/test/java/org/hyperledger/besu/FlexGroupPrivacyTest.java

@@ -1,168 +0,0 @@
-/*
- * Copyright contributors to Hyperledger Besu.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
-
-import org.hyperledger.besu.components.BesuComponent;
-import org.hyperledger.besu.components.BesuPluginContextModule;
-import org.hyperledger.besu.components.MockBesuCommandModule;
-import org.hyperledger.besu.components.NoOpMetricsSystemModule;
-import org.hyperledger.besu.components.PrivacyTestModule;
-import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.controller.BesuController;
-import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
-import org.hyperledger.besu.datatypes.Address;
-import org.hyperledger.besu.enclave.EnclaveFactory;
-import org.hyperledger.besu.ethereum.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
-import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
-import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
-import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
-import org.hyperledger.besu.ethereum.eth.transactions.BlobCacheModule;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivacyStorageProvider;
-import org.hyperledger.besu.ethereum.trie.diffbased.bonsai.cache.BonsaiCachedMerkleTrieLoaderModule;
-import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
-import org.hyperledger.besu.evm.internal.EvmConfiguration;
-import org.hyperledger.besu.evm.precompile.PrecompiledContract;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.math.BigInteger;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import dagger.Component;
-import dagger.Module;
-import dagger.Provides;
-import io.vertx.core.Vertx;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-
-class FlexGroupPrivacyTest {
-
-  private final Vertx vertx = Vertx.vertx();
-
-  @AfterEach
-  public void cleanUp() {
-    vertx.close();
-  }
-
-  @Test
-  void flexibleEnabledPrivacy() {
-    final BesuController besuController =
-        DaggerFlexGroupPrivacyTest_FlexGroupPrivacyTestComponent.builder()
-            .build()
-            .getBesuController();
-
-    final PrecompiledContract flexiblePrecompiledContract =
-        getPrecompile(besuController, FLEXIBLE_PRIVACY);
-
-    assertThat(flexiblePrecompiledContract.getName()).isEqualTo("FlexiblePrivacy");
-  }
-
-  private PrecompiledContract getPrecompile(
-      final BesuController besuController, final Address defaultPrivacy) {
-    return besuController
-        .getProtocolSchedule()
-        .getByBlockHeader(blockHeader(0))
-        .getPrecompileContractRegistry()
-        .get(defaultPrivacy);
-  }
-
-  private BlockHeader blockHeader(final long number) {
-    return new BlockHeaderTestFixture().number(number).buildHeader();
-  }
-
-  @Singleton
-  @Component(
-      modules = {
-        FlexGroupPrivacyParametersModule.class,
-        FlexGroupPrivacyTest.PrivacyTestBesuControllerModule.class,
-        PrivacyTestModule.class,
-        MockBesuCommandModule.class,
-        BonsaiCachedMerkleTrieLoaderModule.class,
-        NoOpMetricsSystemModule.class,
-        BesuPluginContextModule.class,
-        BlobCacheModule.class
-      })
-  interface FlexGroupPrivacyTestComponent extends BesuComponent {
-    BesuController getBesuController();
-  }
-
-  @Module
-  static class FlexGroupPrivacyParametersModule {
-
-    @Provides
-    PrivacyParameters providePrivacyParameters(
-        final PrivacyStorageProvider storageProvider, final Vertx vertx) {
-      try {
-        return new PrivacyParameters.Builder()
-            .setEnabled(true)
-            .setEnclaveUrl(new URI("http://127.0.0.1:8000"))
-            .setStorageProvider(storageProvider)
-            .setEnclaveFactory(new EnclaveFactory(vertx))
-            .setFlexiblePrivacyGroupsEnabled(true)
-            .build();
-      } catch (URISyntaxException e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
-  @Module
-  static class PrivacyTestBesuControllerModule {
-
-    @Provides
-    @Singleton
-    @SuppressWarnings("CloseableProvides")
-    BesuController provideBesuController(
-        final PrivacyParameters privacyParameters,
-        final DataStorageConfiguration dataStorageConfiguration,
-        final FlexGroupPrivacyTestComponent context,
-        @Named("dataDir") final Path dataDir) {
-
-      return new BesuController.Builder()
-          .fromGenesisFile(GenesisConfigFile.mainnet(), SyncMode.FULL)
-          .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
-          .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-          .storageProvider(new InMemoryKeyValueStorageProvider())
-          .networkId(BigInteger.ONE)
-          .miningParameters(MiningParameters.newDefault())
-          .dataStorageConfiguration(dataStorageConfiguration)
-          .nodeKey(NodeKeyUtils.generate())
-          .metricsSystem(new NoOpMetricsSystem())
-          .dataDirectory(dataDir)
-          .clock(TestClock.fixed())
-          .privacyParameters(privacyParameters)
-          .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
-          .gasLimitCalculator(GasLimitCalculator.constant())
-          .evmConfiguration(EvmConfiguration.DEFAULT)
-          .networkConfiguration(NetworkingConfiguration.create())
-          .besuComponent(context)
-          .build();
-    }
-  }
-}

besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java

@@ -21,12 +21,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.components.BesuComponent;
-import org.hyperledger.besu.components.BesuPluginContextModule;
-import org.hyperledger.besu.components.EnclaveModule;
-import org.hyperledger.besu.components.MockBesuCommandModule;
-import org.hyperledger.besu.components.NoOpMetricsSystemModule;
-import org.hyperledger.besu.components.PrivacyTestModule;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.crypto.KeyPair;
@@ -53,9 +47,7 @@ import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
-import org.hyperledger.besu.ethereum.eth.transactions.BlobCacheModule;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
@@ -64,7 +56,6 @@ import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyStorageProvider;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.trie.diffbased.bonsai.cache.BonsaiCachedMerkleTrieLoaderModule;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.evm.log.LogsBloomFilter;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
@@ -79,21 +70,19 @@ import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.function.Supplier;
-import javax.inject.Named;
-import javax.inject.Singleton;
 
 import com.google.common.base.Suppliers;
-import dagger.Component;
-import dagger.Module;
-import dagger.Provides;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 @SuppressWarnings("rawtypes")
 public class PrivacyReorgTest {
 
+  @TempDir private Path folder;
+
   private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
       Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
 
@@ -141,15 +130,11 @@ public class PrivacyReorgTest {
           .signAndBuild(KEY_PAIR);
 
   private final BlockDataGenerator gen = new BlockDataGenerator();
+  private BesuController besuController;
+  private PrivateStateRootResolver privateStateRootResolver;
   private PrivacyParameters privacyParameters;
   private Enclave mockEnclave;
   private Transaction privacyMarkerTransaction;
-  private final PrivacyReorgTestComponent component =
-      DaggerPrivacyReorgTest_PrivacyReorgTestComponent.create();
-
-  private final BesuController besuController = component.getBesuController();
-  private final PrivateStateRootResolver privateStateRootResolver =
-      component.getPrivacyParameters().getPrivateStateRootResolver();
 
   @BeforeEach
   public void setUp() throws IOException {
@@ -189,6 +174,29 @@ public class PrivacyReorgTest {
             .build();
 
     privacyParameters.setPrivacyUserId(ENCLAVE_PUBLIC_KEY.toBase64String());
+
+    privateStateRootResolver =
+        new PrivateStateRootResolver(privacyParameters.getPrivateStateStorage());
+
+    besuController =
+        new BesuController.Builder()
+            .fromGenesisFile(
+                GenesisConfigFile.fromResource("/privacy_reorg_genesis.json"), SyncMode.FULL)
+            .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
+            .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
+            .storageProvider(new InMemoryKeyValueStorageProvider())
+            .networkId(BigInteger.ONE)
+            .miningParameters(MiningParameters.newDefault())
+            .nodeKey(NodeKeyUtils.generate())
+            .metricsSystem(new NoOpMetricsSystem())
+            .dataDirectory(folder)
+            .clock(TestClock.fixed())
+            .privacyParameters(privacyParameters)
+            .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
+            .gasLimitCalculator(GasLimitCalculator.constant())
+            .evmConfiguration(EvmConfiguration.DEFAULT)
+            .networkConfiguration(NetworkingConfiguration.create())
+            .build();
   }
 
   @Test
@@ -196,8 +204,7 @@ public class PrivacyReorgTest {
     // Setup an initial blockchain with one private transaction
     final ProtocolContext protocolContext = besuController.getProtocolContext();
     final DefaultBlockchain blockchain = (DefaultBlockchain) protocolContext.getBlockchain();
-    final PrivateStateStorage privateStateStorage =
+    final PrivateStateStorage privateStateStorage = privacyParameters.getPrivateStateStorage();
-        component.getPrivacyParameters().getPrivateStateStorage();
 
     final Block firstBlock =
         gen.block(
@@ -237,7 +244,7 @@ public class PrivacyReorgTest {
     // Setup an initial blockchain with one private transaction
     final ProtocolContext protocolContext = besuController.getProtocolContext();
     final DefaultBlockchain blockchain = (DefaultBlockchain) protocolContext.getBlockchain();
-    assertThat(blockchain.getChainHeadBlockNumber()).isEqualTo(0);
+
     final Block firstBlock =
         gen.block(
             getBlockOptionsWithTransaction(
@@ -245,9 +252,8 @@ public class PrivacyReorgTest {
                 privacyMarkerTransaction,
                 FIRST_BLOCK_WITH_SINGLE_TRANSACTION_STATE_ROOT));
 
-    var importResult = appendBlock(besuController, blockchain, protocolContext, firstBlock);
+    appendBlock(besuController, blockchain, protocolContext, firstBlock);
-    assertThat(importResult.isImported()).isTrue();
+
-    assertThat(blockchain.getChainHeadBlockNumber()).isEqualTo(1);
     // Check that the private state root is not the empty state
     assertPrivateStateRoot(
         privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE);
@@ -388,12 +394,12 @@ public class PrivacyReorgTest {
   }
 
   @SuppressWarnings("unchecked")
-  private BlockImportResult appendBlock(
+  private void appendBlock(
       final BesuController besuController,
       final DefaultBlockchain blockchain,
       final ProtocolContext protocolContext,
       final Block block) {
-    return besuController
+    besuController
         .getProtocolSchedule()
         .getByBlockHeader(blockchain.getChainHeadHeader())
         .getBlockImporter()
@@ -481,93 +487,4 @@ public class PrivacyReorgTest {
         .hasOmmers(false)
         .setLogsBloom(LogsBloomFilter.empty());
   }
-
-  @Singleton
-  @Component(
-      modules = {
-        PrivacyReorgTest.PrivacyReorgParametersModule.class,
-        PrivacyReorgTest.PrivacyReorgTestBesuControllerModule.class,
-        PrivacyReorgTest.PrivacyReorgTestGenesisConfigModule.class,
-        EnclaveModule.class,
-        PrivacyTestModule.class,
-        MockBesuCommandModule.class,
-        NoOpMetricsSystemModule.class,
-        BonsaiCachedMerkleTrieLoaderModule.class,
-        BlobCacheModule.class,
-        BesuPluginContextModule.class
-      })
-  interface PrivacyReorgTestComponent extends BesuComponent {
-
-    BesuController getBesuController();
-
-    PrivacyParameters getPrivacyParameters();
-  }
-
-  @Module
-  static class PrivacyReorgParametersModule {
-
-    // TODO: copypasta, get this from the enclave factory
-    private static final Bytes ENCLAVE_PUBLIC_KEY =
-        Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=");
-
-    @Provides
-    PrivacyParameters providePrivacyReorgParameters(
-        final PrivacyStorageProvider storageProvider, final EnclaveFactory enclaveFactory) {
-
-      PrivacyParameters retval =
-          new PrivacyParameters.Builder()
-              .setEnabled(true)
-              .setStorageProvider(storageProvider)
-              .setEnclaveUrl(URI.create("http//1.1.1.1:1234"))
-              .setEnclaveFactory(enclaveFactory)
-              .build();
-      retval.setPrivacyUserId(ENCLAVE_PUBLIC_KEY.toBase64String());
-      return retval;
-    }
-  }
-
-  @Module
-  static class PrivacyReorgTestBesuControllerModule {
-
-    @Provides
-    @Singleton
-    @SuppressWarnings("CloseableProvides")
-    BesuController provideBesuController(
-        final PrivacyParameters privacyParameters,
-        final GenesisConfigFile genesisConfigFile,
-        final PrivacyReorgTestComponent context,
-        final @Named("dataDir") Path dataDir) {
-
-      // dataStorageConfiguration default
-      // named privacyReorgParams
-      BesuController retval =
-          new BesuController.Builder()
-              .fromGenesisFile(genesisConfigFile, SyncMode.FULL)
-              .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
-              .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-              .storageProvider(new InMemoryKeyValueStorageProvider())
-              .networkId(BigInteger.ONE)
-              .miningParameters(MiningParameters.newDefault())
-              .nodeKey(NodeKeyUtils.generate())
-              .metricsSystem(new NoOpMetricsSystem())
-              .dataDirectory(dataDir)
-              .clock(TestClock.fixed())
-              .privacyParameters(privacyParameters)
-              .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
-              .gasLimitCalculator(GasLimitCalculator.constant())
-              .evmConfiguration(EvmConfiguration.DEFAULT)
-              .networkConfiguration(NetworkingConfiguration.create())
-              .besuComponent(context)
-              .build();
-      return retval;
-    }
-  }
-
-  @Module
-  static class PrivacyReorgTestGenesisConfigModule {
-    @Provides
-    GenesisConfigFile providePrivacyReorgGenesisConfigFile() {
-      return GenesisConfigFile.fromResource("/privacy_reorg_genesis.json");
-    }
-  }
 }

besu/src/test/java/org/hyperledger/besu/PrivacyTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright contributors to Hyperledger Besu.
+ * Copyright ConsenSys AG.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,17 +16,18 @@ package org.hyperledger.besu;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
-
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
-import org.hyperledger.besu.components.BesuComponent;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT;
-import org.hyperledger.besu.components.BesuPluginContextModule;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY;
-import org.hyperledger.besu.components.MockBesuCommandModule;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_IS_HIGH_SPEC;
-import org.hyperledger.besu.components.NoOpMetricsSystemModule;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES;
-import org.hyperledger.besu.components.PrivacyParametersModule;
+
-import org.hyperledger.besu.components.PrivacyTestModule;
+import org.hyperledger.besu.cli.config.EthNetworkConfig;
-import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.cli.config.NetworkName;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.enclave.EnclaveFactory;
 import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
@@ -36,47 +37,126 @@ import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
-import org.hyperledger.besu.ethereum.eth.transactions.BlobCacheModule;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
-import org.hyperledger.besu.ethereum.trie.diffbased.bonsai.cache.BonsaiCachedMerkleTrieLoaderModule;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivacyStorageProvider;
+import org.hyperledger.besu.ethereum.privacy.storage.keyvalue.PrivacyKeyValueStorageProviderBuilder;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
 import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.evm.precompile.PrecompiledContract;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValuePrivacyStorageFactory;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValueStorageFactory;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration;
+import org.hyperledger.besu.services.BesuConfigurationImpl;
 import org.hyperledger.besu.testutil.TestClock;
 
+import java.io.IOException;
 import java.math.BigInteger;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import javax.inject.Named;
+import java.util.Arrays;
-import javax.inject.Singleton;
 
-import dagger.Component;
-import dagger.Module;
-import dagger.Provides;
 import io.vertx.core.Vertx;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
-class PrivacyTest {
+public class PrivacyTest {
 
   private final Vertx vertx = Vertx.vertx();
 
+  @TempDir private Path dataDir;
+
   @AfterEach
   public void cleanUp() {
     vertx.close();
   }
 
   @Test
-  void defaultPrivacy() {
+  public void defaultPrivacy() throws IOException, URISyntaxException {
-    final BesuController besuController =
+    final BesuController besuController = setUpControllerWithPrivacyEnabled(false);
-        DaggerPrivacyTest_PrivacyTestComponent.builder().build().getBesuController();
 
     final PrecompiledContract precompiledContract = getPrecompile(besuController, DEFAULT_PRIVACY);
 
     assertThat(precompiledContract.getName()).isEqualTo("Privacy");
   }
 
+  @Test
+  public void flexibleEnabledPrivacy() throws IOException, URISyntaxException {
+    final BesuController besuController = setUpControllerWithPrivacyEnabled(true);
+
+    final PrecompiledContract flexiblePrecompiledContract =
+        getPrecompile(besuController, FLEXIBLE_PRIVACY);
+
+    assertThat(flexiblePrecompiledContract.getName()).isEqualTo("FlexiblePrivacy");
+  }
+
+  private BesuController setUpControllerWithPrivacyEnabled(final boolean flexibleEnabled)
+      throws IOException, URISyntaxException {
+    final Path dbDir = Files.createTempDirectory(dataDir, "database");
+    final var miningParameters = MiningParameters.newDefault();
+    final var dataStorageConfiguration = DataStorageConfiguration.DEFAULT_FOREST_CONFIG;
+    final PrivacyParameters privacyParameters =
+        new PrivacyParameters.Builder()
+            .setEnabled(true)
+            .setEnclaveUrl(new URI("http://127.0.0.1:8000"))
+            .setStorageProvider(
+                createKeyValueStorageProvider(
+                    dataDir, dbDir, dataStorageConfiguration, miningParameters))
+            .setEnclaveFactory(new EnclaveFactory(vertx))
+            .setFlexiblePrivacyGroupsEnabled(flexibleEnabled)
+            .build();
+    return new BesuController.Builder()
+        .fromEthNetworkConfig(EthNetworkConfig.getNetworkConfig(NetworkName.MAINNET), SyncMode.FULL)
+        .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
+        .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
+        .storageProvider(new InMemoryKeyValueStorageProvider())
+        .networkId(BigInteger.ONE)
+        .miningParameters(miningParameters)
+        .dataStorageConfiguration(dataStorageConfiguration)
+        .nodeKey(NodeKeyUtils.generate())
+        .metricsSystem(new NoOpMetricsSystem())
+        .dataDirectory(dataDir)
+        .clock(TestClock.fixed())
+        .privacyParameters(privacyParameters)
+        .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
+        .gasLimitCalculator(GasLimitCalculator.constant())
+        .evmConfiguration(EvmConfiguration.DEFAULT)
+        .networkConfiguration(NetworkingConfiguration.create())
+        .build();
+  }
+
+  private PrivacyStorageProvider createKeyValueStorageProvider(
+      final Path dataDir,
+      final Path dbDir,
+      final DataStorageConfiguration dataStorageConfiguration,
+      final MiningParameters miningParameters) {
+    final var besuConfiguration = new BesuConfigurationImpl();
+    besuConfiguration
+        .init(dataDir, dbDir, dataStorageConfiguration)
+        .withMiningParameters(miningParameters);
+    return new PrivacyKeyValueStorageProviderBuilder()
+        .withStorageFactory(
+            new RocksDBKeyValuePrivacyStorageFactory(
+                new RocksDBKeyValueStorageFactory(
+                    () ->
+                        new RocksDBFactoryConfiguration(
+                            DEFAULT_MAX_OPEN_FILES,
+                            DEFAULT_BACKGROUND_THREAD_COUNT,
+                            DEFAULT_CACHE_CAPACITY,
+                            DEFAULT_IS_HIGH_SPEC),
+                    Arrays.asList(KeyValueSegmentIdentifier.values()),
+                    RocksDBMetricsFactory.PRIVATE_ROCKS_DB_METRICS)))
+        .withCommonConfiguration(besuConfiguration)
+        .withMetricsSystem(new NoOpMetricsSystem())
+        .build();
+  }
+
   private PrecompiledContract getPrecompile(
       final BesuController besuController, final Address defaultPrivacy) {
     return besuController
@@ -89,55 +169,4 @@ class PrivacyTest {
   private BlockHeader blockHeader(final long number) {
     return new BlockHeaderTestFixture().number(number).buildHeader();
   }
-
-  @Singleton
-  @Component(
-      modules = {
-        PrivacyParametersModule.class,
-        PrivacyTest.PrivacyTestBesuControllerModule.class,
-        PrivacyTestModule.class,
-        MockBesuCommandModule.class,
-        BonsaiCachedMerkleTrieLoaderModule.class,
-        NoOpMetricsSystemModule.class,
-        BesuPluginContextModule.class,
-        BlobCacheModule.class
-      })
-  interface PrivacyTestComponent extends BesuComponent {
-
-    BesuController getBesuController();
-  }
-
-  @Module
-  static class PrivacyTestBesuControllerModule {
-
-    @Provides
-    @Singleton
-    @SuppressWarnings("CloseableProvides")
-    BesuController provideBesuController(
-        final PrivacyParameters privacyParameters,
-        final DataStorageConfiguration dataStorageConfiguration,
-        final PrivacyTestComponent context,
-        @Named("dataDir") final Path dataDir) {
-
-      return new BesuController.Builder()
-          .fromGenesisFile(GenesisConfigFile.mainnet(), SyncMode.FULL)
-          .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
-          .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-          .storageProvider(new InMemoryKeyValueStorageProvider())
-          .networkId(BigInteger.ONE)
-          .miningParameters(MiningParameters.newDefault())
-          .dataStorageConfiguration(dataStorageConfiguration)
-          .nodeKey(NodeKeyUtils.generate())
-          .metricsSystem(new NoOpMetricsSystem())
-          .dataDirectory(dataDir)
-          .clock(TestClock.fixed())
-          .privacyParameters(privacyParameters)
-          .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
-          .gasLimitCalculator(GasLimitCalculator.constant())
-          .evmConfiguration(EvmConfiguration.DEFAULT)
-          .networkConfiguration(NetworkingConfiguration.create())
-          .besuComponent(context)
-          .build();
-    }
-  }
 }

besu/src/test/java/org/hyperledger/besu/RunnerTest.java

@@ -22,10 +22,8 @@ import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_IS_HIGH_SPEC;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES;
-import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
-import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.JsonUtil;
 import org.hyperledger.besu.config.MergeConfigOptions;
@@ -485,7 +483,6 @@ public final class RunnerTest {
         .evmConfiguration(EvmConfiguration.DEFAULT)
         .networkConfiguration(NetworkingConfiguration.create())
         .randomPeerPriority(Boolean.FALSE)
-        .besuComponent(mock(BesuComponent.class))
         .maxPeers(25)
         .maxRemotelyInitiatedPeers(15)
         .build();

besu/src/test/java/org/hyperledger/besu/chainexport/RlpBlockExporterTest.java

@@ -16,12 +16,10 @@ package org.hyperledger.besu.chainexport;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.chainimport.RlpBlockImporter;
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.cli.config.NetworkName;
-import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.ethereum.GasLimitCalculator;
@@ -104,7 +102,6 @@ public final class RlpBlockExporterTest {
         .gasLimitCalculator(GasLimitCalculator.constant())
         .evmConfiguration(EvmConfiguration.DEFAULT)
         .networkConfiguration(NetworkingConfiguration.create())
-        .besuComponent(mock(BesuComponent.class))
         .build();
   }
 

besu/src/test/java/org/hyperledger/besu/chainimport/JsonBlockImporterTest.java

@@ -17,9 +17,7 @@ package org.hyperledger.besu.chainimport;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
 
-import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.JsonUtil;
 import org.hyperledger.besu.controller.BesuController;
@@ -465,7 +463,6 @@ public abstract class JsonBlockImporterTest {
         .gasLimitCalculator(GasLimitCalculator.constant())
         .evmConfiguration(EvmConfiguration.DEFAULT)
         .networkConfiguration(NetworkingConfiguration.create())
-        .besuComponent(mock(BesuComponent.class))
         .build();
   }
 }

besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java

@@ -16,11 +16,9 @@ package org.hyperledger.besu.chainimport;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.cli.config.NetworkName;
-import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.config.MergeConfigOptions;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
@@ -79,7 +77,6 @@ public final class RlpBlockImporterTest {
             .gasLimitCalculator(GasLimitCalculator.constant())
             .evmConfiguration(EvmConfiguration.DEFAULT)
             .networkConfiguration(NetworkingConfiguration.create())
-            .besuComponent(mock(BesuComponent.class))
             .build();
     final RlpBlockImporter.ImportResult result =
         rlpBlockImporter.importBlockchain(source, targetController, false);
@@ -113,7 +110,6 @@ public final class RlpBlockImporterTest {
             .gasLimitCalculator(GasLimitCalculator.constant())
             .evmConfiguration(EvmConfiguration.DEFAULT)
             .networkConfiguration(NetworkingConfiguration.create())
-            .besuComponent(mock(BesuComponent.class))
             .build();
 
     assertThatThrownBy(
@@ -144,7 +140,6 @@ public final class RlpBlockImporterTest {
             .gasLimitCalculator(GasLimitCalculator.constant())
             .evmConfiguration(EvmConfiguration.DEFAULT)
             .networkConfiguration(NetworkingConfiguration.create())
-            .besuComponent(mock(BesuComponent.class))
             .build();
 
     final RlpBlockImporter.ImportResult result =

besu/src/test/java/org/hyperledger/besu/components/EnclaveModule.java

@@ -1,98 +0,0 @@
-/*
- * Copyright contributors to Hyperledger Besu.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.components;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.crypto.KeyPair;
-import org.hyperledger.besu.crypto.SignatureAlgorithm;
-import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
-import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.enclave.Enclave;
-import org.hyperledger.besu.enclave.EnclaveFactory;
-import org.hyperledger.besu.enclave.types.ReceiveResponse;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.plugin.data.Restriction;
-
-import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.function.Supplier;
-
-import com.google.common.base.Suppliers;
-import dagger.Module;
-import dagger.Provides;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-@Module
-public class EnclaveModule {
-
-  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
-      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
-
-  private static final Bytes ENCLAVE_PUBLIC_KEY =
-      Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=");
-
-  private static final Bytes32 PRIVACY_GROUP_BYTES32 =
-      Bytes32.fromHexString("0xf250d523ae9164722b06ca25cfa2a7f3c45df96b09e215236f886c876f715bfa");
-
-  private static final Bytes MOCK_PAYLOAD =
-      Bytes.fromHexString(
-          "0x608060405234801561001057600080fd5b5060008054600160a060020a03191633179055610199806100326000396000f3fe6080604052600436106100565763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811461005b5780636057361d1461008257806367e404ce146100ae575b600080fd5b34801561006757600080fd5b506100706100ec565b60408051918252519081900360200190f35b34801561008e57600080fd5b506100ac600480360360208110156100a557600080fd5b50356100f2565b005b3480156100ba57600080fd5b506100c3610151565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a16002556001805473ffffffffffffffffffffffffffffffffffffffff191633179055565b60015473ffffffffffffffffffffffffffffffffffffffff169056fea165627a7a72305820c7f729cb24e05c221f5aa913700793994656f233fe2ce3b9fd9a505ea17e8d8a0029");
-
-  private static final KeyPair KEY_PAIR =
-      SIGNATURE_ALGORITHM
-          .get()
-          .createKeyPair(
-              SIGNATURE_ALGORITHM
-                  .get()
-                  .createPrivateKey(
-                      new BigInteger(
-                          "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
-
-  private static final PrivateTransaction PRIVATE_TRANSACTION =
-      PrivateTransaction.builder()
-          .chainId(BigInteger.valueOf(1337))
-          .gasLimit(1000)
-          .gasPrice(Wei.ZERO)
-          .nonce(0)
-          .payload(MOCK_PAYLOAD)
-          .to(null)
-          .privateFrom(ENCLAVE_PUBLIC_KEY)
-          .privateFor(Collections.singletonList(ENCLAVE_PUBLIC_KEY))
-          .restriction(Restriction.RESTRICTED)
-          .value(Wei.ZERO)
-          .signAndBuild(KEY_PAIR);
-
-  @Provides
-  EnclaveFactory provideMockableEnclaveFactory() {
-    Enclave mockEnclave = mock(Enclave.class);
-    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
-    PRIVATE_TRANSACTION.writeTo(rlpOutput);
-    when(mockEnclave.receive(any()))
-        .thenReturn(
-            new ReceiveResponse(
-                rlpOutput.encoded().toBase64String().getBytes(StandardCharsets.UTF_8),
-                PRIVACY_GROUP_BYTES32.toBase64String(),
-                ENCLAVE_PUBLIC_KEY.toBase64String()));
-    EnclaveFactory enclaveFactory = mock(EnclaveFactory.class);
-    when(enclaveFactory.createVertxEnclave(any())).thenReturn(mockEnclave);
-    return enclaveFactory;
-  }
-}

besu/src/test/java/org/hyperledger/besu/components/GenesisConfigModule.java

@@ -1,38 +0,0 @@
-/*
- * Copyright contributors to Hyperledger Besu.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.components;
-
-import org.hyperledger.besu.config.GenesisConfigFile;
-
-import javax.inject.Named;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class GenesisConfigModule {
-
-  @Named("default")
-  @Provides
-  GenesisConfigFile provideDefaultGenesisConfigFile() {
-    return GenesisConfigFile.DEFAULT;
-  }
-
-  @Named("mainnet")
-  @Provides
-  GenesisConfigFile provideMainnetGenesisConfigFile() {
-    return GenesisConfigFile.mainnet();
-  }
-}

besu/src/test/java/org/hyperledger/besu/components/MockBesuCommandModule.java

@@ -1,50 +0,0 @@
-/*
- * Copyright contributors to Hyperledger Besu.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.components;
-
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.cli.BesuCommand;
-import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Module
-public class MockBesuCommandModule {
-
-  @Provides
-  BesuCommand provideBesuCommand() {
-    return mock(BesuCommand.class);
-  }
-
-  @Provides
-  @Singleton
-  MetricsConfiguration provideMetricsConfiguration() {
-    return MetricsConfiguration.builder().build();
-  }
-
-  @Provides
-  @Named("besuCommandLogger")
-  @Singleton
-  Logger provideBesuCommandLogger() {
-    return LoggerFactory.getLogger(MockBesuCommandModule.class);
-  }
-}

besu/src/test/java/org/hyperledger/besu/components/NoOpMetricsSystemModule.java

@@ -1,40 +0,0 @@
-/*
- * Copyright contributors to Hyperledger Besu.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.components;
-
-import org.hyperledger.besu.metrics.ObservableMetricsSystem;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class NoOpMetricsSystemModule {
-
-  @Provides
-  @Singleton
-  MetricsSystem provideMetricsSystem() {
-    return new NoOpMetricsSystem();
-  }
-
-  @Provides
-  @Singleton
-  ObservableMetricsSystem provideObservableMetricsSystem() {
-    return new NoOpMetricsSystem();
-  }
-}

besu/src/test/java/org/hyperledger/besu/components/PrivacyParametersModule.java

@@ -1,47 +0,0 @@
-/*
- * Copyright contributors to Hyperledger Besu.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.components;
-
-import org.hyperledger.besu.enclave.EnclaveFactory;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivacyStorageProvider;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import dagger.Module;
-import dagger.Provides;
-import io.vertx.core.Vertx;
-
-/** Provides a general use PrivacyParameters instance for testing. */
-@Module
-public class PrivacyParametersModule {
-
-  @Provides
-  PrivacyParameters providePrivacyParameters(
-      final PrivacyStorageProvider storageProvider, final Vertx vertx) {
-    try {
-      return new PrivacyParameters.Builder()
-          .setEnabled(true)
-          .setEnclaveUrl(new URI("http://127.0.0.1:8000"))
-          .setStorageProvider(storageProvider)
-          .setEnclaveFactory(new EnclaveFactory(vertx))
-          .setFlexiblePrivacyGroupsEnabled(false)
-          .build();
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}

besu/src/test/java/org/hyperledger/besu/components/PrivacyTestModule.java

@@ -1,111 +0,0 @@
-/*
- * Copyright contributors to Hyperledger Besu.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.components;
-
-import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT;
-import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY;
-import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_IS_HIGH_SPEC;
-import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES;
-
-import org.hyperledger.besu.ethereum.privacy.storage.PrivacyStorageProvider;
-import org.hyperledger.besu.ethereum.privacy.storage.keyvalue.PrivacyKeyValueStorageProviderBuilder;
-import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
-import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValuePrivacyStorageFactory;
-import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValueStorageFactory;
-import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
-import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration;
-import org.hyperledger.besu.services.BesuConfigurationImpl;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-import io.vertx.core.Vertx;
-
-@Module
-public class PrivacyTestModule {
-
-  @Provides
-  @Named("dataDir")
-  Path provideDataDir() {
-    try {
-      return Files.createTempDirectory("PrivacyTestDatadir");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @Provides
-  Vertx provideVertx() {
-    return Vertx.vertx();
-  }
-
-  @Provides
-  DataStorageConfiguration provideDataStorageConfiguration() {
-    return DataStorageConfiguration.DEFAULT_FOREST_CONFIG;
-  }
-
-  @Provides
-  @Singleton
-  @Named("dbDir")
-  Path provideDbDir(@Named("dataDir") final Path dataDir) {
-    try {
-      final Path dbDir = Files.createTempDirectory(dataDir, "database");
-      return dbDir;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @Provides
-  @Singleton
-  @Named("flexibleEnabled")
-  Boolean provideFlexibleEnabled() {
-    return true;
-  }
-
-  @Provides
-  @Singleton
-  @SuppressWarnings("CloseableProvides")
-  PrivacyStorageProvider provideKeyValueStorageProvider(
-      @Named("dbDir") final Path dbDir,
-      final DataStorageConfiguration dataStorageConfiguration,
-      @Named("dataDir") final Path dataDir) {
-    final var besuConfiguration = new BesuConfigurationImpl();
-    besuConfiguration.init(dataDir, dbDir, dataStorageConfiguration);
-    return new PrivacyKeyValueStorageProviderBuilder()
-        .withStorageFactory(
-            new RocksDBKeyValuePrivacyStorageFactory(
-                new RocksDBKeyValueStorageFactory(
-                    () ->
-                        new RocksDBFactoryConfiguration(
-                            DEFAULT_MAX_OPEN_FILES,
-                            DEFAULT_BACKGROUND_THREAD_COUNT,
-                            DEFAULT_CACHE_CAPACITY,
-                            DEFAULT_IS_HIGH_SPEC),
-                    Arrays.asList(KeyValueSegmentIdentifier.values()),
-                    RocksDBMetricsFactory.PRIVATE_ROCKS_DB_METRICS)))
-        .withCommonConfiguration(besuConfiguration)
-        .withMetricsSystem(new NoOpMetricsSystem())
-        .build();
-  }
-}

besu/src/test/java/org/hyperledger/besu/controller/AbstractBftBesuControllerBuilderTest.java

@@ -19,7 +19,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 
-import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.config.CheckpointConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
@@ -158,7 +157,6 @@ public abstract class AbstractBftBesuControllerBuilderTest {
             .storageProvider(storageProvider)
             .gasLimitCalculator(gasLimitCalculator)
             .evmConfiguration(EvmConfiguration.DEFAULT)
-            .besuComponent(mock(BesuComponent.class))
             .networkConfiguration(NetworkingConfiguration.create());
   }
 

besu/src/test/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilderTest.java

@@ -20,7 +20,6 @@ import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.config.CheckpointConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
@@ -191,7 +190,6 @@ public class CliqueBesuControllerBuilderTest {
             .storageProvider(storageProvider)
             .gasLimitCalculator(gasLimitCalculator)
             .evmConfiguration(EvmConfiguration.DEFAULT)
-            .besuComponent(mock(BesuComponent.class))
             .networkConfiguration(NetworkingConfiguration.create());
   }
 

besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java

@@ -23,7 +23,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.components.BesuComponent;
 import org.hyperledger.besu.config.CheckpointConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
@@ -191,7 +190,6 @@ public class MergeBesuControllerBuilderTest {
             .storageProvider(storageProvider)
             .evmConfiguration(EvmConfiguration.DEFAULT)
             .networkConfiguration(NetworkingConfiguration.create())
-            .besuComponent(mock(BesuComponent.class))
             .networkId(networkId);
   }
 

ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImpl.java

@@ -381,11 +381,10 @@ public class EnodeURLImpl implements EnodeURL {
       return ipAddress(ip, EnodeDnsConfiguration.dnsDisabled());
     }
 
-    public Builder ipAddress(
+    public Builder ipAddress(final String ip, final EnodeDnsConfiguration enodeDnsConfiguration) {
-        final String hostField, final EnodeDnsConfiguration enodeDnsConfiguration) {
       if (enodeDnsConfiguration.dnsEnabled()) {
         try {
-          this.ip = InetAddress.getByName(hostField);
+          this.ip = InetAddress.getByName(ip);
           if (enodeDnsConfiguration.updateEnabled()) {
             if (this.ip.isLoopbackAddress()) {
               this.ip = InetAddress.getLocalHost();
@@ -399,10 +398,10 @@ public class EnodeURLImpl implements EnodeURL {
             this.ip = InetAddresses.forString("127.0.0.1");
           }
         }
-      } else if (InetAddresses.isUriInetAddress(hostField)) {
+      } else if (InetAddresses.isUriInetAddress(ip)) {
-        this.ip = InetAddresses.forUriString(hostField);
+        this.ip = InetAddresses.forUriString(ip);
-      } else if (InetAddresses.isInetAddress(hostField)) {
+      } else if (InetAddresses.isInetAddress(ip)) {
-        this.ip = InetAddresses.forString(hostField);
+        this.ip = InetAddresses.forString(ip);
       } else {
         throw new IllegalArgumentException("Invalid ip address.");
       }