Removed useHTTPS from NodeConfiguration as it's not needed by the node. (#2375)

It's still expected to be present in node.conf if the web server needs to use SSL.
This commit is contained in:
Shams Asari
2018-01-17 17:47:40 +00:00
committed by GitHub
parent 6edf95506b
commit d19eb4a9d7
13 changed files with 12 additions and 24 deletions

View File

@ -17,8 +17,6 @@ import java.util.*
val Int.MB: Long get() = this * 1024L * 1024L
interface NodeConfiguration : NodeSSLConfiguration {
// myLegalName should be only used in the initial network registration, we should use the name from the certificate instead of this.
// TODO: Remove this so we don't accidentally use this identity in the code?
val myLegalName: CordaX500Name
val emailAddress: String
val exportJMXto: String
@ -34,8 +32,6 @@ interface NodeConfiguration : NodeSSLConfiguration {
val notary: NotaryConfig?
val activeMQServer: ActiveMqServerConfiguration
val additionalNodeInfoPollingFrequencyMsec: Long
// TODO Remove as this is only used by the driver
val useHTTPS: Boolean
val p2pAddress: NetworkHostAndPort
val rpcAddress: NetworkHostAndPort?
val messagingServerAddress: NetworkHostAndPort?
@ -114,7 +110,6 @@ data class NodeConfigurationImpl(
// TODO typesafe config supports the notion of durations. Make use of that by mapping it to java.time.Duration.
// Then rename this to messageRedeliveryDelay and make it of type Duration
override val messageRedeliveryDelaySeconds: Int = 30,
override val useHTTPS: Boolean,
override val p2pAddress: NetworkHostAndPort,
override val rpcAddress: NetworkHostAndPort?,
// TODO This field is slightly redundant as p2pAddress is sufficient to hold the address of the node's MQ broker.

View File

@ -14,7 +14,6 @@ database = {
exportHibernateJMXStatistics = "false"
}
devMode = true
useHTTPS = false
h2port = 0
useTestClock = false
verifierType = InMemory

View File

@ -40,7 +40,6 @@ class NodeConfigurationImplTest {
dataSourceProperties = makeTestDataSourceProperties(ALICE_NAME.organisation),
rpcUsers = emptyList(),
verifierType = VerifierType.InMemory,
useHTTPS = false,
p2pAddress = NetworkHostAndPort("localhost", 0),
rpcAddress = NetworkHostAndPort("localhost", 1),
messagingServerAddress = null,