mirror of
https://github.com/corda/corda.git
synced 2025-06-13 12:48:18 +00:00
Merge branch 'open_master' into corda/tudor-os-merge
# Conflicts: # settings.gradle # verifier/build.gradle # verifier/src/integration-test/kotlin/net/corda/verifier/GeneratedLedger.kt # verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt # verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt # verifier/src/main/kotlin/net/corda/verifier/Verifier.kt
This commit is contained in:
@ -47,7 +47,6 @@ dependencies {
|
||||
compile project(':client:jfx')
|
||||
compile project(':node-driver')
|
||||
compile project(':webserver')
|
||||
testCompile project(':verifier')
|
||||
testCompile project(':test-utils')
|
||||
|
||||
compile "org.graphstream:gs-core:1.3"
|
||||
|
@ -13,13 +13,11 @@ package net.corda.docs
|
||||
import net.corda.node.services.config.ConfigHelper
|
||||
import net.corda.node.services.config.NodeConfiguration
|
||||
import net.corda.node.services.config.parseAsNodeConfiguration
|
||||
import net.corda.verifier.Verifier
|
||||
import org.junit.Test
|
||||
import java.nio.file.Path
|
||||
import java.nio.file.Paths
|
||||
import kotlin.reflect.KVisibility
|
||||
import kotlin.reflect.full.declaredMemberProperties
|
||||
import kotlin.reflect.jvm.isAccessible
|
||||
|
||||
class ExampleConfigTest {
|
||||
|
||||
@ -51,14 +49,4 @@ class ExampleConfigTest {
|
||||
).parseAsNodeConfiguration()
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `example verifier_conf parses fine`() {
|
||||
readAndCheckConfigurations(
|
||||
"example-verifier.conf"
|
||||
) {
|
||||
val baseDirectory = Paths.get("some-example-base-dir")
|
||||
Verifier.loadConfiguration(baseDirectory, it)
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user