Merged in clint-auto-identity (pull request #261)

Identity service now updates with the network map.

core/src/main/kotlin/com/r3corda/core/node/services/NetworkMapCache.kt

@@ -7,6 +7,7 @@ import com.r3corda.core.messaging.MessagingService
 import com.r3corda.core.node.NodeInfo
 import org.slf4j.LoggerFactory
 import java.security.PublicKey
+import rx.Observable
 
 /**
  * A network map contains lists of nodes on the network along with information about their identity keys, services
@@ -19,6 +20,9 @@ interface NetworkMapCache {
         val logger = LoggerFactory.getLogger(NetworkMapCache::class.java)
     }
 
+    enum class MapChangeType { Added, Removed }
+    data class MapChange(val node: NodeInfo, val type: MapChangeType )
+
     /** A list of nodes that advertise a network map service */
     val networkMapNodes: List<NodeInfo>
     /** A list of nodes that advertise a notary service */
@@ -27,6 +31,9 @@ interface NetworkMapCache {
     val ratesOracleNodes: List<NodeInfo>
     /** A list of all nodes the cache is aware of */
     val partyNodes: List<NodeInfo>
+    /** Tracks changes to the network map cache */
+    val changed: Observable<MapChange>
+
     /**
      * A list of nodes that advertise a regulatory service. Identifying the correct regulator for a trade is outside
      * the scope of the network map service, and this is intended solely as a sanity check on configuration stored

node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt

@@ -27,6 +27,8 @@ import com.r3corda.node.services.events.NodeSchedulerService
 import com.r3corda.node.services.events.ScheduledActivityObserver
 import com.r3corda.node.services.identity.InMemoryIdentityService
 import com.r3corda.node.services.keys.E2ETestKeyManagementService
+import com.r3corda.core.node.services.NetworkMapCache
+import com.r3corda.core.node.services.NetworkMapCache.MapChangeType
 import com.r3corda.node.services.network.InMemoryNetworkMapCache
 import com.r3corda.node.services.network.InMemoryNetworkMapService
 import com.r3corda.node.services.network.NetworkMapService
@@ -309,7 +311,11 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
 
         services.networkMapCache.partyNodes.forEach { service.registerIdentity(it.identity) }
 
-        // TODO: Subscribe to updates to the network map cache
+        netMapCache.changed.subscribe { mapChange ->
+            if(mapChange.type == MapChangeType.Added) {
+                service.registerIdentity(mapChange.node.identity)
+            }
+        }
 
         return service
     }

node/src/main/kotlin/com/r3corda/node/services/network/InMemoryNetworkMapCache.kt

@@ -13,6 +13,8 @@ import com.r3corda.core.node.NodeInfo
 import com.r3corda.core.node.services.DEFAULT_SESSION_ID
 import com.r3corda.core.node.services.NetworkCacheError
 import com.r3corda.core.node.services.NetworkMapCache
+import com.r3corda.core.node.services.NetworkMapCache.MapChangeType
+import com.r3corda.core.node.services.NetworkMapCache.MapChange
 import com.r3corda.core.node.services.ServiceType
 import com.r3corda.core.random63BitValue
 import com.r3corda.core.serialization.SingletonSerializeAsToken
@@ -23,6 +25,8 @@ import com.r3corda.node.services.api.RegulatorService
 import com.r3corda.node.services.clientapi.NodeInterestRates
 import com.r3corda.node.services.transactions.NotaryService
 import com.r3corda.node.utilities.AddOrRemove
+import rx.Observable
+import rx.subjects.PublishSubject
 import java.security.PublicKey
 import java.security.SignatureException
 import java.util.*
@@ -43,6 +47,8 @@ open class InMemoryNetworkMapCache(val netInternal: MessagingServiceInternal?) :
         get() = get(NodeInterestRates.Type)
     override val partyNodes: List<NodeInfo>
         get() = registeredNodes.map { it.value }
+    private val _changed = PublishSubject.create<MapChange>()
+    override val changed: Observable<MapChange> = _changed
 
     private var registeredForPush = false
     protected var registeredNodes = Collections.synchronizedMap(HashMap<Party, NodeInfo>())
@@ -95,10 +101,12 @@ open class InMemoryNetworkMapCache(val netInternal: MessagingServiceInternal?) :
     override fun addNode(node: NodeInfo) {
         registeredNodes[node.identity] = node
         netInternal?.registerTrustedAddress(node.address)
+        _changed.onNext(MapChange(node, MapChangeType.Added))
     }
 
     override fun removeNode(node: NodeInfo) {
         registeredNodes.remove(node.identity)
+        _changed.onNext(MapChange(node, MapChangeType.Removed))
     }
 
     /**

node/src/main/kotlin/com/r3corda/node/services/network/MockNetworkMapCache.kt

@@ -5,11 +5,16 @@ import com.r3corda.core.crypto.DummyPublicKey
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.messaging.SingleMessageRecipient
 import com.r3corda.core.node.NodeInfo
+import com.r3corda.core.node.services.NetworkMapCache
+import rx.Observable
+import rx.subjects.PublishSubject
 
 /**
  * Network map cache with no backing map service.
  */
 class MockNetworkMapCache() : InMemoryNetworkMapCache(null) {
+    override val changed: Observable<NetworkMapCache.MapChange> = PublishSubject.create<NetworkMapCache.MapChange>()
+
     data class MockAddress(val id: String): SingleMessageRecipient
 
     init {

src/main/kotlin/com/r3corda/demos/IRSDemo.kt

@@ -399,11 +399,6 @@ private fun startNode(params: CliParams.RunNode, networkMap: SingleMessageRecipi
     val node = logElapsedTime("Node startup", log) {
         Node(params.dir, params.networkAddress, params.apiAddress, config, networkMapId, advertisedServices, DemoClock()).start()
     }
-    // TODO: This should all be replaced by the identity service being updated
-    // as the network map changes.
-    for (identityFile in params.tradeWithIdentities) {
-        node.services.identityService.registerIdentity(parsePartyFromFile(identityFile))
-    }
 
     return node
 }