From 7ef8397920a9cfe0c4bb941bfe80f0545f32d368 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@r3cev.com>
Date: Wed, 16 Mar 2016 14:15:00 +0100
Subject: [PATCH] Use new Quasar API to skip serialisation of TLS slots.

---
 src/main/kotlin/core/messaging/StateMachineManager.kt  | 2 +-
 src/main/kotlin/core/protocols/ProtocolStateMachine.kt | 2 +-
 src/main/kotlin/protocols/TwoPartyTradeProtocol.kt     | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/core/messaging/StateMachineManager.kt b/src/main/kotlin/core/messaging/StateMachineManager.kt
index 22d036f117..bfbc062606 100644
--- a/src/main/kotlin/core/messaging/StateMachineManager.kt
+++ b/src/main/kotlin/core/messaging/StateMachineManager.kt
@@ -154,7 +154,7 @@ class StateMachineManager(val serviceHub: ServiceHub, val runInThread: Executor)
     }
 
     private fun deserializeFiber(bits: ByteArray): ProtocolStateMachine<*> {
-        val deserializer = Fiber.getFiberSerializer() as KryoSerializer
+        val deserializer = Fiber.getFiberSerializer(false) as KryoSerializer
         val kryo = createKryo(deserializer.kryo)
         val psm = kryo.readClassAndObject(Input(bits)) as ProtocolStateMachine<*>
         return psm
diff --git a/src/main/kotlin/core/protocols/ProtocolStateMachine.kt b/src/main/kotlin/core/protocols/ProtocolStateMachine.kt
index eef801888c..8cdd59e70e 100644
--- a/src/main/kotlin/core/protocols/ProtocolStateMachine.kt
+++ b/src/main/kotlin/core/protocols/ProtocolStateMachine.kt
@@ -77,7 +77,7 @@ class ProtocolStateMachine<R>(val logic: ProtocolLogic<R>) : Fiber<R>("protocol"
     private fun <T : Any> suspendAndExpectReceive(with: StateMachineManager.FiberRequest): UntrustworthyData<T> {
         parkAndSerialize { fiber, serializer ->
             // We don't use the passed-in serializer here, because we need to use our own augmented Kryo.
-            val deserializer = getFiberSerializer() as KryoSerializer
+            val deserializer = getFiberSerializer(false) as KryoSerializer
             val kryo = createKryo(deserializer.kryo)
             val stream = ByteArrayOutputStream()
             Output(stream).use {
diff --git a/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt b/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt
index 669c35e67a..b05e488840 100644
--- a/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt
+++ b/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt
@@ -26,6 +26,7 @@ import java.security.KeyPair
 import java.security.PublicKey
 import java.security.SignatureException
 import java.time.Instant
+import kotlin.system.exitProcess
 
 /**
  * This asset trading protocol implements a "delivery vs payment" type swap. It has two parties (B and S for buyer
@@ -211,6 +212,8 @@ object TwoPartyTradeProtocol {
             val (ptx, cashSigningPubKeys) = assembleSharedTX(tradeRequest)
             val stx = signWithOurKeys(cashSigningPubKeys, ptx)
 
+            // exitProcess(0)
+
             val signatures = swapSignaturesWithSeller(stx, tradeRequest.sessionID)
 
             logger.trace { "Got signatures from seller, verifying ... " }