ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-15 21:58:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Removed the network map service type as it's no longer needed.

Browse Source 
The absence or presence of the networkMapService config is what determines if a node is the network map or not.
This commit is contained in:
Shams Asari
2017-10-03 09:38:12 +01:00
parent 24b773eec1
commit 457f95f188
27 changed files with 56 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/demobench/src/main/kotlin/net/corda/demobench/model/InstallFactory.kt
View File

@ -3,8 +3,6 @@ package net.corda.demobench.model
import com.typesafe.config.Config
import net.corda.core.identity.CordaX500Name
import net.corda.core.utilities.NetworkHostAndPort
import net.corda.nodeapi.internal.ServiceInfo
import net.corda.nodeapi.internal.ServiceType
import tornadofx.*
import java.io.IOException
import java.nio.file.Files
@ -54,7 +52,7 @@ class InstallFactory : Controller() {
}
private fun Config.parseExtraServices(path: String): MutableList<String> {
val services = serviceController.services.values.toSortedSet() + ServiceInfo(ServiceType.networkMap).toString()
val services = serviceController.services.values.toSortedSet()
return this.getStringList(path)
.filter { !it.isNullOrEmpty() }
.map { svc ->

3
tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
View File

@ -3,8 +3,6 @@ package net.corda.demobench.model
import net.corda.core.identity.CordaX500Name
import net.corda.demobench.plugin.PluginController
import net.corda.demobench.pty.R3Pty
import net.corda.nodeapi.internal.ServiceInfo
import net.corda.nodeapi.internal.ServiceType
import tornadofx.*
import java.io.IOException
import java.lang.management.ManagementFactory
@ -100,7 +98,6 @@ class NodeController(check: atRuntime = ::checkExists) : Controller() {
if (hasNetworkMap()) {
config.networkMap = networkMapConfig
} else {
config.extraServices.add(ServiceInfo(ServiceType.networkMap).toString())
networkMapConfig = config
log.info("Network map provided by: ${config.legalName}")
}