From e07d804e0e1f34757a96305b474803c7ddc7e221 Mon Sep 17 00:00:00 2001 From: Jiri Peinlich Date: Mon, 22 Nov 2021 00:09:38 +0000 Subject: [PATCH] Removing the orion acceptance tests (#3086) * Not executing Orion acceptance tests Signed-off-by: Jiri Peinlich * Removing ORION from enclave lists for tests Signed-off-by: Jiri Peinlich --- .../dsl/privacy/ParameterizedEnclaveTestBase.java | 2 -- .../tests/acceptance/dsl/privacy/PrivacyNode.java | 4 +--- .../privacy/BftPrivacyClusterAcceptanceTest.java | 8 +++----- .../privacy/EnclaveErrorAcceptanceTest.java | 6 +----- .../privacy/OnchainPrivacyAcceptanceTest.java | 5 +---- ...DebugGetStateRootOnchainGroupAcceptanceTest.java | 6 +----- .../privacy/PrivacyClusterAcceptanceTest.java | 6 +----- .../privacy/PrivacyGroupAcceptanceTest.java | 6 +----- .../OnchainMultiTenancyAcceptanceTest.java | 5 +---- .../hyperledger/enclave/testutil/EnclaveType.java | 13 ++++++++++++- 10 files changed, 22 insertions(+), 39 deletions(-) diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/ParameterizedEnclaveTestBase.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/ParameterizedEnclaveTestBase.java index d5d2fa0d7..c9ecaa7a1 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/ParameterizedEnclaveTestBase.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/ParameterizedEnclaveTestBase.java @@ -15,7 +15,6 @@ package org.hyperledger.besu.tests.acceptance.dsl.privacy; import static org.hyperledger.enclave.testutil.EnclaveType.NOOP; -import static org.hyperledger.enclave.testutil.EnclaveType.ORION; import static org.hyperledger.enclave.testutil.EnclaveType.TESSERA; import static org.web3j.utils.Restriction.RESTRICTED; import static org.web3j.utils.Restriction.UNRESTRICTED; @@ -49,7 +48,6 @@ public abstract class ParameterizedEnclaveTestBase extends PrivacyAcceptanceTest return Arrays.asList( new Object[][] { {RESTRICTED, TESSERA}, - {RESTRICTED, ORION}, {UNRESTRICTED, NOOP} }); } diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java index 82170c85b..1553c7ce1 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java @@ -44,7 +44,6 @@ import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; import org.hyperledger.enclave.testutil.EnclaveTestHarness; import org.hyperledger.enclave.testutil.EnclaveType; import org.hyperledger.enclave.testutil.NoopEnclaveTestHarness; -import org.hyperledger.enclave.testutil.OrionTestHarnessFactory; import org.hyperledger.enclave.testutil.TesseraTestHarnessFactory; import java.io.IOException; @@ -293,8 +292,7 @@ public class PrivacyNode implements AutoCloseable { switch (enclaveType) { case ORION: - return OrionTestHarnessFactory.create( - config.getName(), tempDir, privacyConfiguration.getKeyConfig()); + throw new UnsupportedOperationException("The Orion tests are getting deprecated"); case TESSERA: return TesseraTestHarnessFactory.create( config.getName(), tempDir, privacyConfiguration.getKeyConfig(), containerNetwork); diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/BftPrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/BftPrivacyClusterAcceptanceTest.java index 382207c16..5f47cc565 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/BftPrivacyClusterAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/BftPrivacyClusterAcceptanceTest.java @@ -67,11 +67,9 @@ public class BftPrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase { @Parameterized.Parameters(name = "{0}") public static Collection bftPrivacyTypes() { final List bftPrivacyTypes = new ArrayList<>(); - for (EnclaveType x : EnclaveType.values()) { - if (!x.equals(EnclaveType.NOOP)) { - for (ConsensusType consensusType : ConsensusType.values()) { - bftPrivacyTypes.add(new BftPrivacyType(x, consensusType, Restriction.RESTRICTED)); - } + for (EnclaveType x : EnclaveType.valuesForTests()) { + for (ConsensusType consensusType : ConsensusType.values()) { + bftPrivacyTypes.add(new BftPrivacyType(x, consensusType, Restriction.RESTRICTED)); } } diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/EnclaveErrorAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/EnclaveErrorAcceptanceTest.java index 5b60511af..4a85e8f95 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/EnclaveErrorAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/EnclaveErrorAcceptanceTest.java @@ -25,11 +25,9 @@ import org.hyperledger.enclave.testutil.EnclaveType; import java.io.IOException; import java.math.BigInteger; -import java.util.Arrays; import java.util.Base64; import java.util.Collection; import java.util.Optional; -import java.util.stream.Collectors; import org.apache.tuweni.crypto.sodium.Box; import org.assertj.core.api.Condition; @@ -51,9 +49,7 @@ public class EnclaveErrorAcceptanceTest extends PrivacyAcceptanceTestBase { @Parameters(name = "{0}") public static Collection enclaveTypes() { - return Arrays.stream(EnclaveType.values()) - .filter(enclaveType -> enclaveType != EnclaveType.NOOP) - .collect(Collectors.toList()); + return EnclaveType.valuesForTests(); } public EnclaveErrorAcceptanceTest(final EnclaveType enclaveType) throws IOException { diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/OnchainPrivacyAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/OnchainPrivacyAcceptanceTest.java index d3443719a..48b707c65 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/OnchainPrivacyAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/OnchainPrivacyAcceptanceTest.java @@ -33,7 +33,6 @@ import java.util.List; import java.util.Optional; import java.util.function.BiConsumer; import java.util.function.Supplier; -import java.util.stream.Collectors; import com.google.common.collect.Lists; import org.junit.Before; @@ -59,9 +58,7 @@ public class OnchainPrivacyAcceptanceTest extends OnchainPrivacyAcceptanceTestBa @Parameters(name = "{0}") public static Collection enclaveTypes() { - return Arrays.stream(EnclaveType.values()) - .filter(enclaveType -> enclaveType != EnclaveType.NOOP) - .collect(Collectors.toList()); + return EnclaveType.valuesForTests(); } private PrivacyNode alice; diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOnchainGroupAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOnchainGroupAcceptanceTest.java index 6a32d68ff..5f8b6c13f 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOnchainGroupAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOnchainGroupAcceptanceTest.java @@ -26,10 +26,8 @@ import org.hyperledger.enclave.testutil.EnclaveType; import java.io.IOException; import java.math.BigInteger; import java.net.URISyntaxException; -import java.util.Arrays; import java.util.Collection; import java.util.Optional; -import java.util.stream.Collectors; import org.apache.tuweni.bytes.Bytes32; import org.junit.Before; @@ -51,9 +49,7 @@ public class PrivDebugGetStateRootOnchainGroupAcceptanceTest @Parameters(name = "{0}") public static Collection enclaveTypes() { - return Arrays.stream(EnclaveType.values()) - .filter(enclaveType -> enclaveType != EnclaveType.NOOP) - .collect(Collectors.toList()); + return EnclaveType.valuesForTests(); } private PrivacyNode aliceNode; diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java index b588fd1d0..4b6023ac1 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java @@ -29,11 +29,9 @@ import org.hyperledger.enclave.testutil.EnclaveType; import java.io.IOException; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Optional; -import java.util.stream.Collectors; import io.vertx.core.Vertx; import org.apache.tuweni.bytes.Bytes; @@ -63,9 +61,7 @@ public class PrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase { @Parameters(name = "{0}") public static Collection enclaveTypes() { - return Arrays.stream(EnclaveType.values()) - .filter(enclaveType -> enclaveType != EnclaveType.NOOP) - .collect(Collectors.toList()); + return EnclaveType.valuesForTests(); } public PrivacyClusterAcceptanceTest(final EnclaveType enclaveType) throws IOException { diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyGroupAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyGroupAcceptanceTest.java index e33ab53df..055092c3b 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyGroupAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyGroupAcceptanceTest.java @@ -24,10 +24,8 @@ import org.hyperledger.enclave.testutil.EnclaveType; import java.io.IOException; import java.math.BigInteger; -import java.util.Arrays; import java.util.Collection; import java.util.Optional; -import java.util.stream.Collectors; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -52,9 +50,7 @@ public class PrivacyGroupAcceptanceTest extends PrivacyAcceptanceTestBase { @Parameters(name = "{0}") public static Collection enclaveTypes() { - return Arrays.stream(EnclaveType.values()) - .filter(enclaveType -> enclaveType != EnclaveType.NOOP) - .collect(Collectors.toList()); + return EnclaveType.valuesForTests(); } public PrivacyGroupAcceptanceTest(final EnclaveType enclaveType) throws IOException { diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/OnchainMultiTenancyAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/OnchainMultiTenancyAcceptanceTest.java index ee2c478fd..56d9c1076 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/OnchainMultiTenancyAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/OnchainMultiTenancyAcceptanceTest.java @@ -31,7 +31,6 @@ import org.hyperledger.besu.tests.web3j.generated.EventEmitter; import org.hyperledger.enclave.testutil.EnclaveType; import java.math.BigInteger; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -60,9 +59,7 @@ public class OnchainMultiTenancyAcceptanceTest extends OnchainPrivacyAcceptanceT @Parameterized.Parameters(name = "{0}") public static Collection enclaveTypes() { - return Arrays.stream(EnclaveType.values()) - .filter(enclaveType -> enclaveType != EnclaveType.NOOP) - .collect(Collectors.toList()); + return EnclaveType.valuesForTests(); } private static final PermissioningTransactions permissioningTransactions = diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveType.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveType.java index 0dd5731a9..67679ab2e 100644 --- a/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveType.java +++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveType.java @@ -14,8 +14,19 @@ */ package org.hyperledger.enclave.testutil; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + public enum EnclaveType { ORION, TESSERA, - NOOP + NOOP; + + public static List valuesForTests() { + return Arrays.stream(values()) + .filter(enclaveType -> enclaveType != NOOP) + .filter(enclaveType -> enclaveType != ORION) + .collect(Collectors.toList()); + } }