ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-22 09:08:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
Identity service now updates with the network map.
This commit is contained in:
Clinton Alexander
2016-08-04 13:29:54 +01:00
parent 918de94a22 b1c1b7f4b4
commit b640524bf3
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt
View File

@ -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
}

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

@ -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))
}
/**

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

@ -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 {