From f44cec5321eeaca289c9e32636decf460cccf271 Mon Sep 17 00:00:00 2001
From: Katelyn Baker <katelyn.baker@r3.com>
Date: Tue, 17 Jul 2018 15:11:31 +0100
Subject: [PATCH] CORDA-1789 - Split Doorman / NM config - fix for CORDA-1510
 (#3605)

---
 .../amqp/JavaCustomSerializerTests.java       | 19 +++++++++----------
 .../net/corda/node/internal/NodeStartup.kt    |  4 +---
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename {serialization/src/test/java/net/corda/serialization/internal => node-api/src/test/java/net/corda/nodeapi/internal/serialization}/amqp/JavaCustomSerializerTests.java (86%)

diff --git a/serialization/src/test/java/net/corda/serialization/internal/amqp/JavaCustomSerializerTests.java b/node-api/src/test/java/net/corda/nodeapi/internal/serialization/amqp/JavaCustomSerializerTests.java
similarity index 86%
rename from serialization/src/test/java/net/corda/serialization/internal/amqp/JavaCustomSerializerTests.java
rename to node-api/src/test/java/net/corda/nodeapi/internal/serialization/amqp/JavaCustomSerializerTests.java
index b6248d9c16..653d838258 100644
--- a/serialization/src/test/java/net/corda/serialization/internal/amqp/JavaCustomSerializerTests.java
+++ b/node-api/src/test/java/net/corda/nodeapi/internal/serialization/amqp/JavaCustomSerializerTests.java
@@ -1,8 +1,7 @@
-package net.corda.serialization.internal.amqp;
+package net.corda.nodeapi.internal.serialization.amqp;
 
 import net.corda.core.serialization.SerializationCustomSerializer;
-import net.corda.serialization.internal.AllWhitelist;
-import net.corda.serialization.internal.amqp.testutils.TestSerializationContext;
+import net.corda.nodeapi.internal.serialization.AllWhitelist;
 import org.junit.Test;
 
 import java.io.NotSerializableException;
@@ -87,10 +86,12 @@ public class JavaCustomSerializerTests {
     }
 
     @Test
-    public void serializeExample() throws NotSerializableException, NoSuchFieldException, IllegalAccessException {
-        SerializerFactory factory = new SerializerFactory(AllWhitelist.INSTANCE, ClassLoader.getSystemClassLoader(),
-                new EvolutionSerializerGetter(),
-                new SerializerFingerPrinter());
+    public void serializeExample() throws NotSerializableException {
+        SerializerFactory factory = new SerializerFactory(
+                AllWhitelist.INSTANCE,
+                ClassLoader.getSystemClassLoader(),
+                new EvolutionSerializerGetter());
+
         SerializationOutput ser = new SerializationOutput(factory);
 
         List<Integer> l = new ArrayList<Integer>(2);
@@ -101,8 +102,6 @@ public class JavaCustomSerializerTests {
         CorDappCustomSerializer ccs = new CorDappCustomSerializer(new ExampleSerializer(), factory);
         factory.registerExternal(ccs);
 
-        ser.serialize(e, TestSerializationContext.testSerializationContext);
-
-
+        ser.serialize(e);
     }
 }
diff --git a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
index 2838fdc884..b64b31cf87 100644
--- a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
+++ b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
@@ -194,9 +194,7 @@ open class NodeStartup(val args: Array<String>) {
     }
 
     open protected fun registerWithNetwork(conf: NodeConfiguration, nodeRegistrationConfig: NodeRegistrationOption) {
-        val compatibilityZoneURL = conf.networkServices?.doormanURL ?: throw RuntimeException(
-                "compatibilityZoneURL or networkServices must be configured!")
-
+        val compatibilityZoneURL = conf.networkServices!!.doormanURL
         println()
         println("******************************************************************")
         println("*                                                                *")