ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-23 01:19:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed a few instances of waitUntilNetworkReady() to fix flaky tests. (#1785)

Browse Source
This commit is contained in:
Clinton
2017-10-03 14:31:36 +01:00
committed by Viktor Kolomeyko
parent 4fa63d07dd
commit e6e3c29d74
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
View File

@ -129,7 +129,7 @@ class AttachmentLoadingTests : TestDependencyInjectionBase() {
startNode(providedName = bankBName, rpcUsers = listOf(adminUser)), startNode(providedName = bankBName, rpcUsers = listOf(adminUser)),
startNode(providedName = notaryName, rpcUsers = listOf(adminUser), advertisedServices = setOf(ServiceInfo(SimpleNotaryService.type))) startNode(providedName = notaryName, rpcUsers = listOf(adminUser), advertisedServices = setOf(ServiceInfo(SimpleNotaryService.type)))
).transpose().getOrThrow() // Wait for all nodes to start up. ).transpose().getOrThrow() // Wait for all nodes to start up.
nodes.forEach { it.rpc.waitUntilNetworkReady() } nodes.forEach { it.rpc.waitUntilNetworkReady().getOrThrow() }
return nodes return nodes
} }
} }

4
samples/bank-of-corda-demo/src/integration-test/kotlin/net/corda/bank/BankOfCordaRPCClientTest.kt
View File

@ -33,8 +33,8 @@ class BankOfCordaRPCClientTest {
// Big Corporation RPC Client // Big Corporation RPC Client
val bigCorpClient = nodeBigCorporation.rpcClientToNode() val bigCorpClient = nodeBigCorporation.rpcClientToNode()
val bigCorpProxy = bigCorpClient.start("bigCorpCFO", "password2").proxy val bigCorpProxy = bigCorpClient.start("bigCorpCFO", "password2").proxy
bocProxy.waitUntilNetworkReady() bocProxy.waitUntilNetworkReady().getOrThrow()
bigCorpProxy.waitUntilNetworkReady() bigCorpProxy.waitUntilNetworkReady().getOrThrow()
// Register for Bank of Corda Vault updates // Register for Bank of Corda Vault updates
val criteria = QueryCriteria.VaultQueryCriteria(status = Vault.StateStatus.ALL) val criteria = QueryCriteria.VaultQueryCriteria(status = Vault.StateStatus.ALL)

2
samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/api/BankOfCordaClientApi.kt
View File

@ -36,7 +36,7 @@ class BankOfCordaClientApi(val hostAndPort: NetworkHostAndPort) {
// TODO: privileged security controls required // TODO: privileged security controls required
client.start("bankUser", "test").use { connection -> client.start("bankUser", "test").use { connection ->
val rpc = connection.proxy val rpc = connection.proxy
rpc.waitUntilNetworkReady() rpc.waitUntilNetworkReady().getOrThrow()
// Resolve parties via RPC // Resolve parties via RPC
val issueToParty = rpc.wellKnownPartyFromX500Name(params.issueToPartyName) val issueToParty = rpc.wellKnownPartyFromX500Name(params.issueToPartyName)

7
tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
View File

@ -132,10 +132,9 @@ class ExplorerSimulation(val options: OptionSet) {
issuerNodeGBP.nodeInfo.legalIdentities.first() to issuerRPCGBP, issuerNodeGBP.nodeInfo.legalIdentities.first() to issuerRPCGBP,
issuerNodeUSD.nodeInfo.legalIdentities.first() to issuerRPCUSD)) issuerNodeUSD.nodeInfo.legalIdentities.first() to issuerRPCUSD))
aliceRPC.waitUntilNetworkReady() listOf(aliceRPC, bobRPC, issuerRPCGBP, issuerRPCUSD).map {
bobRPC.waitUntilNetworkReady() it.waitUntilNetworkReady().getOrThrow()
issuerRPCGBP.waitUntilNetworkReady() }
issuerRPCUSD.waitUntilNetworkReady()
} }
private fun startSimulation(eventGenerator: EventGenerator, maxIterations: Int) { private fun startSimulation(eventGenerator: EventGenerator, maxIterations: Int) {