Reinstate Simulation config overrides for notary. (#1947)

confidential-identities/src/test/kotlin/net/corda/confidential/SwapIdentitiesFlowTests.kt

@@ -56,7 +56,7 @@ class SwapIdentitiesFlowTests {
         val mockNet = MockNetwork(threadPerNode = true)
 
         // Set up values we'll need
-        val notaryNode = mockNet.createNotaryNode(DUMMY_NOTARY.name)
+        val notaryNode = mockNet.createNotaryNode()
         val aliceNode = mockNet.createPartyNode(ALICE.name)
         val bobNode = mockNet.createPartyNode(BOB.name)
         val bob: Party = bobNode.services.myInfo.singleIdentity()
@@ -81,7 +81,7 @@ class SwapIdentitiesFlowTests {
         val mockNet = MockNetwork(threadPerNode = true)
 
         // Set up values we'll need
-        val notaryNode = mockNet.createNotaryNode(DUMMY_NOTARY.name)
+        val notaryNode = mockNet.createNotaryNode()
         val aliceNode = mockNet.createPartyNode(ALICE.name)
         val bobNode = mockNet.createPartyNode(BOB.name)
         val bob: Party = bobNode.services.myInfo.singleIdentity()

docs/source/example-code/src/test/kotlin/net/corda/docs/CustomVaultQueryTest.kt

@@ -35,7 +35,7 @@ class CustomVaultQueryTest {
                         "net.corda.docs"
                 )
         )
-        mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name)
+        mockNet.createNotaryNode()
         nodeA = mockNet.createPartyNode()
         nodeB = mockNet.createPartyNode()
         nodeA.internals.registerInitiatedFlow(TopupIssuerFlow.TopupIssuer::class.java)

docs/source/example-code/src/test/kotlin/net/corda/docs/FxTransactionBuildTutorialTest.kt

@@ -26,7 +26,7 @@ class FxTransactionBuildTutorialTest {
     @Before
     fun setup() {
         mockNet = MockNetwork(threadPerNode = true, cordappPackages = listOf("net.corda.finance.contracts.asset", CashSchemaV1::class.packageName))
-        mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name)
+        mockNet.createNotaryNode()
         nodeA = mockNet.createPartyNode()
         nodeB = mockNet.createPartyNode()
         nodeB.internals.registerInitiatedFlow(ForeignExchangeRemoteFlow::class.java)

docs/source/example-code/src/test/kotlin/net/corda/docs/WorkflowTransactionBuildTutorialTest.kt

@@ -34,7 +34,7 @@ class WorkflowTransactionBuildTutorialTest {
     fun setup() {
         mockNet = MockNetwork(threadPerNode = true, cordappPackages = listOf("net.corda.docs"))
         // While we don't use the notary, we need there to be one on the network
-        mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name)
+        mockNet.createNotaryNode()
         val aliceNode = mockNet.createPartyNode(ALICE_NAME)
         val bobNode = mockNet.createPartyNode(BOB_NAME)
         aliceNode.internals.registerInitiatedFlow(RecordCompletionFlow::class.java)

node/src/test/kotlin/net/corda/node/internal/CordaServiceTest.kt

@@ -13,7 +13,6 @@ import net.corda.core.utilities.ProgressTracker
 import net.corda.finance.DOLLARS
 import net.corda.finance.flows.CashIssueFlow
 import net.corda.node.internal.cordapp.DummyRPCFlow
-import net.corda.testing.DUMMY_NOTARY
 import net.corda.testing.node.MockNetwork
 import org.junit.After
 import org.junit.Before
@@ -82,7 +81,7 @@ class CordaServiceTest {
     @Before
     fun start() {
         mockNet = MockNetwork(threadPerNode = true, cordappPackages = listOf("net.corda.node.internal","net.corda.finance"))
-        notaryNode = mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name, validating = true)
+        notaryNode = mockNet.createNotaryNode()
         nodeA = mockNet.createNode()
         mockNet.startNodes()
     }

node/src/test/kotlin/net/corda/node/services/NotaryChangeTests.kt

@@ -16,6 +16,7 @@ import net.corda.node.internal.StartedNode
 import net.corda.testing.*
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.node.MockNetwork
+import net.corda.testing.node.MockNodeParameters
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.junit.After
 import org.junit.Before
@@ -37,10 +38,10 @@ class NotaryChangeTests {
     @Before
     fun setUp() {
         mockNet = MockNetwork(cordappPackages = listOf("net.corda.testing.contracts"))
-        oldNotaryNode = mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name)
+        oldNotaryNode = mockNet.createNotaryNode(MockNodeParameters(legalName = DUMMY_NOTARY.name))
         clientNodeA = mockNet.createNode()
         clientNodeB = mockNet.createNode()
-        newNotaryNode = mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name.copy(organisation = "Dummy Notary 2"))
+        newNotaryNode = mockNet.createNotaryNode(MockNodeParameters(legalName = DUMMY_NOTARY.name.copy(organisation = "Dummy Notary 2")))
         mockNet.runNetwork() // Clear network map registration messages
         oldNotaryParty = newNotaryNode.services.networkMapCache.getNotary(DUMMY_NOTARY_SERVICE_NAME)!!
         newNotaryParty = newNotaryNode.services.networkMapCache.getNotary(DUMMY_NOTARY_SERVICE_NAME.copy(organisation = "Dummy Notary 2"))!!

node/src/test/kotlin/net/corda/node/services/events/ScheduledFlowTests.kt

@@ -16,7 +16,6 @@ import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.getOrThrow
 import net.corda.node.internal.StartedNode
 import net.corda.node.services.statemachine.StateMachineManager
-import net.corda.testing.DUMMY_NOTARY
 import net.corda.testing.chooseIdentity
 import net.corda.testing.contracts.DummyContract
 import net.corda.testing.dummyCommand
@@ -95,7 +94,7 @@ class ScheduledFlowTests {
     @Before
     fun setup() {
         mockNet = MockNetwork(threadPerNode = true, cordappPackages = listOf("net.corda.testing.contracts"))
-        notaryNode = mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name)
+        notaryNode = mockNet.createNotaryNode()
         val a = mockNet.createUnstartedNode()
         val b = mockNet.createUnstartedNode()
 

node/src/test/kotlin/net/corda/node/services/transactions/NotaryServiceTests.kt

@@ -37,7 +37,7 @@ class NotaryServiceTests {
     @Before
     fun setup() {
         mockNet = MockNetwork(cordappPackages = listOf("net.corda.testing.contracts"))
-        val notaryNode = mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name, validating = false)
+        val notaryNode = mockNet.createNotaryNode(validating = false)
         aliceServices = mockNet.createNode(MockNodeParameters(legalName = ALICE_NAME)).services
         mockNet.runNetwork() // Clear network map registration messages
         notaryServices = notaryNode.services

node/src/test/kotlin/net/corda/node/services/transactions/ValidatingNotaryServiceTests.kt

@@ -37,7 +37,7 @@ class ValidatingNotaryServiceTests {
     @Before
     fun setup() {
         mockNet = MockNetwork(cordappPackages = listOf("net.corda.testing.contracts"))
-        val notaryNode = mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name)
+        val notaryNode = mockNet.createNotaryNode()
         val aliceNode = mockNet.createNode(MockNodeParameters(legalName = ALICE_NAME))
         mockNet.runNetwork() // Clear network map registration messages
         notaryServices = notaryNode.services

samples/network-visualiser/src/main/kotlin/net/corda/netmap/simulation/Simulation.kt

@@ -73,7 +73,7 @@ abstract class Simulation(val networkSendManuallyPumped: Boolean,
             networkSendManuallyPumped = networkSendManuallyPumped,
             threadPerNode = runAsync,
             cordappPackages = listOf("net.corda.irs.contract", "net.corda.finance.contract", "net.corda.irs"))
-    val notary = mockNet.createNotaryNode(DUMMY_NOTARY.name, false)
+    val notary = mockNet.createNotaryNode(defaultParams.copy(legalName = DUMMY_NOTARY.name), false)
     // TODO: Regulatory nodes don't actually exist properly, this is a last minute demo request.
     //       So we just fire a message at a node that doesn't know how to handle it, and it'll ignore it.
     //       But that's fine for visualisation purposes.

testing/node-driver/src/integration-test/kotlin/net/corda/testing/FlowStackSnapshotTest.kt

@@ -290,7 +290,7 @@ class FlowStackSnapshotTest {
     @Test
     fun `flowStackSnapshot object is serializable`() {
         val mockNet = MockNetwork(threadPerNode = true)
-        mockNet.createNotaryNode(legalName = DUMMY_NOTARY.name)
+        mockNet.createNotaryNode()
         val node = mockNet.createPartyNode()
         node.internals.registerInitiatedFlow(DummyFlow::class.java)
         node.services.startFlow(FlowStackSnapshotSerializationTestingFlow()).resultFuture.get()

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

@@ -341,10 +341,8 @@ class MockNetwork(defaultParameters: MockNetworkParameters = MockNetworkParamete
     }
 
     @JvmOverloads
-    fun createNotaryNode(legalName: CordaX500Name = DUMMY_NOTARY.name, validating: Boolean = true): StartedNode<MockNode> {
+    fun createNotaryNode(parameters: MockNodeParameters = MockNodeParameters(legalName = DUMMY_NOTARY.name), validating: Boolean = true): StartedNode<MockNode> {
-        return createNode(MockNodeParameters(legalName = legalName, configOverrides = {
+        return createNotaryNode(parameters, validating, defaultFactory)
-            doReturn(NotaryConfig(validating)).whenever(it).notary
-        }))
     }
 
     fun <N : MockNode> createNotaryNode(parameters: MockNodeParameters = MockNodeParameters(legalName = DUMMY_NOTARY.name),