diff --git a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt index 666c842a3f..eedd216f66 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt @@ -11,13 +11,10 @@ import net.corda.node.services.config.rpc.NodeRpcOptions import net.corda.node.services.config.schema.v1.V1NodeConfigurationSpec import net.corda.node.services.keys.cryptoservice.BCCryptoService import net.corda.node.services.keys.cryptoservice.SupportedCryptoServices +import net.corda.node.services.keys.cryptoservice.utimaco.UtimacoCryptoService import net.corda.nodeapi.internal.config.FileBasedCertificateStoreSupplier import net.corda.nodeapi.internal.config.MutualSslConfiguration import net.corda.nodeapi.internal.config.User -import net.corda.node.services.keys.cryptoservice.utimaco.UtimacoCryptoService -import net.corda.nodeapi.BrokerRpcSslOptions -import net.corda.nodeapi.internal.DEV_PUB_KEY_HASHES -import net.corda.nodeapi.internal.config.* import net.corda.nodeapi.internal.cryptoservice.CryptoService import net.corda.nodeapi.internal.persistence.DatabaseConfig import net.corda.tools.shell.SSHDConfiguration diff --git a/node/src/main/kotlin/net/corda/node/services/config/NodeConfigurationImpl.kt b/node/src/main/kotlin/net/corda/node/services/config/NodeConfigurationImpl.kt index 12a2b0fc4d..3842d00097 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/NodeConfigurationImpl.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/NodeConfigurationImpl.kt @@ -244,7 +244,6 @@ data class NodeConfigurationImpl( errors += validateTlsCertCrlConfig() errors += validateNetworkServices() errors += validateH2Settings() - errors += validateCryptoService() return errors } @@ -269,17 +268,6 @@ data class NodeConfigurationImpl( return errors } - private fun validateCryptoService(): List { - val errors = mutableListOf() - if (cryptoServiceName == null && cryptoServiceConf != null) { - errors += "'cryptoServiceName' is mandatory when 'cryptoServiceConf' is specified" - } - if (notary != null && !(cryptoServiceName == null || cryptoServiceName == SupportedCryptoServices.BC_SIMPLE)) { - errors += "Notary node with a non supported 'cryptoServiceName' has been detected" - } - return errors - } - private fun validateRpcSettings(options: NodeRpcSettings): List { val errors = mutableListOf() if (options.adminAddress == null) { diff --git a/node/src/main/kotlin/net/corda/node/services/config/schema/v1/V1NodeConfigurationSpec.kt b/node/src/main/kotlin/net/corda/node/services/config/schema/v1/V1NodeConfigurationSpec.kt index f9e7441d4d..465463d393 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/schema/v1/V1NodeConfigurationSpec.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/schema/v1/V1NodeConfigurationSpec.kt @@ -2,29 +2,12 @@ package net.corda.node.services.config.schema.v1 import com.typesafe.config.Config import com.typesafe.config.ConfigException -import net.corda.common.configuration.parsing.internal.Configuration -import net.corda.common.configuration.parsing.internal.get -import net.corda.common.configuration.parsing.internal.listOrEmpty -import net.corda.common.configuration.parsing.internal.map -import net.corda.common.configuration.parsing.internal.mapValid -import net.corda.common.configuration.parsing.internal.nested -import net.corda.common.configuration.parsing.internal.toValidationError +import net.corda.common.configuration.parsing.internal.* import net.corda.common.validation.internal.Validated.Companion.invalid import net.corda.common.validation.internal.Validated.Companion.valid -import net.corda.node.services.config.JmxReporterType -import net.corda.node.services.config.NodeConfiguration -import net.corda.node.services.config.NodeConfigurationImpl +import net.corda.node.services.config.* import net.corda.node.services.config.NodeConfigurationImpl.Defaults -import net.corda.node.services.config.Valid -import net.corda.node.services.config.VerifierType -import net.corda.node.services.config.schema.parsers.badValue -import net.corda.node.services.config.schema.parsers.toCordaX500Name -import net.corda.node.services.config.schema.parsers.toNetworkHostAndPort -import net.corda.node.services.config.schema.parsers.toPath -import net.corda.node.services.config.schema.parsers.toPrincipal -import net.corda.node.services.config.schema.parsers.toProperties -import net.corda.node.services.config.schema.parsers.toURL -import net.corda.node.services.config.schema.parsers.toUUID +import net.corda.node.services.config.schema.parsers.* import net.corda.node.services.keys.cryptoservice.SupportedCryptoServices internal object V1NodeConfigurationSpec : Configuration.Specification("NodeConfiguration") { diff --git a/node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt b/node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt index e19bbcb068..2325a928ca 100644 --- a/node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt +++ b/node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt @@ -19,7 +19,6 @@ import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Test -import java.io.File import java.net.InetAddress import java.net.URI import java.net.URL @@ -278,7 +277,7 @@ class NodeConfigurationImplTest { fun `jmxReporterType is null and defaults to Jokolia`() { val rawConfig = getConfig("working-config.conf", ConfigFactory.parseMap(mapOf("devMode" to true))) val nodeConfig = rawConfig.parseAsNodeConfiguration().value() - assertTrue(JmxReporterType.JOLOKIA.toString() == nodeConfig.jmxReporterType.toString()) + assertEquals(JmxReporterType.JOLOKIA.toString(), nodeConfig.jmxReporterType.toString()) } @Test @@ -286,7 +285,7 @@ class NodeConfigurationImplTest { var rawConfig = getConfig("working-config.conf", ConfigFactory.parseMap(mapOf("devMode" to true))) rawConfig = rawConfig.withValue("jmxReporterType", ConfigValueFactory.fromAnyRef("NEW_RELIC")) val nodeConfig = rawConfig.parseAsNodeConfiguration().value() - assertTrue(JmxReporterType.NEW_RELIC.toString() == nodeConfig.jmxReporterType.toString()) + assertEquals(JmxReporterType.NEW_RELIC.toString(), nodeConfig.jmxReporterType.toString()) } @Test @@ -294,7 +293,7 @@ class NodeConfigurationImplTest { var rawConfig = getConfig("working-config.conf", ConfigFactory.parseMap(mapOf("devMode" to true))) rawConfig = rawConfig.withValue("jmxReporterType", ConfigValueFactory.fromAnyRef("JOLOKIA")) val nodeConfig = rawConfig.parseAsNodeConfiguration().value() - assertTrue(JmxReporterType.JOLOKIA.toString() == nodeConfig.jmxReporterType.toString()) + assertEquals(JmxReporterType.JOLOKIA.toString(), nodeConfig.jmxReporterType.toString()) } private fun configDebugOptions(devMode: Boolean, devModeOptions: DevModeOptions?): NodeConfigurationImpl { diff --git a/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelperTest.kt b/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelperTest.kt index 320e499718..024a5d8346 100644 --- a/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelperTest.kt +++ b/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelperTest.kt @@ -69,8 +69,6 @@ class NetworkRegistrationHelperTest { doReturn(null).whenever(it).tlsCertCrlDistPoint doReturn(null).whenever(it).tlsCertCrlIssuer doReturn(true).whenever(it).crlCheckSoftFail - doReturn(null).whenever(it).cryptoServiceName - doReturn(null).whenever(it).cryptoServiceConf } }