From c5217412a4aea2ad02318d124659810ca772ea2a Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Wed, 11 May 2016 15:59:00 +0200 Subject: [PATCH] Put the network map service into the list of network services in Simulation, and update the mock physical locations, so the visualiser tool looks better. --- node/src/main/kotlin/core/testing/Simulation.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/node/src/main/kotlin/core/testing/Simulation.kt b/node/src/main/kotlin/core/testing/Simulation.kt index dea408b784..2ba5b85951 100644 --- a/node/src/main/kotlin/core/testing/Simulation.kt +++ b/node/src/main/kotlin/core/testing/Simulation.kt @@ -68,9 +68,9 @@ abstract class Simulation(val runAsync: Boolean, networkMapAddr: NodeInfo?, advertisedServices: Set, id: Int, keyPair: KeyPair?): MockNetwork.MockNode { require(advertisedServices.contains(NetworkMapService.Type)) val cfg = object : NodeConfiguration { - override val myLegalName: String = "Network Map Service Provider" + override val myLegalName: String = "Network coordination center" override val exportJMXto: String = "" - override val nearestCity: String = "Madrid" + override val nearestCity: String = "Amsterdam" } return object : SimulatedNode(dir, cfg, network, networkMapAddr, advertisedServices, id, keyPair) {} @@ -136,7 +136,9 @@ abstract class Simulation(val runAsync: Boolean, = network.createNode(null, nodeFactory = NotaryNodeFactory, advertisedServices = NotaryService.Type) as SimulatedNode val ratesOracle: SimulatedNode = network.createNode(null, nodeFactory = RatesOracleFactory, advertisedServices = NodeInterestRates.Type) as SimulatedNode - val serviceProviders: List = listOf(notary, ratesOracle) + + // All nodes must be in one of these two lists for the purposes of the visualiser tool. + val serviceProviders: List = listOf(notary, ratesOracle, networkMap) val banks: List = bankFactory.createAll() init {