Fixed failing integration tests.

Author: MrMatthewLayton

onixlabs-corda-identity-framework-integration/src/test/kotlin/io/onixlabs/corda/identityframework/integration/AttestationIntegrationTests.kt

@@ -68,13 +68,14 @@ class AttestationIntegrationTests : IntegrationTest() {
         } ?: fail("Failed to find amended attestation.")
 
         // Publish the amended attestation
-        nodeA.attestationService.publishAttestation(
+        val tx = nodeA.attestationService.publishAttestation(
             attestation = amendedAttestation,
             observers = setOf(partyB)
         ).returnValue.getOrThrow()
 
         // Find the published attestation
         listOf(nodeA, nodeB, nodeC).forEach {
+            it.waitForTransaction(tx.id)
             it.rpc.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
                 expression(AttestationSchema.AttestationEntity::pointerStateRef equalTo issuedClaim.ref.toString())
             } ?: fail("Failed to find published attestation.")

onixlabs-corda-identity-framework-integration/src/test/kotlin/io/onixlabs/corda/identityframework/integration/ClaimIntegrationTests.kt

@@ -53,13 +53,14 @@ class ClaimIntegrationTests : IntegrationTest() {
         } ?: fail("Failed to find amended claim.")
 
         // Publish the amended claim
-        nodeA.claimService.publishClaim(
+        val tx = nodeA.claimService.publishClaim(
             claim = amendedClaim,
             observers = setOf(partyB, partyC)
         ).returnValue.getOrThrow()
 
         // Find the published claim
         listOf(nodeA, nodeB, nodeC).forEach {
+            it.waitForTransaction(tx.id)
             it.rpc.vaultServiceFor<CordaClaim<String>>().singleOrNull {
                 linearIds(ID)
             } ?: fail("Failed to find sent claim.")

onixlabs-corda-identity-framework-integration/src/test/kotlin/io/onixlabs/corda/identityframework/integration/Extensions.NodeHandle.kt

@@ -16,7 +16,20 @@
 
 package io.onixlabs.corda.identityframework.integration
 
+import net.corda.core.crypto.SecureHash
 import net.corda.testing.driver.NodeHandle
 
 val NodeHandle.claimService: ClaimService get() = ClaimService(rpc)
-val NodeHandle.attestationService: AttestationService get() = AttestationService(rpc)
+val NodeHandle.attestationService: AttestationService get() = AttestationService(rpc)
+
+/**
+ * Sometimes, integration tests cause race conditions, whereby a vault query begins executing before the database
+ * has persisted new states, thus causing the tests to fail. This function, albeit hacky ensures that a transaction
+ * has been recorded before performing vault queries, thus reducing the likeliness of a test failure due to a race
+ * condition.
+ */
+fun NodeHandle.waitForTransaction(id: SecureHash, millisecondsToSleep: Long = 100) {
+    while (id !in rpc.stateMachineRecordedTransactionMappingSnapshot().map { it.transactionId }) {
+        Thread.sleep(millisecondsToSleep)
+    }
+}