ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 09:51:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Address comments, fix test

Browse Source
This commit is contained in:
Andras Slemmer 2018-02-09 16:03:36 +00:00
parent 70399eb2ac
commit d01b2cbe97
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
View File

@ -32,7 +32,7 @@ class SetsSerializationTest {
} }
@Test @Test
fun `check set can be serialized as part of SessionData`() { fun `check set can be serialized as part of DataSessionMessage`() {
run { run {
val sessionData = DataSessionMessage(setOf(1).serialize()) val sessionData = DataSessionMessage(setOf(1).serialize())
assertEqualAfterRoundTripSerialization(sessionData) assertEqualAfterRoundTripSerialization(sessionData)

2
node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
View File

@ -341,7 +341,7 @@ class StateMachineManagerImpl(
logger.trace { "Received $sessionInit from $sender" } logger.trace { "Received $sessionInit from $sender" }
val senderSessionId = sessionInit.initiatorSessionId 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 (session, initiatedFlowFactory) = try {
val initiatedFlowFactory = getInitiatedFlowFactory(sessionInit) val initiatedFlowFactory = getInitiatedFlowFactory(sessionInit)

9
node/src/test/kotlin/net/corda/node/messaging/InMemoryMessagingTests.kt
View File

@ -5,7 +5,6 @@ import net.corda.node.services.messaging.Message
import net.corda.node.services.messaging.TopicStringValidator import net.corda.node.services.messaging.TopicStringValidator
import net.corda.testing.internal.rigorousMock import net.corda.testing.internal.rigorousMock
import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetwork
import org.apache.commons.lang.ArrayUtils.EMPTY_BYTE_ARRAY
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test
@ -93,8 +92,8 @@ class InMemoryMessagingTests {
node1.network.addMessageHandler("valid_message") { _, _ -> node1.network.addMessageHandler("valid_message") { _, _ ->
received++ received++
} }
val invalidMessage = node2.network.createMessage("invalid_message", data = EMPTY_BYTE_ARRAY) val invalidMessage = node2.network.createMessage("invalid_message", data = ByteArray(1))
val validMessage = node2.network.createMessage("valid_message", data = EMPTY_BYTE_ARRAY) val validMessage = node2.network.createMessage("valid_message", data = ByteArray(1))
node2.network.send(invalidMessage, node1.network.myAddress) node2.network.send(invalidMessage, node1.network.myAddress)
mockNet.runNetwork() mockNet.runNetwork()
assertEquals(0, received) 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 // 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 // this would fail. Make fresh messages to stop duplicate uniqueMessageId causing drops
val invalidMessage2 = node2.network.createMessage("invalid_message", data = EMPTY_BYTE_ARRAY) val invalidMessage2 = node2.network.createMessage("invalid_message", data = ByteArray(1))
val validMessage2 = node2.network.createMessage("valid_message", data = EMPTY_BYTE_ARRAY) val validMessage2 = node2.network.createMessage("valid_message", data = ByteArray(1))
node2.network.send(invalidMessage2, node1.network.myAddress) node2.network.send(invalidMessage2, node1.network.myAddress)
node2.network.send(validMessage2, node1.network.myAddress) node2.network.send(validMessage2, node1.network.myAddress)
mockNet.runNetwork() mockNet.runNetwork()