~

PegaSysEng · May 14, 2019 · d1a760f · d1a760f
1 parent 2370100
commit d1a760f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 53 deletions.
diff --git a/...ce-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java b/...ce-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java
@@ -21,7 +21,6 @@
 import tech.pegasys.pantheon.tests.acceptance.dsl.jsonrpc.Ibft;
 import tech.pegasys.pantheon.tests.acceptance.dsl.jsonrpc.Login;
 import tech.pegasys.pantheon.tests.acceptance.dsl.jsonrpc.Net;
-import tech.pegasys.pantheon.tests.acceptance.dsl.jsonrpc.NetServices;
 import tech.pegasys.pantheon.tests.acceptance.dsl.jsonrpc.Perm;
 import tech.pegasys.pantheon.tests.acceptance.dsl.jsonrpc.Web3;
 import tech.pegasys.pantheon.tests.acceptance.dsl.node.cluster.Cluster;

diff --git a/...theon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java b/...theon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java
@@ -14,16 +14,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.google.common.net.InetAddresses;
 import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition;
 import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node;
 import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetServicesTransaction;
 import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.net.NetTransactions;
 import tech.pegasys.pantheon.util.NetworkUtility;
-import tech.pegasys.pantheon.util.enode.EnodeURL;
 
 import java.util.Map;
-import java.util.regex.Pattern;
+
+import com.google.common.net.InetAddresses;
 
 public class ExpectNetServicesReturnsAllServicesAsActive implements Condition {
 

diff --git a/...e-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/jsonrpc/NetServices.java b/...e-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/jsonrpc/NetServices.java
diff --git a/...est/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonNodeFactory.java b/...est/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonNodeFactory.java
@@ -132,7 +132,11 @@ public PantheonNode createArchiveNodeWithDiscoveryDisabledAndAdmin(final String
 
   public PantheonNode createArchiveNodeNetServicesDisabled(final String name) throws IOException {
     return create(
-        new PantheonFactoryConfigurationBuilder().setName(name).setDiscoveryEnabled(false).build());
+        new PantheonFactoryConfigurationBuilder()
+            .setName(name)
+            .setP2pEnabled(false)
+            .setDiscoveryEnabled(false)
+            .build());
   }
 
   public PantheonNode createArchiveNodeWithAuthentication(final String name)