ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-08 20:04:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-1789 - Split Doorman / NM config - fix for CORDA-1510 (#3605)

Browse Source
This commit is contained in:
Katelyn Baker 2018-07-17 15:11:31 +01:00 committed by GitHub
parent 729d1b29a6
commit f44cec5321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
serialization/src/test/java/net/corda/serialization/internal/amqp/JavaCustomSerializerTests.java → node-api/src/test/java/net/corda/nodeapi/internal/serialization/amqp/JavaCustomSerializerTests.java
View File

@ -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);
}
}

4
node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
View File

@ -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("* *")