ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-01 00:45:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-670: Correct scanned packages in network visualiser (#1763)

Browse Source 
* Add CorDapp dependency of IRS to network visualiser

* Set CorDapp directories
This commit is contained in:
Ross Nicoll 2017-10-02 11:28:32 +01:00 committed by josecoll
parent f0138dfe17
commit 5d2a69ef51
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/network-visualiser/build.gradle
View File

@ -3,6 +3,7 @@ apply plugin: 'kotlin'
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'application' apply plugin: 'application'
apply plugin: 'net.corda.plugins.quasar-utils' apply plugin: 'net.corda.plugins.quasar-utils'
apply plugin: 'net.corda.plugins.cordformation'
apply plugin: 'us.kirchmeier.capsule' apply plugin: 'us.kirchmeier.capsule'
dependencies { dependencies {
@ -19,6 +20,9 @@ dependencies {
compile project(':finance') compile project(':finance')
// Cordapp dependencies // Cordapp dependencies
cordapp project(':finance')
cordapp project(':samples:irs-demo')
// GraphStream: For visualisation // GraphStream: For visualisation
compileOnly "co.paralleluniverse:capsule:$capsule_version" compileOnly "co.paralleluniverse:capsule:$capsule_version"
compile "org.graphstream:gs-core:1.3" compile "org.graphstream:gs-core:1.3"

2
samples/network-visualiser/src/main/kotlin/net/corda/netmap/simulation/Simulation.kt
View File

@ -22,6 +22,7 @@ import net.corda.testing.node.InMemoryMessagingNetwork
import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetwork
import net.corda.testing.node.TestClock import net.corda.testing.node.TestClock
import net.corda.testing.node.setTo import net.corda.testing.node.setTo
import net.corda.testing.setCordappPackages
import net.corda.testing.testNodeConfiguration import net.corda.testing.testNodeConfiguration
import rx.Observable import rx.Observable
import rx.subjects.PublishSubject import rx.subjects.PublishSubject
@ -263,6 +264,7 @@ abstract class Simulation(val networkSendManuallyPumped: Boolean,
val networkInitialisationFinished = allOf(*mockNet.nodes.map { it.nodeReadyFuture.toCompletableFuture() }.toTypedArray()) val networkInitialisationFinished = allOf(*mockNet.nodes.map { it.nodeReadyFuture.toCompletableFuture() }.toTypedArray())
fun start(): Future<Unit> { fun start(): Future<Unit> {
setCordappPackages("net.corda.irs.contract", "net.corda.finance.contract")
mockNet.startNodes() mockNet.startNodes()
mockNet.registerIdentities() mockNet.registerIdentities()
// Wait for all the nodes to have finished registering with the network map service. // Wait for all the nodes to have finished registering with the network map service.