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

CORDA-3979: Support for multiple trust roots (#6772)

Browse Source
This commit is contained in:
Denis Rekalov
2020-10-20 12:18:00 +03:00
committed by GitHub
parent 401d8b8856
commit 4193adf6fd
37 changed files with 486 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
View File

@ -188,7 +188,7 @@ open class MockServices private constructor(
// Create a persistent identity service and add all the supplied identities.
identityService.apply {
database = persistence
start(DEV_ROOT_CA.certificate, initialIdentity.identity, pkToIdCache = pkToIdCache)
start(setOf(DEV_ROOT_CA.certificate), initialIdentity.identity, pkToIdCache = pkToIdCache)
persistence.transaction { identityService.loadIdentities(moreIdentities + initialIdentity.identity) }
}
val networkMapCache = PersistentNetworkMapCache(cacheFactory, persistence, identityService)

4
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/MockNetworkParametersService.kt
View File

@ -29,8 +29,8 @@ class MockNetworkParametersStorage(private var currentParameters: NetworkParamet
storeCurrentParameters()
}
override fun setCurrentParameters(currentSignedParameters: SignedDataWithCert<NetworkParameters>, trustRoot: X509Certificate) {
setCurrentParametersUnverified(currentSignedParameters.verifiedNetworkParametersCert(trustRoot))
override fun setCurrentParameters(currentSignedParameters: SignedDataWithCert<NetworkParameters>, trustRoots: Set<X509Certificate>) {
setCurrentParametersUnverified(currentSignedParameters.verifiedNetworkParametersCert(trustRoots))
}
override fun lookupSigned(hash: SecureHash): SignedDataWithCert<NetworkParameters>? {