From 9be37c2b88ca3f0a55ef2de8e81dd43fe0e7aa76 Mon Sep 17 00:00:00 2001 From: Alberto Arri <30873160+al-r3@users.noreply.github.com> Date: Fri, 3 Nov 2017 14:27:46 +0000 Subject: [PATCH] Remove useless call to waitUntilNetworkReady within driver started nodes (#1998) Remove usages of waitUntilNetworkReady in conjunction with driver --- .../kotlin/net/corda/docs/IntegrationTestingTutorial.kt | 8 ++------ .../src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt | 4 +--- .../net/corda/node/services/AttachmentLoadingTests.kt | 1 - .../kotlin/net/corda/bank/BankOfCordaRPCClientTest.kt | 5 +---- .../src/main/kotlin/net/corda/testing/driver/Driver.kt | 2 +- .../main/kotlin/net/corda/explorer/ExplorerSimulation.kt | 4 ---- 6 files changed, 5 insertions(+), 19 deletions(-) diff --git a/docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt b/docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt index be3ab27dc4..c9be1c2353 100644 --- a/docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt +++ b/docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt @@ -11,8 +11,8 @@ import net.corda.finance.DOLLARS import net.corda.finance.contracts.asset.Cash import net.corda.finance.flows.CashIssueFlow import net.corda.finance.flows.CashPaymentFlow -import net.corda.node.services.Permissions.Companion.startFlow import net.corda.node.services.Permissions.Companion.invokeRpc +import net.corda.node.services.Permissions.Companion.startFlow import net.corda.nodeapi.User import net.corda.testing.* import net.corda.testing.driver.driver @@ -28,14 +28,12 @@ class IntegrationTestingTutorial { val aliceUser = User("aliceUser", "testPassword1", permissions = setOf( startFlow(), startFlow(), - invokeRpc(CordaRPCOps::waitUntilNetworkReady), invokeRpc("vaultTrackBy"), invokeRpc(CordaRPCOps::notaryIdentities), invokeRpc(CordaRPCOps::networkMapFeed) )) val bobUser = User("bobUser", "testPassword2", permissions = setOf( startFlow(), - invokeRpc(CordaRPCOps::waitUntilNetworkReady), invokeRpc("vaultTrackBy"), invokeRpc(CordaRPCOps::networkMapFeed) )) @@ -44,6 +42,7 @@ class IntegrationTestingTutorial { startNode(providedName = ALICE.name, rpcUsers = listOf(aliceUser)), startNode(providedName = BOB.name, rpcUsers = listOf(bobUser)) ).transpose().getOrThrow() + // END 1 // START 2 @@ -52,9 +51,6 @@ class IntegrationTestingTutorial { val bobClient = bob.rpcClientToNode() val bobProxy = bobClient.start("bobUser", "testPassword2").proxy - - aliceProxy.waitUntilNetworkReady().getOrThrow() - bobProxy.waitUntilNetworkReady().getOrThrow() // END 2 // START 3 diff --git a/docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt b/docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt index 1cfb712ec8..b391d4cab7 100644 --- a/docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt +++ b/docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt @@ -8,14 +8,13 @@ import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.SerializationWhitelist import net.corda.core.transactions.SignedTransaction import net.corda.core.utilities.OpaqueBytes -import net.corda.core.utilities.getOrThrow import net.corda.finance.USD import net.corda.finance.contracts.asset.Cash import net.corda.finance.flows.CashExitFlow import net.corda.finance.flows.CashIssueFlow import net.corda.finance.flows.CashPaymentFlow -import net.corda.node.services.Permissions.Companion.startFlow import net.corda.node.services.Permissions.Companion.invokeRpc +import net.corda.node.services.Permissions.Companion.startFlow import net.corda.nodeapi.User import net.corda.testing.ALICE import net.corda.testing.DUMMY_NOTARY @@ -56,7 +55,6 @@ fun main(args: Array) { // START 2 val client = node.rpcClientToNode() val proxy = client.start("user", "password").proxy - proxy.waitUntilNetworkReady().getOrThrow() thread { generateTransactions(proxy) diff --git a/node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt b/node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt index 9f6ad6a4d3..738cd7488e 100644 --- a/node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt @@ -68,7 +68,6 @@ class AttachmentLoadingTests { startNode(providedName = bankAName, rpcUsers = listOf(adminUser)), startNode(providedName = bankBName, rpcUsers = listOf(adminUser)) ).transpose().getOrThrow() // Wait for all nodes to start up. - nodes.forEach { it.rpc.waitUntilNetworkReady().getOrThrow() } return nodes } diff --git a/samples/bank-of-corda-demo/src/integration-test/kotlin/net/corda/bank/BankOfCordaRPCClientTest.kt b/samples/bank-of-corda-demo/src/integration-test/kotlin/net/corda/bank/BankOfCordaRPCClientTest.kt index 0b77d4c865..c1a9d461fd 100644 --- a/samples/bank-of-corda-demo/src/integration-test/kotlin/net/corda/bank/BankOfCordaRPCClientTest.kt +++ b/samples/bank-of-corda-demo/src/integration-test/kotlin/net/corda/bank/BankOfCordaRPCClientTest.kt @@ -8,8 +8,8 @@ import net.corda.core.utilities.getOrThrow import net.corda.finance.DOLLARS import net.corda.finance.contracts.asset.Cash import net.corda.finance.flows.CashIssueAndPaymentFlow -import net.corda.node.services.Permissions.Companion.startFlow import net.corda.node.services.Permissions.Companion.invokeRpc +import net.corda.node.services.Permissions.Companion.startFlow import net.corda.nodeapi.User import net.corda.testing.* import net.corda.testing.driver.driver @@ -20,7 +20,6 @@ class BankOfCordaRPCClientTest { fun `issuer flow via RPC`() { val commonPermissions = setOf( invokeRpc("vaultTrackByCriteria"), - invokeRpc(CordaRPCOps::waitUntilNetworkReady), invokeRpc(CordaRPCOps::wellKnownPartyFromX500Name), invokeRpc(CordaRPCOps::notaryIdentities) ) @@ -40,8 +39,6 @@ class BankOfCordaRPCClientTest { // Big Corporation RPC Client val bigCorpClient = nodeBigCorporation.rpcClientToNode() val bigCorpProxy = bigCorpClient.start("bigCorpCFO", "password2").proxy - bocProxy.waitUntilNetworkReady().getOrThrow() - bigCorpProxy.waitUntilNetworkReady().getOrThrow() // Register for Bank of Corda Vault updates val criteria = QueryCriteria.VaultQueryCriteria(status = Vault.StateStatus.ALL) diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt index 2183cb8ac7..86f8669777 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt @@ -960,7 +960,7 @@ class DriverDSL( if (process.isAlive) null else process } establishRpc(configuration, processDeathFuture).flatMap { rpc -> - // Call waitUntilNetworkReady in background in case RPC is failing over: + // Check for all nodes to have all other nodes in background in case RPC is failing over: val forked = executorService.fork { allNodesConnected(rpc) } diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt index d1913e2c01..869df2ab64 100644 --- a/tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt +++ b/tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt @@ -127,10 +127,6 @@ class ExplorerSimulation(val options: OptionSet) { bobNode.nodeInfo.legalIdentities.first() to bobRPC, issuerNodeGBP.nodeInfo.legalIdentities.first() to issuerRPCGBP, issuerNodeUSD.nodeInfo.legalIdentities.first() to issuerRPCUSD)) - - listOf(aliceRPC, bobRPC, issuerRPCGBP, issuerRPCUSD).map { - it.waitUntilNetworkReady().getOrThrow() - } } private fun startSimulation(eventGenerator: EventGenerator, maxIterations: Int) {