[PAN-2703] JSON-RPC api net_services should display the actual ports

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java

@@ -44,12 +44,10 @@ public void verify(final Node node) {
 
     assertThat(InetAddresses.isUriInetAddress(result.get("ws").get("host"))).isTrue();
     final int wsPort = Integer.valueOf(result.get("ws").get("port"));
-    // TODO: Port should not be 0-valued. Refer to PAN-2703
-    assertThat(NetworkUtility.isValidPort(p2pPort) || wsPort == 0).isTrue();
+    assertThat(NetworkUtility.isValidPort(wsPort)).isTrue();
 
     assertThat(InetAddresses.isUriInetAddress(result.get("jsonrpc").get("host"))).isTrue();
     final int jsonRpcPort = Integer.valueOf(result.get("jsonrpc").get("port"));
-    // TODO: Port should not be 0-valued. Refer to PAN-2703
-    assertThat(NetworkUtility.isValidPort(p2pPort) || jsonRpcPort == 0).isTrue();
+    assertThat(NetworkUtility.isValidPort(jsonRpcPort)).isTrue();
   }
 }

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java

@@ -40,7 +40,6 @@ public void verify(final Node node) {
 
     assertThat(InetAddresses.isUriInetAddress(result.get("jsonrpc").get("host"))).isTrue();
     final int jsonrpcPort = Integer.valueOf(result.get("jsonrpc").get("port"));
-    // TODO: Port should not be 0-valued. Refer to PAN-2703
-    assertThat(NetworkUtility.isValidPort(jsonrpcPort) || jsonrpcPort == 0).isTrue();
+    assertThat(NetworkUtility.isValidPort(jsonrpcPort)).isTrue();
   }
 }

ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/JsonRpcHttpService.java

@@ -203,10 +203,10 @@ public CompletableFuture<?> start() {
             res -> {
               if (!res.failed()) {
                 resultFuture.complete(null);
+                final int actualPort = httpServer.actualPort();
                 LOG.info(
-                    "JsonRPC service started and listening on {}:{}",
-                    config.getHost(),
-                    httpServer.actualPort());
+                    "JsonRPC service started and listening on {}:{}", config.getHost(), actualPort);
+                config.setPort(actualPort);
                 return;
               }
               httpServer = null;

ethereum/jsonrpc/src/main/java/tech/pegasys/pantheon/ethereum/jsonrpc/websocket/WebSocketService.java

@@ -178,11 +178,12 @@ private Handler<AsyncResult<HttpServer>> startHandler(final CompletableFuture<?>
     return res -> {
       if (res.succeeded()) {
 
+        final int actualPort = res.result().actualPort();
         LOG.info(
             "Websocket service started and listening on {}:{}",
             configuration.getHost(),
-            res.result().actualPort());
-
+            actualPort);
+        configuration.setPort(actualPort);
         resultFuture.complete(null);
       } else {
         resultFuture.completeExceptionally(res.cause());