Removing tests

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>

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

@@ -199,36 +199,6 @@ private List<String> commandlineArgs(final BesuNode node, final Path dataDir) {
       params.add("--miner-stratum-enabled");
     }
 
-    if (node.getPrivacyParameters().isEnabled()) {
-      params.add("--privacy-enabled");
-
-      params.add("--privacy-url");
-      params.add(node.getPrivacyParameters().getEnclaveUri().toString());
-
-      if (node.getPrivacyParameters().isMultiTenancyEnabled()) {
-        params.add("--privacy-multi-tenancy-enabled");
-      } else {
-        params.add("--privacy-public-key-file");
-        params.add(node.getPrivacyParameters().getEnclavePublicKeyFile().getAbsolutePath());
-      }
-
-      if (!node.getExtraCLIOptions().contains("--plugin-privacy-service-signing-enabled=true")) {
-        params.add("--privacy-marker-transaction-signing-key-file");
-        params.add(node.homeDirectory().resolve("key").toString());
-      }
-
-      if (node.getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()) {
-        params.add("--privacy-flexible-groups-enabled");
-      }
-
-      if (node.getPrivacyParameters().isPrivacyPluginEnabled()) {
-        params.add("--Xprivacy-plugin-enabled");
-      }
-      if (node.getPrivacyParameters().isPrivateNonceAlwaysIncrementsEnabled()) {
-        params.add("privacy-nonce-always-increments");
-      }
-    }
-
     if (!node.getBootnodes().isEmpty()) {
       params.add("--bootnodes");
       params.add(node.getBootnodes().stream().map(URI::toString).collect(Collectors.joining(",")));

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

@@ -162,7 +162,6 @@ public void startNode(final BesuNode node) {
 
     builder.dataDirectory(dataDir);
     builder.nodeKey(new NodeKey(new KeyPairSecurityModule(KeyPairUtil.loadKeyPair(dataDir))));
-    builder.privacyParameters(node.getPrivacyParameters());
 
     node.getGenesisConfig().map(GenesisConfig::fromConfig).ifPresent(builder::genesisConfig);
 
@@ -553,7 +552,6 @@ public BesuPluginContextImpl providePluginContext(
 
       besuPluginContext.addService(BesuConfiguration.class, commonPluginConfiguration);
       besuPluginContext.addService(PermissioningService.class, permissioningService);
-      besuPluginContext.addService(PrivacyPluginService.class, new PrivacyPluginServiceImpl());
 
       besuPluginContext.initialize(
           new PluginConfiguration.Builder()

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

@@ -66,7 +66,6 @@ public class BesuNodeConfiguration {
   private final List<String> extraCLIOptions;
   private final List<String> staticNodes;
   private final boolean isDnsEnabled;
-  private final Optional<PrivacyParameters> privacyParameters;
   private final List<String> runCommand;
   private final NetworkName network;
   private final Optional<KeyPair> keyPair;
@@ -105,7 +104,6 @@ public class BesuNodeConfiguration {
       final List<String> extraCLIOptions,
       final List<String> staticNodes,
       final boolean isDnsEnabled,
-      final Optional<PrivacyParameters> privacyParameters,
       final List<String> runCommand,
       final Optional<KeyPair> keyPair,
       final boolean strictTxReplayProtectionEnabled,
@@ -141,7 +139,6 @@ public class BesuNodeConfiguration {
     this.extraCLIOptions = extraCLIOptions;
     this.staticNodes = staticNodes;
     this.isDnsEnabled = isDnsEnabled;
-    this.privacyParameters = privacyParameters;
     this.runCommand = runCommand;
     this.keyPair = keyPair;
     this.strictTxReplayProtectionEnabled = strictTxReplayProtectionEnabled;
@@ -265,10 +262,6 @@ public boolean isDnsEnabled() {
     return isDnsEnabled;
   }
 
-  public Optional<PrivacyParameters> getPrivacyParameters() {
-    return privacyParameters;
-  }
-
   public List<String> getRunCommand() {
     return runCommand;
   }

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

@@ -90,7 +90,6 @@ public class BesuNodeConfigurationBuilder {
   private final List<String> extraCLIOptions = new ArrayList<>();
   private List<String> staticNodes = new ArrayList<>();
   private boolean isDnsEnabled = false;
-  private Optional<PrivacyParameters> privacyParameters = Optional.empty();
   private List<String> runCommand = new ArrayList<>();
   private Optional<KeyPair> keyPair = Optional.empty();
   private Boolean strictTxReplayProtectionEnabled = false;
@@ -423,11 +422,6 @@ public BesuNodeConfigurationBuilder dnsEnabled(final boolean isDnsEnabled) {
     return this;
   }
 
-  public BesuNodeConfigurationBuilder privacyParameters(final PrivacyParameters privacyParameters) {
-    this.privacyParameters = Optional.ofNullable(privacyParameters);
-    return this;
-  }
-
   public BesuNodeConfigurationBuilder keyPair(final KeyPair keyPair) {
     this.keyPair = Optional.of(keyPair);
     return this;
@@ -498,7 +492,6 @@ public BesuNodeConfiguration build() {
         extraCLIOptions,
         staticNodes,
         isDnsEnabled,
-        privacyParameters,
         runCommand,
         keyPair,
         strictTxReplayProtectionEnabled,

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

@@ -79,7 +79,6 @@ public BesuNode create(final BesuNodeConfiguration config) throws IOException {
         config.getExtraCLIOptions(),
         config.getStaticNodes(),
         config.isDnsEnabled(),
-        config.getPrivacyParameters(),
         config.getRunCommand(),
         config.getKeyPair(),
         config.isStrictTxReplayProtectionEnabled(),

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java

@@ -82,13 +82,6 @@ public static Optional<String> createIbft2GenesisConfigFilterBootnode(
         filteredList, template, IbftExtraDataCodec::createGenesisExtraDataString);
   }
 
-  public static Optional<String> createPrivacyIbft2GenesisConfig(
-      final Collection<? extends RunnableNode> validators) {
-    final String template = readGenesisFile("/ibft/privacy-ibft.json");
-    return updateGenesisExtraData(
-        validators, template, IbftExtraDataCodec::createGenesisExtraDataString);
-  }
-
   public static Optional<String> createQbftGenesisConfig(
       final Collection<? extends RunnableNode> validators) {
     final String template = readGenesisFile("/qbft/qbft.json");