ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-15 16:46:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[CORDA-1937]: Fixes to enterprise float and bridge.

Browse Source
This commit is contained in:
Michele Sollecito 2018-09-04 17:33:05 +01:00
parent b4a64625fc
commit 0b495098a8
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bridge/bridgecapsule/src/smoke-test/kotlin/net/corda/bridge/smoketest/BridgeSmokeTest.kt
View File

@ -72,10 +72,10 @@ class BridgeSmokeTest {
val artemisConfig = CertificateStoreStubs.P2P.withBaseDirectory(baseDirectory)
artemisConfig.createBridgeKeyStores(DUMMY_BANK_A_NAME)
copyBridgeResource("corda-firewall.jar")
copyBridgeResource("firewall.conf")
copyBridgeResource("corda-firewall.jar", baseDirectory)
copyBridgeResource("firewall.conf", baseDirectory)
createNetworkParams(baseDirectory)
val (artemisServer, artemisClient) = createArtemis()
val (artemisServer, artemisClient) = createArtemis(baseDirectory, baseDirectory / "certificates", artemisConfig)
val zkServer = TestingServer(11105, false)
try {
installBridgeControlResponder(artemisClient)
@ -89,13 +89,12 @@ class BridgeSmokeTest {
}
}
private fun copyBridgeResource(resourceName: String) {
val testDir = tempFolder.root.toPath()
// Find the finance jar file for the smoke tests of this module
private fun copyBridgeResource(resourceName: String, baseDirectory: Path) {
// Find the firewall jar file for the smoke tests of this module
val bridgeJar = Paths.get("build", "resources/smokeTest/net/corda/bridge/smoketest").list {
it.filter { resourceName in it.toString() }.toList().single()
}
bridgeJar.copyToDirectory(testDir)
bridgeJar.copyToDirectory(baseDirectory)
}
private fun createNetworkParams(baseDirectory: Path) {
@ -200,18 +199,16 @@ class BridgeSmokeTest {
}
}
private fun createArtemis(): Pair<ArtemisMessagingServer, ArtemisMessagingClient> {
val baseDirectory = tempFolder.root.toPath()
val certificatesDirectory = baseDirectory / "certificates"
val p2pSslConfiguration = CertificateStoreStubs.P2P.withCertificatesDirectory(certificatesDirectory)
private fun createArtemis(baseDirectory: Path, certificatesDirectory: Path, p2pSslConfiguration: MutualSslConfiguration): Pair<ArtemisMessagingServer, ArtemisMessagingClient> {
val signingCertificateStore = CertificateStoreStubs.Signing.withCertificatesDirectory(certificatesDirectory)
val artemisConfig = rigorousMock<AbstractNodeConfiguration>().also {
doReturn(baseDirectory).whenever(it).baseDirectory
doReturn(certificatesDirectory).whenever(it).certificatesDirectory
doReturn(ALICE_NAME).whenever(it).myLegalName
doReturn(p2pSslConfiguration).whenever(it).p2pSslOptions
doReturn(signingCertificateStore).whenever(it).signingCertificateStore
doReturn(p2pSslConfiguration).whenever(it).p2pSslOptions
doReturn(NetworkHostAndPort("localhost", 11005)).whenever(it).p2pAddress
doReturn(null).whenever(it).jmxMonitoringHttpPort
doReturn(EnterpriseConfiguration(MutualExclusionConfiguration(false, "", 20000, 40000), externalBridge = true)).whenever(it).enterpriseConfiguration

2
testing/test-utils/src/main/kotlin/net/corda/testing/internal/stubs/CertificateStoreStubs.kt
View File

@ -52,7 +52,7 @@ class CertificateStoreStubs {
@JvmStatic
fun withBaseDirectory(baseDirectory: Path, certificatesDirectoryName: String = DEFAULT_CERTIFICATES_DIRECTORY_NAME, keyStoreFileName: String = KeyStore.DEFAULT_STORE_FILE_NAME, keyStorePassword: String = KeyStore.DEFAULT_STORE_PASSWORD, trustStoreFileName: String = TrustStore.DEFAULT_STORE_FILE_NAME, trustStorePassword: String = TrustStore.DEFAULT_STORE_PASSWORD): MutualSslConfiguration {
return withCertificatesDirectory(baseDirectory / certificatesDirectoryName, keyStorePassword, trustStorePassword, keyStoreFileName, trustStoreFileName)
return withCertificatesDirectory(baseDirectory / certificatesDirectoryName, keyStoreFileName, keyStorePassword, trustStoreFileName, trustStorePassword)
}
}