From aa27a510696628f417f4b0f9ca79ab1db5fc10a7 Mon Sep 17 00:00:00 2001
From: Oliver Knowles <oliver.knowles@r3.com>
Date: Tue, 20 Nov 2018 16:23:28 +0000
Subject: [PATCH] Fix merge

---
 .ci/check-api-changes.sh                                 | 2 +-
 .../kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt  | 9 ++++++++-
 .../kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt    | 9 ++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.ci/check-api-changes.sh b/.ci/check-api-changes.sh
index c896a70aa5..2b01bfb74a 100755
--- a/.ci/check-api-changes.sh
+++ b/.ci/check-api-changes.sh
@@ -12,7 +12,7 @@ if [ ! -f $apiCurrent ]; then
 fi
 
 # Remove the two header lines from the diff output.
-diffContents=`diff -u $apiCurrent $APIHOME/../build/api/api-corda-*.txt | tail -n +3`
+diffContents=`diff --minimal -u $apiCurrent $APIHOME/../build/api/api-corda-*.txt | tail -n +3`
 echo "Diff contents:"
 echo "$diffContents"
 echo
diff --git a/experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt b/experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt
index ddc5af5f79..fec56fe3fd 100644
--- a/experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt
+++ b/experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt
@@ -44,6 +44,7 @@ import net.corda.node.services.api.DummyAuditService
 import net.corda.node.services.api.MonitoringService
 import net.corda.node.services.api.ServiceHubInternal
 import net.corda.node.services.api.WritableTransactionStorage
+import net.corda.node.services.config.NetworkParameterAcceptanceSettings
 import net.corda.node.services.config.NodeConfiguration
 import net.corda.node.services.identity.PersistentIdentityService
 import net.corda.node.services.keys.PersistentKeyManagementService
@@ -417,7 +418,13 @@ class FlowWorkerServiceHub(override val configuration: NodeConfiguration,
         val nodeInfoAndSigned = NodeInfoAndSigned(myInfo) { _, serialised ->
             ourKeyPair.private.sign(serialised.bytes)
         }
-        networkMapUpdater.start(trustRoot, signedNetworkParameters.signed.raw.hash, nodeInfoAndSigned.signed.raw.hash)
+        networkMapUpdater.start(
+                trustRoot,
+                signedNetworkParameters.signed.raw.hash,
+                nodeInfoAndSigned.signed,
+                networkParameters,
+                keyManagementService,
+                NetworkParameterAcceptanceSettings())
 
         database.transaction {
             identityService.loadIdentities(myInfo.legalIdentitiesAndCerts)
diff --git a/experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt b/experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt
index b905a8c3c2..8102b19b1c 100644
--- a/experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt
+++ b/experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt
@@ -31,6 +31,7 @@ import net.corda.node.services.api.AuditService
 import net.corda.node.services.api.MonitoringService
 import net.corda.node.services.api.ServiceHubInternal
 import net.corda.node.services.api.WritableTransactionStorage
+import net.corda.node.services.config.NetworkParameterAcceptanceSettings
 import net.corda.node.services.config.NodeConfiguration
 import net.corda.node.services.identity.PersistentIdentityService
 import net.corda.node.services.keys.PersistentKeyManagementService
@@ -254,7 +255,13 @@ class RpcWorkerServiceHub(override val configuration: NodeConfiguration,
         }
         identityService.ourNames = myInfo.legalIdentities.map { it.name }.toSet()
 
-        networkMapUpdater.start(trustRoot, signedNetworkParameters.signed.raw.hash, nodeInfoAndSigned.signed.raw.hash)
+        networkMapUpdater.start(
+            trustRoot,
+            signedNetworkParameters.signed.raw.hash,
+            nodeInfoAndSigned.signed,
+            networkParameters,
+            keyManagementService,
+            NetworkParameterAcceptanceSettings())
 
         database.transaction {
             identityService.loadIdentities(myInfo.legalIdentitiesAndCerts)