From d01b2cbe975ef0edbbc3011ba729ddde4844dd8e Mon Sep 17 00:00:00 2001
From: Andras Slemmer <andras.slemmer@r3cev.com>
Date: Fri, 9 Feb 2018 16:03:36 +0000
Subject: [PATCH] Address comments, fix test

---
 .../internal/serialization/SetsSerializationTest.kt      | 2 +-
 .../services/statemachine/StateMachineManagerImpl.kt     | 2 +-
 .../net/corda/node/messaging/InMemoryMessagingTests.kt   | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
index 48ba75540e..edd1eabf58 100644
--- a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
+++ b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
@@ -32,7 +32,7 @@ class SetsSerializationTest {
     }
 
     @Test
-    fun `check set can be serialized as part of SessionData`() {
+    fun `check set can be serialized as part of DataSessionMessage`() {
         run {
             val sessionData = DataSessionMessage(setOf(1).serialize())
             assertEqualAfterRoundTripSerialization(sessionData)
diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
index f6b7ebfe01..70ee60d5a5 100644
--- a/node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
+++ b/node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
@@ -341,7 +341,7 @@ class StateMachineManagerImpl(
         logger.trace { "Received $sessionInit from $sender" }
         val senderSessionId = sessionInit.initiatorSessionId
 
-        fun sendSessionReject(message: String) = sendSessionMessage(sender, ExistingSessionMessage(senderSessionId, RejectSessionMessage(message, random63BitValue())))
+        fun sendSessionReject(message: String) = sendSessionMessage(sender, ExistingSessionMessage(senderSessionId, RejectSessionMessage(message, errorId = sessionInit.initiatorSessionId.toLong)))
 
         val (session, initiatedFlowFactory) = try {
             val initiatedFlowFactory = getInitiatedFlowFactory(sessionInit)
diff --git a/node/src/test/kotlin/net/corda/node/messaging/InMemoryMessagingTests.kt b/node/src/test/kotlin/net/corda/node/messaging/InMemoryMessagingTests.kt
index 425d2f0e94..6981ac1b2f 100644
--- a/node/src/test/kotlin/net/corda/node/messaging/InMemoryMessagingTests.kt
+++ b/node/src/test/kotlin/net/corda/node/messaging/InMemoryMessagingTests.kt
@@ -5,7 +5,6 @@ import net.corda.node.services.messaging.Message
 import net.corda.node.services.messaging.TopicStringValidator
 import net.corda.testing.internal.rigorousMock
 import net.corda.testing.node.MockNetwork
-import org.apache.commons.lang.ArrayUtils.EMPTY_BYTE_ARRAY
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
@@ -93,8 +92,8 @@ class InMemoryMessagingTests {
         node1.network.addMessageHandler("valid_message") { _, _ ->
             received++
         }
-        val invalidMessage = node2.network.createMessage("invalid_message", data = EMPTY_BYTE_ARRAY)
-        val validMessage = node2.network.createMessage("valid_message", data = EMPTY_BYTE_ARRAY)
+        val invalidMessage = node2.network.createMessage("invalid_message", data = ByteArray(1))
+        val validMessage = node2.network.createMessage("valid_message", data = ByteArray(1))
         node2.network.send(invalidMessage, node1.network.myAddress)
         mockNet.runNetwork()
         assertEquals(0, received)
@@ -105,8 +104,8 @@ class InMemoryMessagingTests {
 
         // Here's the core of the test; previously the unhandled message would cause runNetwork() to abort early, so
         // this would fail. Make fresh messages to stop duplicate uniqueMessageId causing drops
-        val invalidMessage2 = node2.network.createMessage("invalid_message", data = EMPTY_BYTE_ARRAY)
-        val validMessage2 = node2.network.createMessage("valid_message", data = EMPTY_BYTE_ARRAY)
+        val invalidMessage2 = node2.network.createMessage("invalid_message", data = ByteArray(1))
+        val validMessage2 = node2.network.createMessage("valid_message", data = ByteArray(1))
         node2.network.send(invalidMessage2, node1.network.myAddress)
         node2.network.send(validMessage2, node1.network.myAddress)
         mockNet.runNetwork()