Introducing network parameters.

network-parameters file read in by the node at startup, of which only the list of notaries is used. For now, the driver and MockNetwork have been updated to require notaries to be started first. This is so that the same set of network parameters can be defined for all the nodes.

CN in the legal name is not longer disallowed since it's no longer reserved for distributed notary names.

Single-node notaries now only have one identity, their main identity. Nodes part of a cluster continue to have two.

(Based off Kasia's work)

node-api/src/main/kotlin/net/corda/nodeapi/internal/ServiceInfo.kt

@@ -1,27 +0,0 @@
-package net.corda.nodeapi.internal
-
-import net.corda.core.identity.CordaX500Name
-import net.corda.core.serialization.CordaSerializable
-
-/**
- * A container for additional information for an advertised service.
- *
- * @param type the ServiceType identifier
- * @param name the service name, used for differentiating multiple services of the same type. Can also be used as a
- *             grouping identifier for nodes collectively running a distributed service.
- */
-@CordaSerializable
-data class ServiceInfo(val type: ServiceType, val name: CordaX500Name? = null) {
-    companion object {
-        fun parse(encoded: String): ServiceInfo {
-            val parts = encoded.split("|")
-            require(parts.size in 1..2) { "Invalid number of elements found" }
-            val type = ServiceType.parse(parts[0])
-            val name = parts.getOrNull(1)
-            val principal = name?.let { CordaX500Name.parse(it) }
-            return ServiceInfo(type, principal)
-        }
-    }
-
-    override fun toString() = if (name != null) "$type|$name" else type.toString()
-}

node-api/src/main/kotlin/net/corda/nodeapi/internal/ServiceType.kt

@@ -1,44 +0,0 @@
-package net.corda.nodeapi.internal
-
-import net.corda.core.serialization.CordaSerializable
-
-/**
- * Identifier for service types a node can expose over the network to other peers. These types are placed into network
- * map advertisements. Services that are purely local and are not providing functionality to other parts of the network
- * don't need a declared service type.
- */
-@CordaSerializable
-class ServiceType private constructor(val id: String) {
-    init {
-        // Enforce:
-        //
-        //  * IDs must start with a lower case letter
-        //  * IDs can only contain alphanumeric, full stop and underscore ASCII characters
-        require(id.matches(Regex("[a-z][a-zA-Z0-9._]+"))) { id }
-    }
-
-    companion object {
-        val corda: ServiceType
-            get() {
-                val stack = Throwable().stackTrace
-                val caller = stack.first().className
-                require(caller.startsWith("net.corda.")) { "Corda ServiceType namespace is reserved for Corda core components" }
-                return ServiceType("corda")
-            }
-
-        val notary: ServiceType = corda.getSubType("notary")
-
-        fun parse(id: String): ServiceType = ServiceType(id)
-
-        private fun baseWithSubType(baseId: String, subTypeId: String) = ServiceType("$baseId.$subTypeId")
-    }
-
-    fun getSubType(subTypeId: String): ServiceType = baseWithSubType(id, subTypeId)
-
-    fun isSubTypeOf(superType: ServiceType) = (id == superType.id) || id.startsWith(superType.id + ".")
-    fun isNotary() = isSubTypeOf(notary)
-
-    override fun equals(other: Any?): Boolean = other === this || other is ServiceType && other.id == this.id
-    override fun hashCode(): Int = id.hashCode()
-    override fun toString(): String = id
-}