Merge fixes

core/src/main/kotlin/net/corda/core/cordapp/Cordapp.kt

@@ -47,6 +47,5 @@ interface Cordapp {
     val allFlows: List<Class<out FlowLogic<*>>>
     val jarPath: URL
     val cordappClasses: List<String>
-    val info: Info
     val jarHash: SecureHash.SHA256
 }

experimental/flow-worker/src/main/kotlin/net/corda/flowworker/FlowWorkerServiceHub.kt

@@ -119,7 +119,7 @@ class FlowWorkerServiceHub(override val configuration: NodeConfiguration, overri
         identityService.database = database
     }
 
-    override val networkMapCache = PersistentNetworkMapCache(database, identityService, myInfo.legalIdentities[0].name)
+    override val networkMapCache = PersistentNetworkMapCache(database, identityService)
     private val checkpointStorage = DBCheckpointStorage()
     @Suppress("LeakingThis")
     override val validatedTransactions: WritableTransactionStorage = DBTransactionStorage(configuration.transactionCacheSizeBytes, database).tokenize()

experimental/rpc-worker/src/main/kotlin/net/corda/rpcWorker/RpcWorkerServiceHub.kt

@@ -36,7 +36,10 @@ import net.corda.node.services.config.NodeConfiguration
 import net.corda.node.services.identity.PersistentIdentityService
 import net.corda.node.services.keys.PersistentKeyManagementService
 import net.corda.node.services.messaging.MessagingService
-import net.corda.node.services.network.*
+import net.corda.node.services.network.NetworkMapClient
+import net.corda.node.services.network.NetworkMapUpdater
+import net.corda.node.services.network.NodeInfoWatcher
+import net.corda.node.services.network.PersistentNetworkMapCache
 import net.corda.node.services.persistence.DBTransactionMappingStorage
 import net.corda.node.services.persistence.DBTransactionStorage
 import net.corda.node.services.persistence.NodeAttachmentService
@@ -84,7 +87,7 @@ class RpcWorkerServiceHub(override val configuration: NodeConfiguration, overrid
         identityService.database = database
     }
 
-    override val networkMapCache = PersistentNetworkMapCache(database, identityService, myInfo.legalIdentities[0].name)
+    override val networkMapCache = PersistentNetworkMapCache(database, identityService)
     @Suppress("LeakingThis")
     override val validatedTransactions: WritableTransactionStorage = DBTransactionStorage(configuration.transactionCacheSizeBytes, database)
     private val networkMapClient: NetworkMapClient? = configuration.networkServices?.let { NetworkMapClient(it.networkMapURL, versionInfo) }

node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt

@@ -4,9 +4,9 @@ import net.corda.core.node.NodeInfo
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.node.internal.configureDatabase
 import net.corda.node.internal.schemas.NodeInfoSchemaV1
-import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.node.services.identity.InMemoryIdentityService
 import net.corda.nodeapi.internal.DEV_ROOT_CA
+import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.nodeapi.internal.persistence.DatabaseConfig
 import net.corda.testing.core.*
 import net.corda.testing.internal.IntegrationTest
@@ -22,7 +22,6 @@ class PersistentNetworkMapCacheTest : IntegrationTest() {
     private companion object {
         val ALICE = TestIdentity(ALICE_NAME, 70)
         val BOB = TestIdentity(BOB_NAME, 80)
-        val CHARLIE = TestIdentity(CHARLIE_NAME, 90)
 
         @ClassRule
         @JvmField
@@ -37,7 +36,7 @@ class PersistentNetworkMapCacheTest : IntegrationTest() {
 
     //Enterprise only - objects created in the setup method, below initialized with dummy values to avoid need for nullable type declaration
     private var database = CordaPersistence(DatabaseConfig(), emptySet())
-    private var charlieNetMapCache = PersistentNetworkMapCache(database, InMemoryIdentityService(trustRoot = DEV_ROOT_CA.certificate), CHARLIE.name)
+    private var charlieNetMapCache = PersistentNetworkMapCache(database, InMemoryIdentityService(trustRoot = DEV_ROOT_CA.certificate))
 
     @Before()
     fun setup() {

node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt

@@ -9,7 +9,6 @@ import net.corda.core.flows.*
 import net.corda.core.internal.*
 import net.corda.core.internal.cordapp.CordappImpl
 import net.corda.core.node.services.CordaService
-import net.corda.node.VersionInfo
 import net.corda.core.schemas.MappedSchema
 import net.corda.core.serialization.SerializationCustomSerializer
 import net.corda.core.serialization.SerializationWhitelist
@@ -127,8 +126,7 @@ class JarScanningCordappLoader private constructor(private val cordappJarPaths:
                 findAllFlows(this),
                 url.url,
                 info,
-                getJarHash(url.url),
+                getJarHash(url.url)
-                name
         )
     }
 

node/src/main/kotlin/net/corda/node/internal/cordapp/ManifestUtils.kt

@@ -23,11 +23,6 @@ fun createTestManifest(name: String, title: String, version: String, vendor: Str
     return manifest
 }
 
-internal fun createTestManifest(name: String, title: String, jarUUID: UUID): Manifest {
-
-    return createTestManifest(name, title, "test-$jarUUID", "R3")
-}
-
 operator fun Manifest.set(key: String, value: String) {
     mainAttributes.putValue(key, value)
 }