From 68153b5acda603153f76ed74b4fc7873b4fbaad9 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Thu, 14 Sep 2017 16:52:42 +0100 Subject: [PATCH] CORDA-499: Move DemoRunner and DemoUtils into internal (#1509) * Move DemoRunner and DemoUtils into internal Move DemoRunner and DemoUtils into net.corda.testing.internal as they're unfinished APIs we don't want to commit to supporting, yet. * Move classes to demorun specific subpackage --- .../main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt | 3 +-- .../src/main/kotlin/net/corda/notarydemo/Clean.kt | 2 +- .../main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt | 3 +-- .../main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt | 3 +-- .../internal/demorun/CordformUtils.kt} | 5 +++-- .../net/corda/{ => testing/internal}/demorun/DemoRunner.kt | 5 +++-- 6 files changed, 10 insertions(+), 11 deletions(-) rename testing/node-driver/src/main/kotlin/net/corda/{demorun/util/DemoUtils.kt => testing/internal/demorun/CordformUtils.kt} (91%) rename testing/node-driver/src/main/kotlin/net/corda/{ => testing/internal}/demorun/DemoRunner.kt (92%) diff --git a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt index 3cae8491ca..0848b2244f 100644 --- a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt +++ b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt @@ -9,13 +9,12 @@ import net.corda.core.internal.stream import net.corda.core.internal.toTypedArray import net.corda.core.node.services.ServiceInfo import net.corda.core.utilities.NetworkHostAndPort -import net.corda.demorun.runNodes -import net.corda.demorun.util.* import net.corda.node.services.transactions.BFTNonValidatingNotaryService import net.corda.node.services.transactions.minCorrectReplicas import net.corda.node.utilities.ServiceIdentityGenerator import net.corda.testing.ALICE import net.corda.testing.BOB +import net.corda.testing.internal.demorun.* fun main(args: Array) = BFTNotaryCordform.runNodes() diff --git a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/Clean.kt b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/Clean.kt index b06bea78c9..1bab32c9a9 100644 --- a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/Clean.kt +++ b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/Clean.kt @@ -1,6 +1,6 @@ package net.corda.notarydemo -import net.corda.demorun.clean +import net.corda.testing.internal.demorun.clean fun main(args: Array) { listOf(SingleNotaryCordform, RaftNotaryCordform, BFTNotaryCordform).forEach { diff --git a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt index 1eaa301a72..76c3f34221 100644 --- a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt +++ b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt @@ -7,12 +7,11 @@ import net.corda.core.identity.CordaX500Name import net.corda.core.internal.div import net.corda.core.node.services.ServiceInfo import net.corda.core.utilities.NetworkHostAndPort -import net.corda.demorun.runNodes -import net.corda.demorun.util.* import net.corda.node.services.transactions.RaftValidatingNotaryService import net.corda.node.utilities.ServiceIdentityGenerator import net.corda.testing.ALICE import net.corda.testing.BOB +import net.corda.testing.internal.demorun.* fun main(args: Array) = RaftNotaryCordform.runNodes() diff --git a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt index 4c8bb839e1..d0c3133de8 100644 --- a/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt +++ b/samples/notary-demo/src/main/kotlin/net/corda/notarydemo/SingleNotaryCordform.kt @@ -5,7 +5,6 @@ import net.corda.core.node.services.ServiceInfo import net.corda.testing.ALICE import net.corda.testing.BOB import net.corda.testing.DUMMY_NOTARY -import net.corda.demorun.runNodes import net.corda.node.services.FlowPermissions.Companion.startFlowPermission import net.corda.node.services.transactions.ValidatingNotaryService import net.corda.nodeapi.User @@ -13,7 +12,7 @@ import net.corda.notarydemo.flows.DummyIssueAndMove import net.corda.notarydemo.flows.RPCStartableNotaryFlowClient import net.corda.cordform.CordformDefinition import net.corda.cordform.CordformContext -import net.corda.demorun.util.* +import net.corda.testing.internal.demorun.* fun main(args: Array) = SingleNotaryCordform.runNodes() diff --git a/testing/node-driver/src/main/kotlin/net/corda/demorun/util/DemoUtils.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/CordformUtils.kt similarity index 91% rename from testing/node-driver/src/main/kotlin/net/corda/demorun/util/DemoUtils.kt rename to testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/CordformUtils.kt index 1ab7155e80..144cb172eb 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/demorun/util/DemoUtils.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/CordformUtils.kt @@ -1,4 +1,6 @@ -package net.corda.demorun.util +@file:JvmName("CordformUtils") + +package net.corda.testing.internal.demorun import net.corda.cordform.CordformDefinition import net.corda.cordform.CordformNode @@ -6,7 +8,6 @@ import net.corda.core.identity.CordaX500Name import net.corda.core.node.services.ServiceInfo import net.corda.core.utilities.NetworkHostAndPort import net.corda.nodeapi.User -import org.bouncycastle.asn1.x500.X500Name fun CordformDefinition.node(configure: CordformNode.() -> Unit) { addNode { cordformNode -> cordformNode.configure() } diff --git a/testing/node-driver/src/main/kotlin/net/corda/demorun/DemoRunner.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt similarity index 92% rename from testing/node-driver/src/main/kotlin/net/corda/demorun/DemoRunner.kt rename to testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt index c21248f8f0..2897c3e92f 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/demorun/DemoRunner.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt @@ -1,4 +1,6 @@ -package net.corda.demorun +@file:JvmName("DemoRunner") + +package net.corda.testing.internal.demorun import net.corda.cordform.CordformDefinition import net.corda.cordform.CordformNode @@ -6,7 +8,6 @@ import net.corda.core.identity.CordaX500Name import net.corda.testing.driver.NetworkMapStartStrategy import net.corda.testing.driver.PortAllocation import net.corda.testing.driver.driver -import javax.security.auth.x500.X500Principal fun CordformDefinition.clean() { System.err.println("Deleting: $driverDirectory")