diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0e0d668d6d..3fe9769996 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -50,6 +50,8 @@ + + @@ -96,6 +98,8 @@ + + diff --git a/docs/source/running-doorman.rst b/docs/source/running-doorman.rst new file mode 100644 index 0000000000..8c9937608c --- /dev/null +++ b/docs/source/running-doorman.rst @@ -0,0 +1,32 @@ +Running a doorman service +========================= + + +See the Readme in under ``network-management`` for detailed building instructions. + + +Configuration file +------------------ +At startup Doorman reads a configuration file, passed with ``--configFile`` on the command line. + +This is an example of what a Doorman configuration file might look like: + .. literalinclude:: ../../network-management/doorman.conf + +Invoke Doorman with ``-?`` for a full list of supported command-line arguments. + + +Bootstrapping the network parameters +------------------------------------ +When Doorman is running it will serve the current network parameters. The first time Doorman is +started it will need to know the initial value for the network parameters. + +The initial values for the network parameters can be specified with a file, like this: + .. literalinclude:: ../../network-management/initial-network-parameters.conf + +And the location of that file can be specified with: ``--initialNetworkParameters``. +Note that when reading from file: + +1. ``epoch`` will always be set to 1, +2. ``modifiedTime`` will be the Doorman startup time + +``epoch`` will increase by one every time the network parameters are updated. diff --git a/network-management/Readme.md b/network-management/Readme.md new file mode 100644 index 0000000000..28a47876da --- /dev/null +++ b/network-management/Readme.md @@ -0,0 +1,8 @@ +The Doorman source code is located under `network-management/src` + +To build a fat jar containing all the doorman code you can simply invoke +.. sourcecode:: bash + ./gradlew network-management:buildDoormanJAR + +The built file will appear in +``network-management/build/libs/doorman--capsule.jar`` \ No newline at end of file diff --git a/network-management/build.gradle b/network-management/build.gradle index c2e3d1d7cb..d57306563c 100644 --- a/network-management/build.gradle +++ b/network-management/build.gradle @@ -1,7 +1,7 @@ ext { - // We use Corda release artifact dependencies instead of project dependencies to make sure each doorman releases are - // align with the corresponding Corda release. - corda_dependency_version = '2.0-20171017.135310-6' + // We use Corda release artifact dependencies instead of project dependencies to make sure each doorman release is + // aligned with the corresponding Corda release. + corda_dependency_version = '2.0-20171104.000037-23' } version "$corda_dependency_version" @@ -92,6 +92,7 @@ dependencies { compile "net.corda:corda-node-api:$corda_dependency_version" testCompile "net.corda:corda-test-utils:$corda_dependency_version" testCompile "net.corda:corda-node-driver:$corda_dependency_version" + testCompile "net.corda:corda-test-common:$corda_dependency_version" // Log4J: logging framework (with SLF4J bindings) compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" diff --git a/network-management/src/main/resources/doorman.conf b/network-management/doorman.conf similarity index 100% rename from network-management/src/main/resources/doorman.conf rename to network-management/doorman.conf diff --git a/network-management/initial-network-parameters.conf b/network-management/initial-network-parameters.conf new file mode 100644 index 0000000000..85f2fbcbd2 --- /dev/null +++ b/network-management/initial-network-parameters.conf @@ -0,0 +1,12 @@ +notaries : [{ + name: "O=Notary A, L=Port Louis, C=MU, OU=Org Unit, CN=Service Name" + key: "GfHq2tTVk9z4eXgyWmExBB3JfHpeuYrk9jUc4zaVVSXpnW8FdCUNDhw6GRGN" + validating: true +}, { + name: "O=Notary B, L=Bali, C=ID, OU=Org Unit, CN=Service Name" + key: "GfHq2tTVk9z4eXgyEshv6vtBDjp7n76QZH5hk6VXLhk3vRTAmKcP9F9tRfPj" + validating: false +}] +minimumPlatformVersion = 1 +maxMessageSize = 100 +maxTransactionSize = 100 \ No newline at end of file diff --git a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/DoormanIntegrationTest.kt b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/DoormanIntegrationTest.kt index 7ae68c014e..40b87a90cc 100644 --- a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/DoormanIntegrationTest.kt +++ b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/DoormanIntegrationTest.kt @@ -20,6 +20,7 @@ import org.junit.rules.TemporaryFolder import java.net.URL import java.util.* import kotlin.test.assertEquals +import net.corda.testing.common.internal.testNetworkParameters class DoormanIntegrationTest { @Rule @@ -41,7 +42,7 @@ class DoormanIntegrationTest { val signer = Signer(intermediateCAKey, arrayOf(intermediateCACert.toX509Certificate(), rootCACert.toX509Certificate())) //Start doorman server - val doorman = startDoorman(NetworkHostAndPort("localhost", 0), database, true, signer, null) + val doorman = startDoorman(NetworkHostAndPort("localhost", 0), database, true, testNetworkParameters(emptyList()), signer, null) // Start Corda network registration. val config = testNodeConfiguration( diff --git a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/hsm/SigningServiceIntegrationTest.kt b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/hsm/SigningServiceIntegrationTest.kt index 75df3582eb..9c94d60d85 100644 --- a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/hsm/SigningServiceIntegrationTest.kt +++ b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/hsm/SigningServiceIntegrationTest.kt @@ -24,6 +24,7 @@ import net.corda.node.utilities.registration.NetworkRegistrationHelper import net.corda.testing.ALICE import net.corda.testing.BOB import net.corda.testing.CHARLIE +import net.corda.testing.common.internal.testNetworkParameters import net.corda.testing.testNodeConfiguration import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest import org.h2.tools.Server @@ -90,7 +91,8 @@ class SigningServiceIntegrationTest { // Identity service not needed doorman, corda persistence is not very generic. throw UnsupportedOperationException() }, SchemaService()) - val doorman = startDoorman(NetworkHostAndPort(HOST, 0), database, approveAll = true) + val doorman = startDoorman(NetworkHostAndPort(HOST, 0), database, approveAll = true, + initialNetworkMapParameters = testNetworkParameters(emptyList())) // Start Corda network registration. val config = testNodeConfiguration( @@ -137,7 +139,8 @@ class SigningServiceIntegrationTest { // Identity service not needed doorman, corda persistence is not very generic. throw UnsupportedOperationException() }, SchemaService()) - val doorman = startDoorman(NetworkHostAndPort(HOST, 0), database, approveAll = true) + val doorman = startDoorman(NetworkHostAndPort(HOST, 0), database, approveAll = true, + initialNetworkMapParameters = testNetworkParameters(emptyList())) thread(start = true, isDaemon = true) { val h2ServerArgs = arrayOf("-tcpPort", H2_TCP_PORT, "-tcpAllowOthers") diff --git a/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/DoormanParameters.kt b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/DoormanParameters.kt index 90fbba5f9f..70bd9d5464 100644 --- a/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/DoormanParameters.kt +++ b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/DoormanParameters.kt @@ -22,7 +22,8 @@ data class DoormanParameters(val basedir: Path, val databaseProperties: Properties? = null, val jiraConfig: JiraConfig? = null, val keystorePath: Path? = null, // basedir / "certificates" / "caKeystore.jks", - val rootStorePath: Path? = null // basedir / "certificates" / "rootCAKeystore.jks" + val rootStorePath: Path? = null, // basedir / "certificates" / "rootCAKeystore.jks" + val initialNetworkParameters: Path ) { enum class Mode { DOORMAN, CA_KEYGEN, ROOT_KEYGEN @@ -50,6 +51,7 @@ fun parseParameters(vararg args: String): DoormanParameters { accepts("rootPrivateKeyPassword", "Root private key password.").withRequiredArg().describedAs("password") accepts("host", "Doorman web service host override").withRequiredArg().describedAs("hostname") accepts("port", "Doorman web service port override").withRequiredArg().ofType(Int::class.java).describedAs("port number") + accepts("initialNetworkParameters", "initial network parameters filepath").withRequiredArg().describedAs("The initial network map").describedAs("filepath") } val configFile = if (argConfig.hasPath("configFile")) { diff --git a/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/Main.kt b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/Main.kt index 6620da26ed..5ac338a81b 100644 --- a/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/Main.kt +++ b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/Main.kt @@ -16,6 +16,7 @@ import com.r3.corda.networkmanage.doorman.webservice.RegistrationWebService import net.corda.core.crypto.Crypto import net.corda.core.identity.CordaX500Name import net.corda.core.internal.createDirectories +import net.corda.core.node.NetworkParameters import net.corda.core.utilities.NetworkHostAndPort import net.corda.core.utilities.loggerFor import net.corda.core.utilities.seconds @@ -159,6 +160,7 @@ fun generateCAKeyPair(keystorePath: Path, rootStorePath: Path, rootKeystorePass: fun startDoorman(hostAndPort: NetworkHostAndPort, database: CordaPersistence, approveAll: Boolean, + initialNetworkMapParameters: NetworkParameters, signer: Signer? = null, jiraConfig: DoormanParameters.JiraConfig? = null): DoormanServer { @@ -179,7 +181,8 @@ fun startDoorman(hostAndPort: NetworkHostAndPort, DefaultCsrHandler(requestService, signer) } - val doorman = DoormanServer(hostAndPort, RegistrationWebService(requestProcessor, DoormanServer.serverStatus), NodeInfoWebService(PersistenceNodeInfoStorage(database))) + val doorman = DoormanServer(hostAndPort, RegistrationWebService(requestProcessor, DoormanServer.serverStatus), + NodeInfoWebService(PersistenceNodeInfoStorage(database), initialNetworkMapParameters)) doorman.start() // Thread process approved request periodically. @@ -241,7 +244,9 @@ fun main(args: Array) { DoormanParameters.Mode.DOORMAN -> { val database = configureDatabase(dataSourceProperties, databaseProperties, { throw UnsupportedOperationException() }, SchemaService()) val signer = buildLocalSigner(this) - startDoorman(NetworkHostAndPort(host, port), database, approveAll, signer, jiraConfig) + + val networkParameters = parseNetworkParametersFrom(initialNetworkParameters) + startDoorman(NetworkHostAndPort(host, port), database, approveAll, networkParameters, signer, jiraConfig) } } } diff --git a/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersConfiguration.kt b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersConfiguration.kt new file mode 100644 index 0000000000..a8d78afce6 --- /dev/null +++ b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersConfiguration.kt @@ -0,0 +1,67 @@ +package com.r3.corda.networkmanage.doorman + +import com.typesafe.config.ConfigFactory +import com.typesafe.config.ConfigParseOptions +import net.corda.core.identity.CordaX500Name +import net.corda.core.identity.Party +import net.corda.core.internal.exists +import net.corda.core.node.NetworkParameters +import net.corda.core.node.NotaryInfo +import net.corda.core.utilities.days +import net.corda.core.utilities.parsePublicKeyBase58 +import net.corda.nodeapi.config.parseAs +import java.nio.file.Path +import java.time.Instant + +/** + * Initial value for [NetworkParameters.epoch]. + */ +private const val DEFAULT_EPOCH = 1 + +/** + * Data class representing a [NotaryInfo] which can be easily parsed by a typesafe [ConfigFactory]. + * @property name the X500Name of the notary. + * @property key the public key as serialized by [toBase58String] + * @property validating whether the notary is validating + */ +internal data class NotaryConfiguration(private val name: CordaX500Name, + private val key: String, + private val validating: Boolean) { + fun toNotaryInfo(): NotaryInfo = NotaryInfo(Party(name, parsePublicKeyBase58(key)), validating) +} + +/** + * data class containing the fields from [NetworkParameters] which can be read at start-up time from doorman. + * It is a proper subset of [NetworkParameters] except for the [notaries] field which is replaced by a list of + * [NotaryConfiguration] which is parsable. + * + * This is public only because [parseAs] needs to be able to call its constructor. + */ +internal data class NetworkParametersConfiguration(val minimumPlatformVersion: Int, + val notaries: List, + val eventHorizonDays: Int, + val maxMessageSize: Int, + val maxTransactionSize: Int) + +/** + * Parses a file and returns a [NetworkParameters] instance. + * + * @return a [NetworkParameters] with values read from [configFile] except: + * an epoch of [DEFAULT_EPOCH], + * an eventHorizon of [DEFAULT_EVENT_HORIZON], and + * a modifiedTime initialized with [Instant.now]. + * If [configFile] is null [DEFAULT_NETWORK_PARAMETERS] is returned. + */ +fun parseNetworkParametersFrom(configFile: Path): NetworkParameters { + check(configFile.exists()) { "File $configFile does not exist" } + val initialNetworkParameters = ConfigFactory.parseFile(configFile.toFile(), ConfigParseOptions.defaults()) + .parseAs(NetworkParametersConfiguration::class) + + return NetworkParameters(initialNetworkParameters.minimumPlatformVersion, + initialNetworkParameters.notaries.map { it.toNotaryInfo() }, + initialNetworkParameters.eventHorizonDays.days, + initialNetworkParameters.maxMessageSize, + initialNetworkParameters.maxTransactionSize, + Instant.now(), + DEFAULT_EPOCH) +} \ No newline at end of file diff --git a/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/webservice/NodeInfoWebService.kt b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/webservice/NodeInfoWebService.kt index 0c843456bc..741de22106 100644 --- a/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/webservice/NodeInfoWebService.kt +++ b/network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/webservice/NodeInfoWebService.kt @@ -4,6 +4,7 @@ import com.r3.corda.networkmanage.common.persistence.NodeInfoStorage import com.r3.corda.networkmanage.doorman.webservice.NodeInfoWebService.Companion.networkMapPath import net.corda.core.crypto.Crypto import net.corda.core.crypto.SignedData +import net.corda.core.node.NetworkParameters import net.corda.core.node.NodeInfo import net.corda.core.serialization.deserialize import net.corda.core.serialization.serialize @@ -21,7 +22,7 @@ import javax.ws.rs.core.Response.ok import javax.ws.rs.core.Response.status @Path(networkMapPath) -class NodeInfoWebService(private val nodeInfoStorage: NodeInfoStorage) { +class NodeInfoWebService(private val nodeInfoStorage: NodeInfoStorage, private val networkParameters: NetworkParameters) { companion object { const val networkMapPath = "network-map" } @@ -60,6 +61,7 @@ class NodeInfoWebService(private val nodeInfoStorage: NodeInfoStorage) { @GET fun getNetworkMap(): Response { // TODO: Cache the response? + // TODO: Add the networkParamters to this returned response. return ok(ObjectMapper().writeValueAsString(nodeInfoStorage.getNodeInfoHashes())).build() } diff --git a/network-management/src/test/kotlin/com/r3/corda/networkmanage/NetworkParametersConfigurationTest.kt b/network-management/src/test/kotlin/com/r3/corda/networkmanage/NetworkParametersConfigurationTest.kt new file mode 100644 index 0000000000..16b56d2715 --- /dev/null +++ b/network-management/src/test/kotlin/com/r3/corda/networkmanage/NetworkParametersConfigurationTest.kt @@ -0,0 +1,40 @@ +package com.r3.corda.networkmanage + +import com.r3.corda.networkmanage.doorman.parseNetworkParametersFrom +import net.corda.core.utilities.days +import org.assertj.core.api.Assertions.assertThat +import org.assertj.core.api.Assertions.assertThatThrownBy +import org.junit.Test +import java.io.File +import java.nio.file.Paths +import java.time.Instant + +class NetworkParametersConfigurationTest { + + private val validInitialNetworkConfigPath = File(javaClass.getResource("/initial-network-parameters.conf").toURI()) + + @Test + fun `reads an existing file`() { + val confFile = validInitialNetworkConfigPath.toPath() + + val networkParameters = parseNetworkParametersFrom(confFile) + assertThat(networkParameters.minimumPlatformVersion).isEqualTo(1) + assertThat(networkParameters.eventHorizon).isEqualTo(100.days) + val notaries = networkParameters.notaries + assertThat(notaries).hasSize(2) + assertThat(notaries[0].validating).isTrue() + assertThat(notaries[1].validating).isFalse() + assertThat(networkParameters.maxMessageSize).isEqualTo(100) + assertThat(networkParameters.maxTransactionSize).isEqualTo(100) + // This is rather weak, though making this an exact test will require mocking a clock. + assertThat(networkParameters.modifiedTime).isBefore(Instant.now()) + assertThat(networkParameters.epoch).isEqualTo(1) + } + + @Test + fun `throws on a non-existing file`() { + assertThatThrownBy { + parseNetworkParametersFrom(Paths.get("notHere")) + }.isInstanceOf(IllegalStateException::class.java) + } +} \ No newline at end of file diff --git a/network-management/src/test/kotlin/com/r3/corda/networkmanage/common/persistence/PersistenceNodeInfoStorageTest.kt b/network-management/src/test/kotlin/com/r3/corda/networkmanage/common/persistence/PersistenceNodeInfoStorageTest.kt index 85ab83d0ac..515d22c240 100644 --- a/network-management/src/test/kotlin/com/r3/corda/networkmanage/common/persistence/PersistenceNodeInfoStorageTest.kt +++ b/network-management/src/test/kotlin/com/r3/corda/networkmanage/common/persistence/PersistenceNodeInfoStorageTest.kt @@ -17,6 +17,7 @@ import net.corda.node.utilities.CordaPersistence import net.corda.node.utilities.X509Utilities import net.corda.node.utilities.configureDatabase import net.corda.nodeapi.internal.serialization.* +import net.corda.nodeapi.internal.serialization.amqp.AMQPServerSerializationScheme import net.corda.testing.node.MockServices.Companion.makeTestDataSourceProperties import net.corda.testing.node.MockServices.Companion.makeTestDatabaseProperties import org.junit.After diff --git a/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/DoormanParametersTest.kt b/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/DoormanParametersTest.kt index 1166dcaeb3..158e882346 100644 --- a/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/DoormanParametersTest.kt +++ b/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/DoormanParametersTest.kt @@ -9,23 +9,26 @@ import kotlin.test.assertFailsWith class DoormanParametersTest { private val testDummyPath = ".${File.separator}testDummyPath.jks" + private val validInitialNetworkConfigPath = File(javaClass.getResource("/initial-network-parameters.conf").toURI()).absolutePath private val validConfigPath = File(javaClass.getResource("/doorman.conf").toURI()).absolutePath private val invalidConfigPath = File(javaClass.getResource("/doorman_fail.conf").toURI()).absolutePath + private val requiredArgs = arrayOf("--configFile", validConfigPath, "--initialNetworkParameters", validInitialNetworkConfigPath) + @Test fun `parse mode flag arg correctly`() { - assertEquals(DoormanParameters.Mode.CA_KEYGEN, parseParameters("--mode", "CA_KEYGEN", "--configFile", validConfigPath).mode) - assertEquals(DoormanParameters.Mode.ROOT_KEYGEN, parseParameters("--mode", "ROOT_KEYGEN", "--configFile", validConfigPath).mode) - assertEquals(DoormanParameters.Mode.DOORMAN, parseParameters("--mode", "DOORMAN", "--configFile", validConfigPath).mode) + assertEquals(DoormanParameters.Mode.CA_KEYGEN, callParseParametersWithRequiredArgs("--mode", "CA_KEYGEN").mode) + assertEquals(DoormanParameters.Mode.ROOT_KEYGEN, callParseParametersWithRequiredArgs("--mode", "ROOT_KEYGEN").mode) + assertEquals(DoormanParameters.Mode.DOORMAN, callParseParametersWithRequiredArgs("--mode", "DOORMAN").mode) } @Test fun `command line arg should override config file`() { - val params = parseParameters("--keystorePath", testDummyPath, "--port", "1000", "--configFile", validConfigPath) + val params = callParseParametersWithRequiredArgs("--keystorePath", testDummyPath, "--port", "1000") assertEquals(testDummyPath, params.keystorePath.toString()) assertEquals(1000, params.port) - val params2 = parseParameters("--configFile", validConfigPath) + val params2 = callParseParametersWithRequiredArgs() assertEquals(Paths.get("/opt/doorman/certificates/caKeystore.jks"), params2.keystorePath) assertEquals(8080, params2.port) } @@ -40,11 +43,15 @@ class DoormanParametersTest { @Test fun `should parse jira config correctly`() { - val parameter = parseParameters("--configFile", validConfigPath) + val parameter = callParseParametersWithRequiredArgs() assertEquals("https://doorman-jira-host.com/", parameter.jiraConfig?.address) assertEquals("TD", parameter.jiraConfig?.projectCode) assertEquals("username", parameter.jiraConfig?.username) assertEquals("password", parameter.jiraConfig?.password) assertEquals(41, parameter.jiraConfig?.doneTransitionCode) } + + private fun callParseParametersWithRequiredArgs(vararg additionalArgs: String): DoormanParameters { + return parseParameters(*(requiredArgs + additionalArgs)) + } } diff --git a/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/NodeInfoWebServiceTest.kt b/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/NodeInfoWebServiceTest.kt index 0789f0f475..5338769611 100644 --- a/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/NodeInfoWebServiceTest.kt +++ b/network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/NodeInfoWebServiceTest.kt @@ -20,6 +20,8 @@ import net.corda.node.serialization.KryoServerSerializationScheme import net.corda.node.utilities.CertificateType import net.corda.node.utilities.X509Utilities import net.corda.nodeapi.internal.serialization.* +import net.corda.nodeapi.internal.serialization.amqp.AMQPServerSerializationScheme +import net.corda.testing.common.internal.testNetworkParameters import org.bouncycastle.asn1.x500.X500Name import org.codehaus.jackson.map.ObjectMapper import org.junit.BeforeClass @@ -72,7 +74,8 @@ class NodeInfoWebServiceTest { on { getCertificatePath(any()) }.thenReturn(certPath) } - DoormanServer(NetworkHostAndPort("localhost", 0), NodeInfoWebService(nodeInfoStorage)).use { + DoormanServer(NetworkHostAndPort("localhost", 0), + NodeInfoWebService(nodeInfoStorage, testNetworkParameters(emptyList()))).use { it.start() val registerURL = URL("http://${it.hostAndPort}/api/${NodeInfoWebService.networkMapPath}/register") val nodeInfoAndSignature = SignedData(nodeInfo.serialize(), digitalSignature).serialize().bytes @@ -98,7 +101,8 @@ class NodeInfoWebServiceTest { on { getCertificatePath(any()) }.thenReturn(certPath) } - DoormanServer(NetworkHostAndPort("localhost", 0), NodeInfoWebService(nodeInfoStorage)).use { + DoormanServer(NetworkHostAndPort("localhost", 0), + NodeInfoWebService(nodeInfoStorage, testNetworkParameters(emptyList()))).use { it.start() val registerURL = URL("http://${it.hostAndPort}/api/${NodeInfoWebService.networkMapPath}/register") val nodeInfoAndSignature = SignedData(nodeInfo.serialize(), digitalSignature).serialize().bytes @@ -116,7 +120,8 @@ class NodeInfoWebServiceTest { val nodeInfoStorage: NodeInfoStorage = mock { on { getNodeInfoHashes() }.thenReturn(networkMapList) } - DoormanServer(NetworkHostAndPort("localhost", 0), NodeInfoWebService(nodeInfoStorage)).use { + DoormanServer(NetworkHostAndPort("localhost", 0), + NodeInfoWebService(nodeInfoStorage, testNetworkParameters(emptyList()))).use { it.start() val conn = URL("http://${it.hostAndPort}/api/${NodeInfoWebService.networkMapPath}").openConnection() as HttpURLConnection val response = conn.inputStream.bufferedReader().use { it.readLine() } @@ -139,7 +144,8 @@ class NodeInfoWebServiceTest { on { getNodeInfo(nodeInfoHash) }.thenReturn(nodeInfo) } - DoormanServer(NetworkHostAndPort("localhost", 0), NodeInfoWebService(nodeInfoStorage)).use { + DoormanServer(NetworkHostAndPort("localhost", 0), + NodeInfoWebService(nodeInfoStorage, testNetworkParameters(emptyList()))).use { it.start() val nodeInfoURL = URL("http://${it.hostAndPort}/api/${NodeInfoWebService.networkMapPath}/$nodeInfoHash") val conn = nodeInfoURL.openConnection() diff --git a/network-management/src/test/resources/initial-network-parameters.conf b/network-management/src/test/resources/initial-network-parameters.conf new file mode 100644 index 0000000000..e34c230df9 --- /dev/null +++ b/network-management/src/test/resources/initial-network-parameters.conf @@ -0,0 +1,13 @@ +notaries : [{ + name: "O=Notary A, L=Port Louis, C=MU, OU=Org Unit, CN=Service Name" + key: "GfHq2tTVk9z4eXgyWmExBB3JfHpeuYrk9jUc4zaVVSXpnW8FdCUNDhw6GRGN" + validating: true +}, { + name: "O=Notary B, L=Bali, C=ID, OU=Org Unit, CN=Service Name" + key: "GfHq2tTVk9z4eXgyEshv6vtBDjp7n76QZH5hk6VXLhk3vRTAmKcP9F9tRfPj" + validating: false +}] +eventHorizonDays = 100 +minimumPlatformVersion = 1 +maxMessageSize = 100 +maxTransactionSize = 100 \ No newline at end of file