ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Anthony Keenan 2018-03-26 15:52:00 +01:00
parent 7dbceaadcb
commit 23e4f4cb6f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
View File

@ -91,7 +91,7 @@ open class NodeSchedulerServiceTestBase {
protected fun assertStarted(flowLogic: FlowLogic<*>) { protected fun assertStarted(flowLogic: FlowLogic<*>) {
// Like in assertWaitingFor, use timeout to make verify wait as we often race the call to startFlow: // Like in assertWaitingFor, use timeout to make verify wait as we often race the call to startFlow:
verify(flowStarter, timeout(5000)).startFlow(same(flowLogic)!!, any()) verify(flowStarter, timeout(5000)).startFlow(same(flowLogic)!!, any(), any())
} }
protected fun assertStarted(event: Event) = assertStarted(event.flowLogic) protected fun assertStarted(event: Event) = assertStarted(event.flowLogic)