Some cleanup after network map removal (#2006)

node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt

@@ -17,7 +17,6 @@ import net.corda.core.utilities.unwrap
 import net.corda.node.internal.Node
 import net.corda.node.internal.StartedNode
 import net.corda.nodeapi.ArtemisMessagingComponent.Companion.INTERNAL_PREFIX
-import net.corda.nodeapi.ArtemisMessagingComponent.Companion.NETWORK_MAP_QUEUE
 import net.corda.nodeapi.ArtemisMessagingComponent.Companion.NOTIFICATIONS_ADDRESS
 import net.corda.nodeapi.ArtemisMessagingComponent.Companion.P2P_QUEUE
 import net.corda.nodeapi.ArtemisMessagingComponent.Companion.PEERS_PREFIX
@@ -97,16 +96,6 @@ abstract class MQSecurityTest : NodeBasedTest() {
         assertAllQueueCreationAttacksFail(invalidPeerQueue)
     }
 
-    @Test
-    fun `consume message from network map queue`() {
-        assertConsumeAttackFails(NETWORK_MAP_QUEUE)
-    }
-
-    @Test
-    fun `send message to network map address`() {
-        assertSendAttackFails(NETWORK_MAP_QUEUE)
-    }
-
     @Test
     fun `consume message from RPC requests queue`() {
         assertConsumeAttackFails(RPCApi.RPC_SERVER_QUEUE_NAME)

node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt

@@ -183,7 +183,6 @@ class ArtemisMessagingServer(override val config: NodeConfiguration,
         // by having its password be an unknown securely random 128-bit value.
         clusterPassword = BigInteger(128, newSecureRandom()).toString(16)
         queueConfigurations = listOf(
-                queueConfig(NETWORK_MAP_QUEUE, durable = true),
                 queueConfig(P2P_QUEUE, durable = true),
                 // Create an RPC queue: this will service locally connected clients only (not via a bridge) and those
                 // clients must have authenticated. We could use a single consumer for everything and perhaps we should,

node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt

@@ -608,7 +608,7 @@ class TwoPartyTradeFlowTests(private val anonymous: Boolean) {
             notaryNode: StartedNode<*>,
             vararg extraSigningNodes: StartedNode<*>): Map<SecureHash, SignedTransaction> {
 
-        val notaryParty = notaryNode.info.legalIdentities[0]
+        val notaryParty = node.services.getDefaultNotary()
         val signed = wtxToSign.map {
             val id = it.id
             val sigs = mutableListOf<TransactionSignature>()