Issue 5544 - Tessera as internal process

.circleci/config.yml

@@ -254,7 +254,7 @@ jobs:
       - attach_workspace:
           at: ~/project
       - run:
-          name: AcceptanceTests (Non-Mainnet)
+          name: AcceptanceTests (Privacy)
           no_output_timeout: 20m
           command: |
             CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
@@ -407,7 +407,7 @@ workflows:
     jobs:
       - assemble
       - unitTests:
-           requires:
+          requires:
             - assemble
       - testWindows:
           requires:
@@ -428,6 +428,10 @@ workflows:
       - acceptanceTestsPermissioning:
           requires:
             - assemble
+            - acceptanceTestsCliqueBft
+      - acceptanceTestsPrivacy:
+          requires:
+            - assemble
       - buildDocker:
           requires:
             - assemble
@@ -500,3 +504,6 @@ workflows:
     jobs:
       - assemble
       - dockerScan
+      - acceptanceTestsPrivacy:
+          requires:
+            - assemble

.github/workflows/acceptance-tests.yml

@@ -43,6 +43,8 @@ jobs:
           cache-disabled: true
       - name: List unit tests
         run: ./gradlew acceptanceTestNotPrivacy --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
+      - name: List privacy tests
+        run: ./gradlew acceptanceTestPrivacy --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
       - name: Extract current test list
         run: mkdir tmp; find . -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v '/testsuite/@name' '{}'; echo ' acceptanceTestNotPrivacy'" | tee tmp/currentTests.list
       - name: Get acceptance test reports
@@ -78,6 +80,8 @@ jobs:
           path: '*.txt'
       - name: run acceptance tests
         run: ./gradlew acceptanceTestNotPrivacy `cat gradleArgs.txt` -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
+      - name: run acceptancePrivacy tests
+        run: ./gradlew acceptanceTestPrivacy `cat gradleArgs.txt` -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
       - name: Remove downloaded test results
         run: rm -rf tmp/junit-xml-reports-downloaded
       - name: Upload Acceptance Test Results

CHANGELOG.md

@@ -23,6 +23,7 @@
 - Default bonsai to use full-flat db and code-storage-by-code-hash [#6984](https://github.com/hyperledger/besu/pull/6894)
 - New RPC methods miner_setExtraData and miner_getExtraData [#7078](https://github.com/hyperledger/besu/pull/7078)
 - Disconnect peers that have multiple discovery ports since they give us bad neighbours [#7089](https://github.com/hyperledger/besu/pull/7089)
+- Optimize privacy acceptance tests by eliminating docker and executing them as a processes (thanks @gtebrean) [#5968](https://github.com/hyperledger/besu/pull/5968)
 - Port Tuweni dns-discovery into Besu. [#7129](https://github.com/hyperledger/besu/pull/7129)
 
 ### Known Issues

acceptance-tests/build.gradle

@@ -13,4 +13,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+dependencies {
+  tessera 'net.consensys.quorum.tessera:tessera-dist:24.4.1@tar'
+}
+
 jar { enabled = false }

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

@@ -27,10 +27,8 @@
 import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 import io.vertx.core.Vertx;
-import org.testcontainers.containers.Network;
 
 public class PrivacyNodeFactory {
 
@@ -42,18 +40,15 @@ public PrivacyNodeFactory(final Vertx vertx) {
   }
 
   public PrivacyNode create(
-      final PrivacyNodeConfiguration privacyNodeConfig,
-      final EnclaveType enclaveType,
-      final Optional<Network> containerNetwork)
+      final PrivacyNodeConfiguration privacyNodeConfig, final EnclaveType enclaveType)
       throws IOException {
-    return new PrivacyNode(privacyNodeConfig, vertx, enclaveType, containerNetwork);
+    return new PrivacyNode(privacyNodeConfig, vertx, enclaveType);
   }
 
   public PrivacyNode createPrivateTransactionEnabledMinerNode(
       final String name,
       final PrivacyAccount privacyAccount,
       final EnclaveType enclaveType,
-      final Optional<Network> containerNetwork,
       final boolean isFlexiblePrivacyGroupEnabled,
       final boolean isMultitenancyEnabled,
       final boolean isPrivacyPluginEnabled)
@@ -77,15 +72,13 @@ public PrivacyNode createPrivateTransactionEnabledMinerNode(
                 privacyAccount.getEnclaveKeyPaths(),
                 privacyAccount.getEnclavePrivateKeyPaths(),
                 privacyAccount.getEnclaveEncryptorType())),
-        enclaveType,
-        containerNetwork);
+        enclaveType);
   }
 
   public PrivacyNode createPrivateTransactionEnabledNode(
       final String name,
       final PrivacyAccount privacyAccount,
       final EnclaveType enclaveType,
-      final Optional<Network> containerNetwork,
       final boolean isFlexiblePrivacyGroupEnabled,
       final boolean isMultitenancyEnabled,
       final boolean isPrivacyPluginEnabled)
@@ -108,16 +101,14 @@ public PrivacyNode createPrivateTransactionEnabledNode(
                 privacyAccount.getEnclaveKeyPaths(),
                 privacyAccount.getEnclavePrivateKeyPaths(),
                 privacyAccount.getEnclaveEncryptorType())),
-        enclaveType,
-        containerNetwork);
+        enclaveType);
   }
 
   public PrivacyNode createIbft2NodePrivacyEnabled(
       final String name,
       final PrivacyAccount privacyAccount,
       final boolean minerEnabled,
       final EnclaveType enclaveType,
-      final Optional<Network> containerNetwork,
       final boolean isFlexiblePrivacyGroupEnabled,
       final boolean isMultitenancyEnabled,
       final boolean isPrivacyPluginEnabled,
@@ -145,16 +136,14 @@ public PrivacyNode createIbft2NodePrivacyEnabled(
                 privacyAccount.getEnclaveKeyPaths(),
                 privacyAccount.getEnclavePrivateKeyPaths(),
                 privacyAccount.getEnclaveEncryptorType())),
-        enclaveType,
-        containerNetwork);
+        enclaveType);
   }
 
   public PrivacyNode createIbft2NodePrivacyEnabledWithGenesis(
       final String name,
       final PrivacyAccount privacyAccount,
       final boolean minerEnabled,
       final EnclaveType enclaveType,
-      final Optional<Network> containerNetwork,
       final boolean isFlexiblePrivacyGroupEnabled,
       final boolean isMultitenancyEnabled,
       final boolean isPrivacyPluginEnabled,
@@ -184,15 +173,13 @@ public PrivacyNode createIbft2NodePrivacyEnabledWithGenesis(
                 privacyAccount.getEnclaveKeyPaths(),
                 privacyAccount.getEnclavePrivateKeyPaths(),
                 privacyAccount.getEnclaveEncryptorType())),
-        enclaveType,
-        containerNetwork);
+        enclaveType);
   }
 
   public PrivacyNode createQbftNodePrivacyEnabled(
       final String name,
       final PrivacyAccount privacyAccount,
       final EnclaveType enclaveType,
-      final Optional<Network> containerNetwork,
       final boolean isFlexiblePrivacyGroupEnabled,
       final boolean isMultitenancyEnabled,
       final boolean isPrivacyPluginEnabled,
@@ -220,16 +207,14 @@ public PrivacyNode createQbftNodePrivacyEnabled(
                 privacyAccount.getEnclaveKeyPaths(),
                 privacyAccount.getEnclavePrivateKeyPaths(),
                 privacyAccount.getEnclaveEncryptorType())),
-        enclaveType,
-        containerNetwork);
+        enclaveType);
   }
 
   public PrivacyNode createFlexiblePrivacyGroupEnabledMinerNode(
       final String name,
       final PrivacyAccount privacyAccount,
       final boolean multiTenancyEnabled,
-      final EnclaveType enclaveType,
-      final Optional<Network> containerNetwork)
+      final EnclaveType enclaveType)
       throws IOException, URISyntaxException {
     final BesuNodeConfigurationBuilder besuNodeConfigurationBuilder =
         new BesuNodeConfigurationBuilder();
@@ -259,16 +244,14 @@ public PrivacyNode createFlexiblePrivacyGroupEnabledMinerNode(
                 privacyAccount.getEnclaveKeyPaths(),
                 privacyAccount.getEnclavePrivateKeyPaths(),
                 privacyAccount.getEnclaveEncryptorType())),
-        enclaveType,
-        containerNetwork);
+        enclaveType);
   }
 
   public PrivacyNode createFlexiblePrivacyGroupEnabledNode(
       final String name,
       final PrivacyAccount privacyAccount,
       final boolean multiTenancyEnabled,
-      final EnclaveType enclaveType,
-      final Optional<Network> containerNetwork)
+      final EnclaveType enclaveType)
       throws IOException {
     return create(
         new PrivacyNodeConfiguration(
@@ -288,7 +271,6 @@ public PrivacyNode createFlexiblePrivacyGroupEnabledNode(
                 privacyAccount.getEnclaveKeyPaths(),
                 privacyAccount.getEnclavePrivateKeyPaths(),
                 privacyAccount.getEnclaveEncryptorType())),
-        enclaveType,
-        containerNetwork);
+        enclaveType);
   }
 }

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

@@ -20,10 +20,7 @@
 import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNodeRunner;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
-import org.hyperledger.enclave.testutil.EnclaveType;
-import org.hyperledger.enclave.testutil.TesseraTestHarness;
 
-import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -154,24 +151,7 @@ private void startNode(final PrivacyNode node, final boolean isBootNode) {
         .ifPresent(node.getConfiguration()::setGenesisConfig);
 
     if (!isBootNode) {
-      if (bootNode.getEnclave().getEnclaveType() == EnclaveType.TESSERA) {
-        final URI otherNode = bootNode.getEnclave().nodeUrl();
-        try {
-          // Substitute IP with hostname for test container network
-          final URI otherNodeHostname =
-              new URI(
-                  otherNode.getScheme()
-                      + "://"
-                      + bootNode.getName()
-                      + ":"
-                      + TesseraTestHarness.p2pPort);
-          node.addOtherEnclaveNode(otherNodeHostname);
-        } catch (Exception ex) {
-          throw new RuntimeException("Invalid node URI");
-        }
-      } else {
-        node.addOtherEnclaveNode(bootNode.getEnclave().nodeUrl());
-      }
+      node.addOtherEnclaveNode(bootNode.getEnclave().nodeUrl());
     }
 
     LOG.info(

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

@@ -31,6 +31,7 @@
 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;
@@ -64,7 +65,6 @@
 import org.awaitility.Awaitility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.Network;
 
 public class PrivacyNode implements AutoCloseable {
 
@@ -81,13 +81,11 @@ public class PrivacyNode implements AutoCloseable {
   public PrivacyNode(
       final PrivacyNodeConfiguration privacyConfiguration,
       final Vertx vertx,
-      final EnclaveType enclaveType,
-      final Optional<Network> containerNetwork)
+      final EnclaveType enclaveType)
       throws IOException {
     final Path enclaveDir = Files.createTempDirectory("acctest-orion");
     final BesuNodeConfiguration config = privacyConfiguration.getBesuConfig();
-    this.enclave =
-        selectEnclave(enclaveType, enclaveDir, config, privacyConfiguration, containerNetwork);
+    this.enclave = selectEnclave(enclaveType, enclaveDir, config, privacyConfiguration);
     this.vertx = vertx;
 
     this.besuConfig = config;
@@ -275,7 +273,7 @@ private PrivacyStorageProvider createKeyValueStorageProvider(
       final Path dataLocation, final Path dbLocation) {
     final var besuConfiguration = new BesuConfigurationImpl();
     besuConfiguration
-        .init(dataLocation, dbLocation, null)
+        .init(dataLocation, dbLocation, DataStorageConfiguration.DEFAULT_FOREST_CONFIG)
         .withMiningParameters(besuConfig.getMiningParameters());
     return new PrivacyKeyValueStorageProviderBuilder()
         .withStorageFactory(
@@ -298,15 +296,14 @@ private EnclaveTestHarness selectEnclave(
       final EnclaveType enclaveType,
       final Path tempDir,
       final BesuNodeConfiguration config,
-      final PrivacyNodeConfiguration privacyConfiguration,
-      final Optional<Network> containerNetwork) {
+      final PrivacyNodeConfiguration privacyConfiguration) {
 
     switch (enclaveType) {
       case ORION:
         throw new UnsupportedOperationException("The Orion tests are getting deprecated");
       case TESSERA:
         return TesseraTestHarnessFactory.create(
-            config.getName(), tempDir, privacyConfiguration.getKeyConfig(), containerNetwork);
+            config.getName(), tempDir, privacyConfiguration.getKeyConfig());
       default:
         return new NoopEnclaveTestHarness(tempDir, privacyConfiguration.getKeyConfig());
     }

acceptance-tests/tests/build.gradle

@@ -16,6 +16,10 @@ plugins {
   id 'org.web3j.solidity' version '0.4.1'
 }
 
+configurations {
+  tessera.extendsFrom integrationTestRuntimeOnly
+}
+
 web3j { generatedPackageName = 'org.hyperledger.besu.tests.web3j.generated' }
 
 sourceSets.main.solidity.srcDirs = ["$projectDir/contracts"]
@@ -81,6 +85,7 @@ dependencies {
   testImplementation 'org.wiremock:wiremock'
 
   testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+  tessera 'net.consensys.quorum.tessera:tessera-dist:24.4.1@tar'
 }
 
 test.enabled = false
@@ -205,16 +210,21 @@ task acceptanceTestCliqueBft(type: Test) {
   doFirst { mkdir "${buildDir}/jvmErrorLogs" }
 }
 
+
+def tesseraDist = '24.4.1'
+
 task acceptanceTestPrivacy(type: Test) {
   inputs.property "integration.date", LocalTime.now() // so it runs at every invocation
   include '**/privacy/**'
 
   useJUnitPlatform {}
 
   dependsOn(rootProject.installDist)
+  dependsOn(unzipTessera)
   setSystemProperties(test.getSystemProperties())
   systemProperty 'acctests.runBesuAsProcess', 'true'
   systemProperty 'java.security.properties', "${buildDir}/resources/test/acceptanceTesting.security"
+  systemProperty 'tessera-dist', "${buildDir}/tessera/dist/tessera-${tesseraDist}/bin/tessera"
   mustRunAfter rootProject.subprojects*.test
   description = 'Runs Privacy Besu acceptance tests.'
   group = 'verification'
@@ -239,6 +249,7 @@ task acceptanceTestPermissioning(type: Test) {
   useJUnitPlatform {}
 
   dependsOn(rootProject.installDist)
+  dependsOn(unzipTessera)
   setSystemProperties(test.getSystemProperties())
   systemProperty 'acctests.runBesuAsProcess', 'true'
   systemProperty 'java.security.properties', "${buildDir}/resources/test/acceptanceTesting.security"