Merge commit 'ad23bb875482b7b8e17c64fb37342d0d6a5ce94d' into feature/test-merge-szymon

# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
This commit is contained in:
szymonsztuka
2018-01-02 11:54:29 +00:00
3 changed files with 203 additions and 16 deletions

View File

@ -50,6 +50,7 @@ class BFTNotaryServiceTests : IntegrationTest() {
val databaseSchemas = IntegrationTestSchemas("node_0", "node_1", "node_2", "node_3", "node_4", "node_5",
"node_6", "node_7", "node_8", "node_9")
}
private lateinit var mockNet: MockNetwork
private lateinit var notary: Party
private lateinit var node: StartedNode<MockNode>
@ -58,6 +59,7 @@ class BFTNotaryServiceTests : IntegrationTest() {
fun before() {
mockNet = MockNetwork(emptyList())
}
@After
fun stopNodes() {
mockNet.stopNodes()