Merge fixes, including removing dependency to Kryo in the bridge and removing the kryo serialisation scheme for the enclave.

.idea/compiler.xml

@@ -37,6 +37,8 @@
       <module name="capsule-crr-submission_test" target="1.8" />
       <module name="capsule-hsm-cert-generator_main" target="1.8" />
       <module name="capsule-hsm-cert-generator_test" target="1.8" />
+      <module name="capsule-hsm-crl-generator_main" target="1.8" />
+      <module name="capsule-hsm-crl-generator_test" target="1.8" />
       <module name="capsule-hsm_main" target="1.8" />
       <module name="capsule-hsm_test" target="1.8" />
       <module name="client_main" target="1.8" />
@@ -56,9 +58,6 @@
       <module name="corda-utils_integrationTest" target="1.8" />
       <module name="corda-utils_main" target="1.8" />
       <module name="corda-utils_test" target="1.8" />
-      <module name="corda-utils_integrationTest" target="1.8" />
-      <module name="corda-utils_main" target="1.8" />
-      <module name="corda-utils_test" target="1.8" />
       <module name="corda-webserver_integrationTest" target="1.8" />
       <module name="corda-webserver_main" target="1.8" />
       <module name="corda-webserver_test" target="1.8" />

bridge/build.gradle

@@ -70,10 +70,6 @@ dependencies {
     compile "org.bouncycastle:bcpkix-jdk15on:${bouncycastle_version}"
     // Seems to be needed?
     compile "com.github.ben-manes.caffeine:caffeine:$caffeine_version"
-    // Pulled in by whitelist
-    compile ("com.esotericsoftware:kryo:4.0.0") {
-        transitive = false
-    }
 
     // Log4J: logging framework (with SLF4J bindings)
     compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"

node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt

@@ -26,6 +26,7 @@ import net.corda.core.serialization.SerializationDefaults
 import net.corda.core.serialization.SerializedBytes
 import net.corda.core.utilities.ByteSequence
 import net.corda.serialization.internal.*
+import net.corda.serialization.internal.CordaSerializationEncoding.SNAPPY
 import java.security.PublicKey
 import java.util.concurrent.ConcurrentHashMap
 
@@ -148,6 +149,6 @@ val KRYO_CHECKPOINT_CONTEXT = SerializationContextImpl(
         emptyMap(),
         true,
         SerializationContext.UseCase.Checkpoint,
-        null,
+        SNAPPY,
         AlwaysAcceptEncodingWhitelist
 )

verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/Enclavelet.kt

@@ -12,9 +12,10 @@
 
 package com.r3.enclaves.txverify
 
-import com.esotericsoftware.minlog.Log
 import net.corda.core.contracts.Attachment
-import net.corda.core.serialization.*
+import net.corda.core.serialization.CordaSerializable
+import net.corda.core.serialization.SerializedBytes
+import net.corda.core.serialization.deserialize
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.transactions.WireTransaction
 import java.io.File
@@ -82,7 +83,6 @@ private fun deserialise(reqBytes: ByteArray): LedgerTransaction {
 
 // Note: This is only here for debugging purposes
 fun main(args: Array<String>) {
-    Log.TRACE()
     Class.forName("com.r3.enclaves.txverify.EnclaveletSerializationScheme")
     val reqBytes = File(args[0]).readBytes()
     verifyInEnclave(reqBytes)

verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt

@@ -21,8 +21,6 @@ import net.corda.serialization.internal.SerializationFactoryImpl
 import net.corda.serialization.internal.amqp.AbstractAMQPSerializationScheme
 import net.corda.serialization.internal.amqp.SerializerFactory
 import net.corda.serialization.internal.amqp.amqpMagic
-import net.corda.serialization.internal.kryo.AbstractKryoSerializationScheme
-import net.corda.serialization.internal.kryo.kryoMagic
 
 @Suppress("UNUSED")
 private class EnclaveletSerializationScheme {
@@ -33,7 +31,6 @@ private class EnclaveletSerializationScheme {
         init {
             nodeSerializationEnv = SerializationEnvironmentImpl(
                 SerializationFactoryImpl(HashMap()).apply {
-                    registerScheme(KryoVerifierSerializationScheme)
                     registerScheme(AMQPVerifierSerializationScheme)
                 },
                 /**
@@ -50,15 +47,6 @@ private class EnclaveletSerializationScheme {
     }
 }
 
-private object KryoVerifierSerializationScheme : AbstractKryoSerializationScheme() {
-    override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase): Boolean {
-        return magic == kryoMagic && target == SerializationContext.UseCase.P2P
-    }
-
-    override fun rpcClientKryoPool(context: SerializationContext) = throw UnsupportedOperationException()
-    override fun rpcServerKryoPool(context: SerializationContext) = throw UnsupportedOperationException()
-}
-
 private object AMQPVerifierSerializationScheme : AbstractAMQPSerializationScheme(emptySet(), HashMap()) {
     override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase): Boolean {
         return magic == amqpMagic && target == SerializationContext.UseCase.P2P