ENT-1887 Make sure open and enterprise API are identical (#3158)

* Sync public API's (and associated internal helpers) between Enterprise and OS.

* Add previous default constructor explicitly.

* Keep the API checker happy!

* Revert addition of ENT makeTestDataSourceProperties() function.

testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt

@@ -142,14 +142,48 @@ data class NodeParameters(
         val verifierType: VerifierType = VerifierType.InMemory,
         val customOverrides: Map<String, Any?> = emptyMap(),
         val startInSameProcess: Boolean? = null,
-        val maximumHeapSize: String = "512m"
+        val maximumHeapSize: String = "512m",
+        val logLevel: String? = null
 ) {
+    constructor(
+            providedName: CordaX500Name?,
+            rpcUsers: List<User>,
+            verifierType: VerifierType,
+            customOverrides: Map<String, Any?>,
+            startInSameProcess: Boolean?,
+            maximumHeapSize: String
+    ) : this(
+            providedName,
+            rpcUsers,
+            verifierType,
+            customOverrides,
+            startInSameProcess,
+            maximumHeapSize,
+            null)
+
+    fun copy(
+            providedName: CordaX500Name?,
+            rpcUsers: List<User>,
+            verifierType: VerifierType,
+            customOverrides: Map<String, Any?>,
+            startInSameProcess: Boolean?,
+            maximumHeapSize: String
+    ) = this.copy(
+            providedName,
+            rpcUsers,
+            verifierType,
+            customOverrides,
+            startInSameProcess,
+            maximumHeapSize,
+            null)
+
     fun withProvidedName(providedName: CordaX500Name?): NodeParameters = copy(providedName = providedName)
     fun withRpcUsers(rpcUsers: List<User>): NodeParameters = copy(rpcUsers = rpcUsers)
     fun withVerifierType(verifierType: VerifierType): NodeParameters = copy(verifierType = verifierType)
     fun withCustomOverrides(customOverrides: Map<String, Any?>): NodeParameters = copy(customOverrides = customOverrides)
     fun withStartInSameProcess(startInSameProcess: Boolean?): NodeParameters = copy(startInSameProcess = startInSameProcess)
     fun withMaximumHeapSize(maximumHeapSize: String): NodeParameters = copy(maximumHeapSize = maximumHeapSize)
+    fun withLogLevel(logLevel: String?): NodeParameters = copy(logLevel = logLevel)
 }
 
 /**
@@ -202,7 +236,7 @@ fun <A> driver(defaultParameters: DriverParameters = DriverParameters(), dsl: Dr
             ),
             coerce = { it },
             dsl = dsl,
-            initialiseSerialization = true
+            initialiseSerialization = defaultParameters.initialiseSerialization
     )
 }
 
@@ -245,8 +279,9 @@ data class DriverParameters(
         val notarySpecs: List<NotarySpec> = listOf(NotarySpec(DUMMY_NOTARY_NAME)),
         val extraCordappPackagesToScan: List<String> = emptyList(),
         val jmxPolicy: JmxPolicy = JmxPolicy(),
-        val networkParameters: NetworkParameters = testNetworkParameters(),
+        val networkParameters: NetworkParameters = testNetworkParameters(notaries = emptyList()),
-        val notaryCustomOverrides: Map<String, Any?> = emptyMap()
+        val notaryCustomOverrides: Map<String, Any?> = emptyMap(),
+        val initialiseSerialization: Boolean = true
     ) {
     constructor(
             isDebug: Boolean,
@@ -273,7 +308,40 @@ data class DriverParameters(
             notarySpecs,
             extraCordappPackagesToScan,
             jmxPolicy,
-            networkParameters, emptyMap()
+            networkParameters,
+            emptyMap(),
+            true
+    )
+
+    constructor(
+            isDebug: Boolean,
+            driverDirectory: Path,
+            portAllocation: PortAllocation,
+            debugPortAllocation: PortAllocation,
+            systemProperties: Map<String, String>,
+            useTestClock: Boolean,
+            startNodesInProcess: Boolean,
+            waitForAllNodesToFinish: Boolean,
+            notarySpecs: List<NotarySpec>,
+            extraCordappPackagesToScan: List<String>,
+            jmxPolicy: JmxPolicy,
+            networkParameters: NetworkParameters,
+            initialiseSerialization: Boolean
+    ) : this(
+            isDebug,
+            driverDirectory,
+            portAllocation,
+            debugPortAllocation,
+            systemProperties,
+            useTestClock,
+            startNodesInProcess,
+            waitForAllNodesToFinish,
+            notarySpecs,
+            extraCordappPackagesToScan,
+            jmxPolicy,
+            networkParameters,
+            emptyMap(),
+            initialiseSerialization
     )
 
     fun withIsDebug(isDebug: Boolean): DriverParameters = copy(isDebug = isDebug)
@@ -282,6 +350,7 @@ data class DriverParameters(
     fun withDebugPortAllocation(debugPortAllocation: PortAllocation): DriverParameters = copy(debugPortAllocation = debugPortAllocation)
     fun withSystemProperties(systemProperties: Map<String, String>): DriverParameters = copy(systemProperties = systemProperties)
     fun withUseTestClock(useTestClock: Boolean): DriverParameters = copy(useTestClock = useTestClock)
+    fun withInitialiseSerialization(initialiseSerialization: Boolean): DriverParameters = copy(initialiseSerialization = initialiseSerialization)
     fun withStartNodesInProcess(startNodesInProcess: Boolean): DriverParameters = copy(startNodesInProcess = startNodesInProcess)
     fun withWaitForAllNodesToFinish(waitForAllNodesToFinish: Boolean): DriverParameters = copy(waitForAllNodesToFinish = waitForAllNodesToFinish)
     fun withNotarySpecs(notarySpecs: List<NotarySpec>): DriverParameters = copy(notarySpecs = notarySpecs)
@@ -304,17 +373,50 @@ data class DriverParameters(
             jmxPolicy: JmxPolicy,
             networkParameters: NetworkParameters
     ) = this.copy(
-            isDebug,
+            isDebug = isDebug,
-            driverDirectory,
+            driverDirectory = driverDirectory,
-            portAllocation,
+            portAllocation = portAllocation,
-            debugPortAllocation,
+            debugPortAllocation = debugPortAllocation,
-            systemProperties,
+            systemProperties = systemProperties,
-            useTestClock,
+            useTestClock = useTestClock,
-            startNodesInProcess,
+            startNodesInProcess = startNodesInProcess,
-            waitForAllNodesToFinish,
+            waitForAllNodesToFinish = waitForAllNodesToFinish,
-            notarySpecs,
+            notarySpecs = notarySpecs,
-            extraCordappPackagesToScan,
+            extraCordappPackagesToScan = extraCordappPackagesToScan,
-            jmxPolicy,
+            jmxPolicy = jmxPolicy,
-            networkParameters, emptyMap()
+            networkParameters = networkParameters,
+            notaryCustomOverrides = emptyMap(),
+            initialiseSerialization = true
+    )
+
+    fun copy(
+            isDebug: Boolean,
+            driverDirectory: Path,
+            portAllocation: PortAllocation,
+            debugPortAllocation: PortAllocation,
+            systemProperties: Map<String, String>,
+            useTestClock: Boolean,
+            startNodesInProcess: Boolean,
+            waitForAllNodesToFinish: Boolean,
+            notarySpecs: List<NotarySpec>,
+            extraCordappPackagesToScan: List<String>,
+            jmxPolicy: JmxPolicy,
+            networkParameters: NetworkParameters,
+            initialiseSerialization: Boolean
+    ) = this.copy(
+            isDebug = isDebug,
+            driverDirectory = driverDirectory,
+            portAllocation = portAllocation,
+            debugPortAllocation = debugPortAllocation,
+            systemProperties = systemProperties,
+            useTestClock = useTestClock,
+            startNodesInProcess = startNodesInProcess,
+            waitForAllNodesToFinish = waitForAllNodesToFinish,
+            notarySpecs = notarySpecs,
+            extraCordappPackagesToScan = extraCordappPackagesToScan,
+            jmxPolicy = jmxPolicy,
+            networkParameters = networkParameters,
+            notaryCustomOverrides = emptyMap(),
+            initialiseSerialization = initialiseSerialization
     )
 }

testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt

@@ -4,8 +4,8 @@ import net.corda.core.DoNotImplement
 import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash
 import net.corda.core.identity.Party
-import net.corda.core.utilities.seconds
 import net.corda.core.transactions.TransactionBuilder
+import net.corda.core.utilities.seconds
 import java.security.PublicKey
 import java.time.Duration
 import java.time.Instant
@@ -86,6 +86,11 @@ class TransactionDSL<out T : TransactionDSLInterpreter>(interpreter: T, private
      */
     fun input(stateLabel: String) = input(retrieveOutputStateAndRef(ContractState::class.java, stateLabel).ref)
 
+    fun input(contractClassName: ContractClassName, stateLabel: String) {
+        val stateAndRef = retrieveOutputStateAndRef(ContractState::class.java, stateLabel)
+        input(contractClassName, stateAndRef.state.data)
+    }
+
     /**
      * Creates an [LedgerDSLInterpreter._unverifiedTransaction] with a single output state and adds it's reference as an
      * input to the current transaction.