From 466bff4121c9f036bc5a2d623196bfecf63c3a5d Mon Sep 17 00:00:00 2001
From: Florian Friemel <florian.friemel@r3.com>
Date: Wed, 19 Dec 2018 13:18:36 +0000
Subject: [PATCH] Revert "[CORDA-2330] Turn on lenient mode in rpc
 serialization context. (#4409)" (#4439)

This reverts commit 58b0cdaef7ff19de6066be1de2e4fe393f8e2147.
---
 .../serialization/internal/ClientContexts.kt  |  3 +-
 .../amqp/DeserializeQueryableStateTest.kt     | 63 -------------------
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeQueryableStateTest.kt

diff --git a/serialization/src/main/kotlin/net/corda/serialization/internal/ClientContexts.kt b/serialization/src/main/kotlin/net/corda/serialization/internal/ClientContexts.kt
index 8f8e9d4cb6..5df12028a9 100644
--- a/serialization/src/main/kotlin/net/corda/serialization/internal/ClientContexts.kt
+++ b/serialization/src/main/kotlin/net/corda/serialization/internal/ClientContexts.kt
@@ -21,6 +21,5 @@ val AMQP_RPC_CLIENT_CONTEXT = SerializationContextImpl(
         emptyMap(),
         true,
         SerializationContext.UseCase.RPCClient,
-        null,
-        lenientCarpenterEnabled = true
+        null
 )
diff --git a/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeQueryableStateTest.kt b/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeQueryableStateTest.kt
deleted file mode 100644
index 43e8123b97..0000000000
--- a/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeQueryableStateTest.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package net.corda.serialization.internal.amqp
-
-import net.corda.core.identity.AbstractParty
-import net.corda.core.schemas.MappedSchema
-import net.corda.core.schemas.PersistentState
-import net.corda.core.schemas.QueryableState
-import net.corda.core.serialization.SerializationContext
-import net.corda.core.serialization.SerializedBytes
-import net.corda.serialization.internal.AllWhitelist
-import net.corda.serialization.internal.SerializationContextImpl
-import net.corda.serialization.internal.amqp.testutils.*
-import net.corda.serialization.internal.carpenter.ClassCarpenterImpl
-import org.junit.Test
-
-data class TestState(override val participants: List<AbstractParty>): QueryableState {
-    override fun generateMappedObject(schema: MappedSchema): PersistentState {
-        throw NotImplementedError()
-    }
-    override fun supportedSchemas(): Iterable<MappedSchema> {
-        throw NotImplementedError()
-    }
-}
-
-/**
- * A class loader that excludes [TestState].
- */
-class ClassLoaderWithoutTestState(classLoader: ClassLoader): ClassLoader(classLoader) {
-    override fun loadClass(name: String?, resolve: Boolean): Class<*> {
-        if(name != null && name.contains("TestState")) {
-            throw ClassNotFoundException()
-        }
-        return super.loadClass(name, resolve)
-    }
-}
-
-class DeserializeQueryableStateTest {
-
-    /**
-     * Set `lenient` to false to reproduce CORDA-2330
-     * https://r3-cev.atlassian.net/browse/CORDA-2330
-     */
-    @Test
-    fun `should deserialize subclass of QueryableState that is not present in the class loader`() {
-
-        val lenient = true
-        val instance = TestState(listOf())
-        val serialized = TestSerializationOutput(false, testDefaultFactory()).serialize(instance)
-
-        val sf = SerializerFactoryBuilder.build(AllWhitelist, ClassCarpenterImpl(AllWhitelist, ClassLoaderWithoutTestState(ClassLoader.getSystemClassLoader()), lenient))
-
-        val context = SerializationContextImpl(
-                preferredSerializationVersion = amqpMagic,
-                deserializationClassLoader = ClassLoaderWithoutTestState(ClassLoader.getSystemClassLoader()),
-                whitelist = AllWhitelist,
-                properties = serializationProperties,
-                objectReferencesEnabled = false,
-                useCase = SerializationContext.UseCase.Testing,
-                encoding = null)
-        val bytes = SerializedBytes<QueryableState>(serialized.bytes)
-        // will throw when lenient is false
-        DeserializationInput(sf).deserialize(bytes, context)
-    }
-}
\ No newline at end of file