ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-15 16:46:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix more merge issues

Browse Source
This commit is contained in:
Anthony Keenan 2018-10-26 13:45:52 +01:00
parent 06fcf24f87
commit 235498086f
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/integration-test/kotlin/net/corda/node/flows/AsymmetricCorDappsTests.kt
View File

@ -76,7 +76,7 @@ class AsymmetricCorDappsTests : IntegrationTest() {
fun `shared cordapps with asymmetric specific classes in process`() {
val sharedCordapp = cordappForClasses(Ping::class.java)
val cordappForNodeB = cordappForClasses(Pong::class.java)
driver(DriverParameters(startNodesInProcess = true, cordappsForAllNodes = setOf(sharedCordapp))) {
driver(DriverParameters(startNodesInProcess = false, cordappsForAllNodes = setOf(sharedCordapp))) {
val (nodeA, nodeB) = listOf(startNode(providedName = ALICE_NAME), startNode(providedName = BOB_NAME, additionalCordapps = setOf(cordappForNodeB))).transpose().getOrThrow()
nodeA.rpc.startFlow(::Ping, nodeB.nodeInfo.singleIdentity(), 1).returnValue.getOrThrow()

1
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/TestCordappsUtils.kt
View File

@ -13,6 +13,7 @@ import kotlin.reflect.KClass
@JvmField
val FINANCE_CORDAPP: TestCordappImpl = cordappForPackages("net.corda.finance")
val BUSINESS_NETWORK_CORDAPP: TestCordappImpl = cordappForPackages("net.corda.sample.businessnetwork")
/** Creates a [TestCordappImpl] for each package. */
fun cordappsForPackages(vararg packageNames: String): List<TestCordappImpl> = cordappsForPackages(packageNames.asList())

9
tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
View File

@ -31,6 +31,7 @@ import net.corda.testing.core.BOB_NAME
import net.corda.testing.driver.*
import net.corda.testing.node.User
import net.corda.testing.node.internal.FINANCE_CORDAPP
import net.corda.testing.node.internal.BUSINESS_NETWORK_CORDAPP
import java.time.Instant
import java.util.*
import kotlin.reflect.KClass
@ -66,18 +67,22 @@ class ExplorerSimulation(private val options: OptionSet) {
private val issuers = HashMap<Currency, CordaRPCOps>()
private val parties = ArrayList<Pair<Party, CordaRPCOps>>()
init {
startDemoNodes()
}
private fun onEnd() {
println("Closing RPC connections")
RPCConnections.forEach { it.close() }
}
fun startDemoNodes() {
private fun startDemoNodes() {
val portAllocation = PortAllocation.Incremental(20000)
driver(DriverParameters(
portAllocation = portAllocation,
extraCordappPackagesToScan = packagesOfClasses(CashIssueFlow::class, Cash::class, CashSchemaV1::class,
IOUFlow::class, ObtainMembershipListContentFlow::class),
cordappsForAllNodes = listOf(FINANCE_CORDAPP),
cordappsForAllNodes = listOf(FINANCE_CORDAPP, BUSINESS_NETWORK_CORDAPP),
waitForAllNodesToFinish = true,
jmxPolicy = JmxPolicy(true)
)) {