diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 94e345833e..c3348988c8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -37,6 +37,8 @@ + + @@ -56,9 +58,6 @@ - - - diff --git a/bridge/build.gradle b/bridge/build.gradle index 1ee5bdd7a5..1f7f0671a5 100644 --- a/bridge/build.gradle +++ b/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" diff --git a/node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt b/node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt index 734331eebc..ff9bcbc3a6 100644 --- a/node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt +++ b/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 ) diff --git a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/Enclavelet.kt b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/Enclavelet.kt index 592d01036c..31eb86641c 100644 --- a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/Enclavelet.kt +++ b/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) { - Log.TRACE() Class.forName("com.r3.enclaves.txverify.EnclaveletSerializationScheme") val reqBytes = File(args[0]).readBytes() verifyInEnclave(reqBytes) diff --git a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt index bc41d742ee..8a8ecb4cb1 100644 --- a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt +++ b/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