Skip to content

Commit 230fd01

Browse files
MrMatthewLaytonMrMatthewLayton
committed
Updates to align with ONIXLabs Corda Core API constituting version 2.
1 parent 06e6363 commit 230fd01

File tree

12 files changed

+88
-129
lines changed

12 files changed

+88
-129
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class AttestationIntegrationTests : IntegrationTest() {
5252

5353
// Find the issued attestation
5454
val issuedAttestation = nodeC.rpc.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
55-
where(AttestationSchema.AttestationEntity::pointerStateRef equalTo issuedClaim.ref.toString())
55+
expression(AttestationSchema.AttestationEntity::pointerStateRef equalTo issuedClaim.ref.toString())
5656
} ?: fail("Failed to find issued attestation.")
5757

5858
// Amend the issued attestation
@@ -64,7 +64,7 @@ class AttestationIntegrationTests : IntegrationTest() {
6464

6565
// Find the amended attestation
6666
val amendedAttestation = nodeC.rpc.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
67-
where(AttestationSchema.AttestationEntity::pointerStateRef equalTo issuedClaim.ref.toString())
67+
expression(AttestationSchema.AttestationEntity::pointerStateRef equalTo issuedClaim.ref.toString())
6868
} ?: fail("Failed to find amended attestation.")
6969

7070
// Publish the amended attestation
@@ -76,7 +76,7 @@ class AttestationIntegrationTests : IntegrationTest() {
7676
// Find the published attestation
7777
listOf(nodeA, nodeB, nodeC).forEach {
7878
it.rpc.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
79-
where(AttestationSchema.AttestationEntity::pointerStateRef equalTo issuedClaim.ref.toString())
79+
expression(AttestationSchema.AttestationEntity::pointerStateRef equalTo issuedClaim.ref.toString())
8080
} ?: fail("Failed to find published attestation.")
8181
}
8282

‎onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/Extensions.FlowLogic.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fun FlowLogic<*>.checkHasAttestedStateBeenWitnessed(attestation: Attestation<*>)
5454
@Suspendable
5555
fun FlowLogic<*>.checkClaimExists(claim: CordaClaim<*>) {
5656
val claimExists = serviceHub.vaultServiceFor(claim.javaClass).any {
57-
where(CordaClaimSchema.CordaClaimEntity::hash equalTo claim.hash.toString())
57+
expression(CordaClaimSchema.CordaClaimEntity::hash equalTo claim.hash.toString())
5858
}
5959

6060
if (claimExists) {
@@ -71,7 +71,7 @@ fun FlowLogic<*>.checkClaimExists(claim: CordaClaim<*>) {
7171
@Suspendable
7272
fun FlowLogic<*>.checkAttestationExists(attestation: Attestation<*>) {
7373
val attestationExists = serviceHub.vaultServiceFor(attestation.javaClass).any {
74-
where(AttestationSchema.AttestationEntity::hash equalTo attestation.hash.toString())
74+
expression(AttestationSchema.AttestationEntity::hash equalTo attestation.hash.toString())
7575
}
7676

7777
if (attestationExists) {

‎onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/Extensions.QueryDsl.kt

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎onixlabs-corda-identity-framework-workflow/src/test/kotlin/io/onixlabs/corda/identityframework/workflow/attestation/FindAttestationFlowTests.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package io.onixlabs.corda.identityframework.workflow.attestation
1818

1919
import io.onixlabs.corda.core.services.equalTo
20+
import io.onixlabs.corda.core.services.isNull
2021
import io.onixlabs.corda.core.services.singleOrNull
2122
import io.onixlabs.corda.core.services.vaultServiceFor
2223
import io.onixlabs.corda.identityframework.contract.*
@@ -68,7 +69,7 @@ class FindAttestationFlowTests : FlowTest() {
6869
listOf(nodeA, nodeB, nodeC).forEach {
6970
val result = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
7071
stateStatus(Vault.StateStatus.UNCONSUMED)
71-
where(AttestationEntity::externalId equalTo attestation.state.data.linearId.externalId)
72+
expression(AttestationEntity::externalId.isNull())
7273
}
7374

7475
assertEquals(attestation, result)
@@ -80,7 +81,7 @@ class FindAttestationFlowTests : FlowTest() {
8081
listOf(nodeA, nodeB, nodeC).forEach {
8182
val result = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
8283
stateStatus(Vault.StateStatus.UNCONSUMED)
83-
where(AttestationEntity::attestor equalTo attestation.state.data.attestor)
84+
expression(AttestationEntity::attestor equalTo attestation.state.data.attestor)
8485
}
8586

8687
assertEquals(attestation, result)
@@ -92,7 +93,7 @@ class FindAttestationFlowTests : FlowTest() {
9293
listOf(nodeA, nodeB, nodeC).forEach {
9394
val result = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
9495
stateStatus(Vault.StateStatus.UNCONSUMED)
95-
where(AttestationEntity::pointerStateRef equalTo claim.ref.toString())
96+
expression(AttestationEntity::pointerStateRef equalTo claim.ref.toString())
9697
}
9798

9899
assertEquals(attestation, result)
@@ -104,7 +105,7 @@ class FindAttestationFlowTests : FlowTest() {
104105
listOf(nodeA, nodeB, nodeC).forEach {
105106
val result = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
106107
stateStatus(Vault.StateStatus.UNCONSUMED)
107-
where(AttestationEntity::pointerStateLinearId equalTo claim.state.data.linearId.id)
108+
expression(AttestationEntity::pointerStateLinearId equalTo claim.state.data.linearId.id)
108109
}
109110

110111
assertEquals(attestation, result)
@@ -116,7 +117,7 @@ class FindAttestationFlowTests : FlowTest() {
116117
listOf(nodeA, nodeB, nodeC).forEach {
117118
val result = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
118119
stateStatus(Vault.StateStatus.UNCONSUMED)
119-
where(AttestationEntity::pointerHash equalTo attestation.state.data.pointer.hash.toString())
120+
expression(AttestationEntity::pointerHash equalTo attestation.state.data.pointer.hash.toString())
120121
}
121122

122123
assertEquals(attestation, result)
@@ -128,7 +129,7 @@ class FindAttestationFlowTests : FlowTest() {
128129
listOf(nodeA, nodeB, nodeC).forEach {
129130
val result = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
130131
stateStatus(Vault.StateStatus.UNCONSUMED)
131-
where(AttestationEntity::status equalTo attestation.state.data.status)
132+
expression(AttestationEntity::status equalTo attestation.state.data.status)
132133
}
133134

134135
assertEquals(attestation, result)
@@ -140,7 +141,7 @@ class FindAttestationFlowTests : FlowTest() {
140141
listOf(nodeA, nodeB, nodeC).forEach {
141142
val result = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
142143
stateStatus(Vault.StateStatus.UNCONSUMED)
143-
where(AttestationEntity::previousStateRef equalTo attestation.state.data.previousStateRef?.toString())
144+
expression(AttestationEntity::previousStateRef equalTo attestation.state.data.previousStateRef?.toString())
144145
}
145146

146147
assertEquals(attestation, result)
@@ -152,7 +153,7 @@ class FindAttestationFlowTests : FlowTest() {
152153
listOf(nodeA, nodeB, nodeC).forEach {
153154
val result = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().singleOrNull {
154155
stateStatus(Vault.StateStatus.UNCONSUMED)
155-
where(AttestationEntity::hash equalTo attestation.state.data.hash.toString())
156+
expression(AttestationEntity::hash equalTo attestation.state.data.hash.toString())
156157
}
157158

158159
assertEquals(attestation, result)

‎onixlabs-corda-identity-framework-workflow/src/test/kotlin/io/onixlabs/corda/identityframework/workflow/attestation/FindAttestationsFlowTests.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class FindAttestationsFlowTests : FlowTest() {
7979
listOf(nodeA, nodeB, nodeC).forEach {
8080
val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
8181
stateStatus(Vault.StateStatus.ALL)
82-
where(AttestationEntity::externalId equalTo attestation.state.data.linearId.externalId)
82+
expression(AttestationEntity::externalId equalTo attestation.state.data.linearId.externalId)
8383
}
8484

8585
assertEquals(3, results.count())
@@ -91,7 +91,7 @@ class FindAttestationsFlowTests : FlowTest() {
9191
listOf(nodeA, nodeB, nodeC).forEach {
9292
val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
9393
stateStatus(Vault.StateStatus.ALL)
94-
where(AttestationEntity::attestor equalTo attestation.state.data.attestor)
94+
expression(AttestationEntity::attestor equalTo attestation.state.data.attestor)
9595
}
9696

9797
assertEquals(3, results.count())
@@ -103,7 +103,7 @@ class FindAttestationsFlowTests : FlowTest() {
103103
listOf(nodeA, nodeB, nodeC).forEach {
104104
val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
105105
stateStatus(Vault.StateStatus.ALL)
106-
where(AttestationEntity::pointerStateRef equalTo claim.ref.toString())
106+
expression(AttestationEntity::pointerStateRef equalTo claim.ref.toString())
107107
}
108108

109109
assertEquals(3, results.count())
@@ -115,7 +115,7 @@ class FindAttestationsFlowTests : FlowTest() {
115115
listOf(nodeA, nodeB, nodeC).forEach {
116116
val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
117117
stateStatus(Vault.StateStatus.ALL)
118-
where(AttestationEntity::pointerStateLinearId equalTo claim.state.data.linearId.id)
118+
expression(AttestationEntity::pointerStateLinearId equalTo claim.state.data.linearId.id)
119119
}
120120

121121
assertEquals(3, results.count())
@@ -127,7 +127,7 @@ class FindAttestationsFlowTests : FlowTest() {
127127
listOf(nodeA, nodeB, nodeC).forEach {
128128
val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
129129
stateStatus(Vault.StateStatus.ALL)
130-
where(AttestationEntity::pointerHash equalTo attestation.state.data.pointer.hash.toString())
130+
expression(AttestationEntity::pointerHash equalTo attestation.state.data.pointer.hash.toString())
131131
}
132132

133133
assertEquals(3, results.count())
@@ -139,7 +139,7 @@ class FindAttestationsFlowTests : FlowTest() {
139139
listOf(nodeA, nodeB, nodeC).forEach {
140140
val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
141141
stateStatus(Vault.StateStatus.ALL)
142-
where(AttestationEntity::status equalTo AttestationStatus.ACCEPTED)
142+
expression(AttestationEntity::status equalTo AttestationStatus.ACCEPTED)
143143
}
144144

145145
assertEquals(2, results.count())
@@ -151,7 +151,7 @@ class FindAttestationsFlowTests : FlowTest() {
151151
listOf(nodeA, nodeB, nodeC).forEach {
152152
val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
153153
stateStatus(Vault.StateStatus.ALL)
154-
where(AttestationEntity::status equalTo AttestationStatus.REJECTED)
154+
expression(AttestationEntity::status equalTo AttestationStatus.REJECTED)
155155
}
156156

157157
assertEquals(1, results.count())
@@ -163,7 +163,7 @@ class FindAttestationsFlowTests : FlowTest() {
163163
listOf(nodeA, nodeB, nodeC).forEach {
164164
val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
165165
stateStatus(Vault.StateStatus.ALL)
166-
where(AttestationEntity::previousStateRef equalTo attestation.state.data.previousStateRef?.toString())
166+
expression(AttestationEntity::previousStateRef equalTo attestation.state.data.previousStateRef?.toString())
167167
}
168168

169169
assertEquals(1, results.count())
@@ -175,7 +175,7 @@ class FindAttestationsFlowTests : FlowTest() {
175175
listOf(nodeA, nodeB, nodeC).forEach {
176176
val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
177177
stateStatus(Vault.StateStatus.ALL)
178-
where(AttestationEntity::hash equalTo attestation.state.data.hash.toString())
178+
expression(AttestationEntity::hash equalTo attestation.state.data.hash.toString())
179179
}
180180

181181
assertEquals(1, results.count())

‎onixlabs-corda-identity-framework-workflow/src/test/kotlin/io/onixlabs/corda/identityframework/workflow/claims/FindClaimFlowTests.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class FindClaimFlowTests : FlowTest() {
6767
listOf(nodeA, nodeB, nodeC).forEach {
6868
val result = it.services.vaultServiceFor<CordaClaim<String>>().singleOrNull {
6969
stateStatus(Vault.StateStatus.UNCONSUMED)
70-
where(CordaClaimEntity::externalId equalTo claim.state.data.linearId.externalId)
70+
expression(CordaClaimEntity::externalId equalTo claim.state.data.linearId.externalId)
7171
}
7272

7373
assertEquals(claim, result)
@@ -79,7 +79,7 @@ class FindClaimFlowTests : FlowTest() {
7979
listOf(nodeA, nodeB, nodeC).forEach {
8080
val result = it.services.vaultServiceFor<CordaClaim<String>>().singleOrNull {
8181
stateStatus(Vault.StateStatus.UNCONSUMED)
82-
where(CordaClaimEntity::issuer equalTo claim.state.data.issuer)
82+
expression(CordaClaimEntity::issuer equalTo claim.state.data.issuer)
8383
}
8484

8585
assertEquals(claim, result)
@@ -91,7 +91,7 @@ class FindClaimFlowTests : FlowTest() {
9191
listOf(nodeA, nodeB, nodeC).forEach {
9292
val result = it.services.vaultServiceFor<CordaClaim<String>>().singleOrNull {
9393
stateStatus(Vault.StateStatus.UNCONSUMED)
94-
where(CordaClaimEntity::holder equalTo claim.state.data.holder)
94+
expression(CordaClaimEntity::holder equalTo claim.state.data.holder)
9595
}
9696

9797
assertEquals(claim, result)
@@ -103,7 +103,7 @@ class FindClaimFlowTests : FlowTest() {
103103
listOf(nodeA, nodeB, nodeC).forEach {
104104
val result = it.services.vaultServiceFor<CordaClaim<String>>().singleOrNull {
105105
stateStatus(Vault.StateStatus.UNCONSUMED)
106-
where(CordaClaimEntity::property equalTo claim.state.data.property)
106+
expression(CordaClaimEntity::property equalTo claim.state.data.property)
107107
}
108108

109109
assertEquals(claim, result)
@@ -115,7 +115,7 @@ class FindClaimFlowTests : FlowTest() {
115115
listOf(nodeA, nodeB, nodeC).forEach {
116116
val result = it.services.vaultServiceFor<CordaClaim<String>>().singleOrNull {
117117
stateStatus(Vault.StateStatus.UNCONSUMED)
118-
where(CordaClaimEntity::value equalTo claim.state.data.value)
118+
expression(CordaClaimEntity::value equalTo claim.state.data.value)
119119
}
120120

121121
assertEquals(claim, result)
@@ -127,7 +127,7 @@ class FindClaimFlowTests : FlowTest() {
127127
listOf(nodeA, nodeB, nodeC).forEach {
128128
val result = it.services.vaultServiceFor<CordaClaim<String>>().singleOrNull {
129129
stateStatus(Vault.StateStatus.UNCONSUMED)
130-
where(CordaClaimEntity::previousStateRef equalTo claim.state.data.previousStateRef.toString())
130+
expression(CordaClaimEntity::previousStateRef equalTo claim.state.data.previousStateRef.toString())
131131
}
132132

133133
assertEquals(claim, result)
@@ -139,7 +139,7 @@ class FindClaimFlowTests : FlowTest() {
139139
listOf(nodeA, nodeB, nodeC).forEach {
140140
val result = it.services.vaultServiceFor<CordaClaim<String>>().singleOrNull {
141141
stateStatus(Vault.StateStatus.UNCONSUMED)
142-
where(CordaClaimEntity::isSelfIssued equalTo claim.state.data.isSelfIssued)
142+
expression(CordaClaimEntity::isSelfIssued equalTo claim.state.data.isSelfIssued)
143143
}
144144

145145
assertEquals(claim, result)
@@ -151,7 +151,7 @@ class FindClaimFlowTests : FlowTest() {
151151
listOf(nodeA, nodeB, nodeC).forEach {
152152
val result = it.services.vaultServiceFor<CordaClaim<String>>().singleOrNull {
153153
stateStatus(Vault.StateStatus.UNCONSUMED)
154-
where(CordaClaimEntity::hash equalTo claim.state.data.hash.toString())
154+
expression(CordaClaimEntity::hash equalTo claim.state.data.hash.toString())
155155
}
156156

157157
assertEquals(claim, result)

0 commit comments

Comments
 (0)