ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-28 15:14:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix broken test after merge

Browse Source
This commit is contained in:
Patrick Kuo 2018-01-30 14:23:24 +00:00
parent 1c77736d50
commit 970303dc2d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/hsm/SigningServiceIntegrationTest.kt
View File

@ -126,10 +126,13 @@ class SigningServiceIntegrationTest {
} }
} }
config.certificatesDirectory.createDirectories() config.certificatesDirectory.createDirectories()
val trustStore = X509KeyStore.fromFile(config.trustStoreFile, config.trustStorePassword, createNew = true) val networkTrustStorePath = config.certificatesDirectory / "network-root-truststore.jks"
trustStore.update { val networkTrustStorePassword = "network-trust-password"
val networkTrustStore = X509KeyStore.fromFile(networkTrustStorePath, networkTrustStorePassword, createNew = true)
networkTrustStore.update {
setCertificate(X509Utilities.CORDA_ROOT_CA, rootCaCert) setCertificate(X509Utilities.CORDA_ROOT_CA, rootCaCert)
} }
val trustStore = X509KeyStore.fromFile(config.trustStoreFile, config.trustStorePassword, createNew = true)
val nodeKeyStore = X509KeyStore.fromFile(config.nodeKeystore, config.keyStorePassword, createNew = true) val nodeKeyStore = X509KeyStore.fromFile(config.nodeKeystore, config.keyStorePassword, createNew = true)
val sslKeyStore = X509KeyStore.fromFile(config.sslKeystore, config.keyStorePassword, createNew = true) val sslKeyStore = X509KeyStore.fromFile(config.sslKeystore, config.keyStorePassword, createNew = true)
config.also { config.also {
@ -137,7 +140,7 @@ class SigningServiceIntegrationTest {
doReturn(nodeKeyStore).whenever(it).loadNodeKeyStore(any()) doReturn(nodeKeyStore).whenever(it).loadNodeKeyStore(any())
doReturn(sslKeyStore).whenever(it).loadSslKeyStore(any()) doReturn(sslKeyStore).whenever(it).loadSslKeyStore(any())
} }
NetworkRegistrationHelper(config, HTTPNetworkRegistrationService(config.compatibilityZoneURL!!)).buildKeystore() NetworkRegistrationHelper(config, HTTPNetworkRegistrationService(config.compatibilityZoneURL!!), networkTrustStorePath, networkTrustStorePassword).buildKeystore()
verify(hsmSigner).sign(any()) verify(hsmSigner).sign(any())
} }
} }