From 4a05828e20bd930df494051cba2c0eb475ae0b5b Mon Sep 17 00:00:00 2001
From: Katelyn Baker <katelyn.baker@r3.com>
Date: Thu, 17 May 2018 16:50:17 +0100
Subject: [PATCH] OS Merge cleanup

---
 network-management/build.gradle                               | 1 +
 .../kotlin/com/r3/corda/networkmanage/common/utils/Utils.kt   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/network-management/build.gradle b/network-management/build.gradle
index 09ccb8c51e..66bc372cef 100644
--- a/network-management/build.gradle
+++ b/network-management/build.gradle
@@ -61,6 +61,7 @@ task integrationTest(type: Test) {
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
 
+    compile project(':node')
     compile project(':node-api')
 
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
diff --git a/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/Utils.kt b/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/Utils.kt
index c1a6fec4fb..662ccfc52c 100644
--- a/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/Utils.kt
+++ b/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/Utils.kt
@@ -17,13 +17,13 @@ import net.corda.core.CordaOID
 import net.corda.core.internal.CertRole
 import net.corda.core.serialization.internal.SerializationEnvironmentImpl
 import net.corda.core.serialization.internal.nodeSerializationEnv
+import net.corda.node.serialization.amqp.AMQPServerSerializationScheme
 import net.corda.nodeapi.internal.config.UnknownConfigKeysPolicy
 import net.corda.nodeapi.internal.config.parseAs
 import net.corda.nodeapi.internal.crypto.X509CertificateFactory
 import net.corda.nodeapi.internal.crypto.X509KeyStore
 import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
 import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
-import net.corda.nodeapi.internal.serialization.amqp.AMQPClientSerializationScheme
 import org.bouncycastle.asn1.ASN1Encodable
 import org.bouncycastle.asn1.ASN1ObjectIdentifier
 import org.bouncycastle.asn1.x500.style.BCStyle
@@ -60,7 +60,7 @@ fun initialiseSerialization() {
     val context = AMQP_P2P_CONTEXT
     nodeSerializationEnv = SerializationEnvironmentImpl(
             SerializationFactoryImpl().apply {
-                registerScheme(AMQPClientSerializationScheme())
+                registerScheme(AMQPServerSerializationScheme())
             },
             context)
 }