Reinstate Tessera tests with a fixed version (hyperledger#4303)

* Revert "ignore the tests that use tessera enclave via docker (hyperledger#4297)" This reverts commit 98e214c. Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net> * lock version of tessera and make public Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net> Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
garyschulte · Sep 7, 2022 · ae33c2b · ae33c2b
1 parent f8c12a8
commit ae33c2b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...ner-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java b/...ner-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java
@@ -48,8 +48,8 @@ public class ContainerTestBase {
   //  private final String besuImage = "hyperledger/besu:21.7.0-SNAPSHOT";
   private final String besuImage = System.getProperty("containertest.imagename");
 
-  private final String goQuorumVersion = "22.4.4";
-  private final String tesseraVersion = "22.1.3";
+  public static final String GOQUORUM_VERSION = "22.4.4";
+  public static final String TESSERA_VERSION = "22.1.5";
 
   protected final String goQuorumTesseraPubKey = "3XGBIf+x8IdVQOVfIsbRnHwTYOJP/Fx84G8gMmy8qDM=";
   protected final String besuTesseraPubKey = "8JJLEAbq6o9m4Kqm++v0Y1n9Z2ryAFtZTyhnxSKWgws=";
@@ -127,7 +127,7 @@ public void setUp() throws IOException, InterruptedException {
             goQuorumContainer.getMappedPort(goQuorumRpcPort));
 
     waitFor(10, () -> assertClientVersion(besuWeb3j, "besu"));
-    waitFor(10, () -> assertClientVersion(goQuorumWeb3j, goQuorumVersion));
+    waitFor(10, () -> assertClientVersion(goQuorumWeb3j, GOQUORUM_VERSION));
 
     // Tell GoQuorum to peer to Besu
     goQuorumContainer.execInContainer(
@@ -187,7 +187,7 @@ private GenericContainer buildGoQuorumTesseraContainer(
       final String containerIpcPath,
       final String privKeyPath,
       final String pubKeyPath) {
-    return new GenericContainer("quorumengineering/tessera:" + tesseraVersion)
+    return new GenericContainer("quorumengineering/tessera:" + TESSERA_VERSION)
         .withNetwork(containerNetwork)
         .withNetworkAliases("goQuorumTessera")
         .withClasspathResourceMapping(
@@ -209,7 +209,7 @@ private GenericContainer buildGoQuorumTesseraContainer(
 
   private GenericContainer buildBesuTesseraContainer(
       final String privKeyPath, final String pubKeyPath) {
-    return new GenericContainer("quorumengineering/tessera:" + tesseraVersion)
+    return new GenericContainer("quorumengineering/tessera:" + TESSERA_VERSION)
         .withNetwork(containerNetwork)
         .withNetworkAliases("besuTessera")
         .withClasspathResourceMapping(
@@ -230,7 +230,7 @@ private GenericContainer buildBesuTesseraContainer(
 
   private GenericContainer buildGoQuorumContainer(
       final String ipcPath, final String ipcBindDir, final String containerIpcPath) {
-    return new GenericContainer("quorumengineering/quorum:" + goQuorumVersion)
+    return new GenericContainer("quorumengineering/quorum:" + GOQUORUM_VERSION)
         .withNetwork(containerNetwork)
         .dependsOn(tesseraGoQuorumContainer)
         .withExposedPorts(goQuorumRpcPort, goQuorumP2pPort)

diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarness.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarness.java
@@ -49,7 +49,7 @@ public class TesseraTestHarness implements EnclaveTestHarness {
   private URI q2TUri;
   private URI thirdPartyUri;
 
-  private final String tesseraVersion = "latest";
+  public static final String TESSERA_VERSION = "22.1.5";
 
   private final int thirdPartyPort = 9081;
   private final int q2TPort = 9082;
@@ -264,7 +264,7 @@ private String buildKeyConfig() {
   private GenericContainer buildTesseraContainer(final String configFilePath) {
     final String containerConfigFilePath = "/tmp/config.json";
     final String keyDir = enclaveConfiguration.getTempDir().toString();
-    return new GenericContainer<>("quorumengineering/tessera:" + tesseraVersion)
+    return new GenericContainer<>("quorumengineering/tessera:" + TESSERA_VERSION)
         .withCopyFileToContainer(MountableFile.forHostPath(configFilePath), containerConfigFilePath)
         .withFileSystemBind(keyDir, containerKeyDir)
         .withCommand("--configfile " + containerConfigFilePath)