Skip to content

Commit eac0dca

Browse files
MrMatthewLaytonMrMatthewLayton
committed
1.0.0-rc5
1 parent 13bd132 commit eac0dca

File tree

10 files changed

+282
-88
lines changed

10 files changed

+282
-88
lines changed

‎onixlabs-corda-identity-framework-integration/src/main/kotlin/io/onixlabs/corda/identityframework/integration/AttestationQueryService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class AttestationQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
7777
status: AttestationStatus? = null,
7878
timestamp: Instant? = null,
7979
hash: SecureHash? = null,
80-
stateStatus: Vault.StateStatus = Vault.StateStatus.ALL,
80+
stateStatus: Vault.StateStatus = Vault.StateStatus.UNCONSUMED,
8181
relevancyStatus: Vault.RelevancyStatus = Vault.RelevancyStatus.ALL,
8282
pageSpecification: PageSpecification = DEFAULT_PAGE_SPECIFICATION,
8383
flowTimeout: Duration = Duration.ofSeconds(30)
@@ -134,7 +134,7 @@ class AttestationQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
134134
status: AttestationStatus? = null,
135135
timestamp: Instant? = null,
136136
hash: SecureHash? = null,
137-
stateStatus: Vault.StateStatus = Vault.StateStatus.ALL,
137+
stateStatus: Vault.StateStatus = Vault.StateStatus.UNCONSUMED,
138138
relevancyStatus: Vault.RelevancyStatus = Vault.RelevancyStatus.ALL,
139139
pageSpecification: PageSpecification = DEFAULT_PAGE_SPECIFICATION,
140140
flowTimeout: Duration = Duration.ofSeconds(30)

‎onixlabs-corda-identity-framework-integration/src/main/kotlin/io/onixlabs/corda/identityframework/integration/ClaimQueryService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class ClaimQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
6464
timestamp: Instant? = null,
6565
isSelfIssued: Boolean? = null,
6666
hash: SecureHash? = null,
67-
stateStatus: Vault.StateStatus = Vault.StateStatus.ALL,
67+
stateStatus: Vault.StateStatus = Vault.StateStatus.UNCONSUMED,
6868
relevancyStatus: Vault.RelevancyStatus = Vault.RelevancyStatus.ALL,
6969
pageSpecification: PageSpecification = DEFAULT_PAGE_SPECIFICATION,
7070
flowTimeout: Duration = Duration.ofSeconds(30)
@@ -115,7 +115,7 @@ class ClaimQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
115115
timestamp: Instant? = null,
116116
isSelfIssued: Boolean? = null,
117117
hash: SecureHash? = null,
118-
stateStatus: Vault.StateStatus = Vault.StateStatus.ALL,
118+
stateStatus: Vault.StateStatus = Vault.StateStatus.UNCONSUMED,
119119
relevancyStatus: Vault.RelevancyStatus = Vault.RelevancyStatus.ALL,
120120
pageSpecification: PageSpecification = DEFAULT_PAGE_SPECIFICATION,
121121
flowTimeout: Duration = Duration.ofSeconds(30)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class FindAttestationsFlow<T : Attestation<*>>(
7070
status: AttestationStatus? = null,
7171
previousStateRef: StateRef? = null,
7272
hash: SecureHash? = null,
73-
stateStatus: Vault.StateStatus = Vault.StateStatus.ALL,
73+
stateStatus: Vault.StateStatus = Vault.StateStatus.UNCONSUMED,
7474
relevancyStatus: Vault.RelevancyStatus = Vault.RelevancyStatus.ALL,
7575
override val pageSpecification: PageSpecification = DEFAULT_PAGE_SPECIFICATION,
7676
override val sorting: Sort = DEFAULT_SORTING

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class FindClaimsFlow<T : CordaClaim<*>>(
6363
previousStateRef: StateRef? = null,
6464
isSelfIssued: Boolean? = null,
6565
hash: SecureHash? = null,
66-
stateStatus: Vault.StateStatus = Vault.StateStatus.ALL,
66+
stateStatus: Vault.StateStatus = Vault.StateStatus.UNCONSUMED,
6767
relevancyStatus: Vault.RelevancyStatus = Vault.RelevancyStatus.ALL,
6868
override val pageSpecification: PageSpecification = DEFAULT_PAGE_SPECIFICATION,
6969
override val sorting: Sort = DEFAULT_SORTING

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

Lines changed: 73 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import io.onixlabs.corda.identityframework.contract.*
2020
import io.onixlabs.corda.identityframework.workflow.*
2121
import net.corda.core.contracts.StateAndRef
2222
import net.corda.core.contracts.UniqueIdentifier
23+
import net.corda.core.node.services.Vault
2324
import org.junit.jupiter.api.Test
2425
import kotlin.test.assertEquals
2526

@@ -58,7 +59,12 @@ class FindAttestationsFlowTests : FlowTest() {
5859
it.transaction {
5960
Pipeline
6061
.create(network)
61-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(linearId = attestation.state.data.linearId) }
62+
.run(it) {
63+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
64+
linearId = attestation.state.data.linearId,
65+
stateStatus = Vault.StateStatus.ALL
66+
)
67+
}
6268
.finally { assertEquals(3, it.size) }
6369
}
6470
}
@@ -70,7 +76,12 @@ class FindAttestationsFlowTests : FlowTest() {
7076
it.transaction {
7177
Pipeline
7278
.create(network)
73-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(externalId = attestation.state.data.linearId.externalId) }
79+
.run(it) {
80+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
81+
externalId = attestation.state.data.linearId.externalId,
82+
stateStatus = Vault.StateStatus.ALL
83+
)
84+
}
7485
.finally { assertEquals(3, it.size) }
7586
}
7687
}
@@ -82,7 +93,12 @@ class FindAttestationsFlowTests : FlowTest() {
8293
it.transaction {
8394
Pipeline
8495
.create(network)
85-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(attestor = attestation.state.data.attestor) }
96+
.run(it) {
97+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
98+
attestor = attestation.state.data.attestor,
99+
stateStatus = Vault.StateStatus.ALL
100+
)
101+
}
86102
.finally { assertEquals(3, it.size) }
87103
}
88104
}
@@ -94,7 +110,12 @@ class FindAttestationsFlowTests : FlowTest() {
94110
it.transaction {
95111
Pipeline
96112
.create(network)
97-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(pointer = attestation.state.data.pointer) }
113+
.run(it) {
114+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
115+
pointer = attestation.state.data.pointer,
116+
stateStatus = Vault.StateStatus.ALL
117+
)
118+
}
98119
.finally { assertEquals(3, it.size) }
99120
}
100121
}
@@ -106,7 +127,12 @@ class FindAttestationsFlowTests : FlowTest() {
106127
it.transaction {
107128
Pipeline
108129
.create(network)
109-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(pointerStateRef = claim.ref) }
130+
.run(it) {
131+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
132+
pointerStateRef = claim.ref,
133+
stateStatus = Vault.StateStatus.ALL
134+
)
135+
}
110136
.finally { assertEquals(3, it.size) }
111137
}
112138
}
@@ -118,7 +144,12 @@ class FindAttestationsFlowTests : FlowTest() {
118144
it.transaction {
119145
Pipeline
120146
.create(network)
121-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(pointerStateClass = claim.state.data.javaClass) }
147+
.run(it) {
148+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
149+
pointerStateClass = claim.state.data.javaClass,
150+
stateStatus = Vault.StateStatus.ALL
151+
)
152+
}
122153
.finally { assertEquals(3, it.size) }
123154
}
124155
}
@@ -130,7 +161,12 @@ class FindAttestationsFlowTests : FlowTest() {
130161
it.transaction {
131162
Pipeline
132163
.create(network)
133-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(pointerStateLinearId = claim.state.data.linearId) }
164+
.run(it) {
165+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
166+
pointerStateLinearId = claim.state.data.linearId,
167+
stateStatus = Vault.StateStatus.ALL
168+
)
169+
}
134170
.finally { assertEquals(3, it.size) }
135171
}
136172
}
@@ -142,7 +178,12 @@ class FindAttestationsFlowTests : FlowTest() {
142178
it.transaction {
143179
Pipeline
144180
.create(network)
145-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(pointerHash = attestation.state.data.pointer.hash) }
181+
.run(it) {
182+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
183+
pointerHash = attestation.state.data.pointer.hash,
184+
stateStatus = Vault.StateStatus.ALL
185+
)
186+
}
146187
.finally { assertEquals(3, it.size) }
147188
}
148189
}
@@ -154,7 +195,12 @@ class FindAttestationsFlowTests : FlowTest() {
154195
it.transaction {
155196
Pipeline
156197
.create(network)
157-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(status = AttestationStatus.ACCEPTED) }
198+
.run(it) {
199+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
200+
status = AttestationStatus.ACCEPTED,
201+
stateStatus = Vault.StateStatus.ALL
202+
)
203+
}
158204
.finally { assertEquals(2, it.size) }
159205
}
160206
}
@@ -166,7 +212,12 @@ class FindAttestationsFlowTests : FlowTest() {
166212
it.transaction {
167213
Pipeline
168214
.create(network)
169-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(status = AttestationStatus.REJECTED) }
215+
.run(it) {
216+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
217+
status = AttestationStatus.REJECTED,
218+
stateStatus = Vault.StateStatus.ALL
219+
)
220+
}
170221
.finally { assertEquals(1, it.size) }
171222
}
172223
}
@@ -178,7 +229,12 @@ class FindAttestationsFlowTests : FlowTest() {
178229
it.transaction {
179230
Pipeline
180231
.create(network)
181-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(previousStateRef = attestation.state.data.previousStateRef) }
232+
.run(it) {
233+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
234+
previousStateRef = attestation.state.data.previousStateRef,
235+
stateStatus = Vault.StateStatus.ALL
236+
)
237+
}
182238
.finally { assertEquals(1, it.size) }
183239
}
184240
}
@@ -190,7 +246,12 @@ class FindAttestationsFlowTests : FlowTest() {
190246
it.transaction {
191247
Pipeline
192248
.create(network)
193-
.run(it) { FindAttestationsFlow<Attestation<CordaClaim<String>>>(hash = attestation.state.data.hash) }
249+
.run(it) {
250+
FindAttestationsFlow<Attestation<CordaClaim<String>>>(
251+
hash = attestation.state.data.hash,
252+
stateStatus = Vault.StateStatus.ALL
253+
)
254+
}
194255
.finally { assertEquals(1, it.size) }
195256
}
196257
}

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

Lines changed: 55 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import io.onixlabs.corda.identityframework.contract.CordaClaim
2020
import io.onixlabs.corda.identityframework.contract.amend
2121
import io.onixlabs.corda.identityframework.workflow.*
2222
import net.corda.core.contracts.StateAndRef
23+
import net.corda.core.node.services.Vault
2324
import org.junit.jupiter.api.Test
2425
import java.time.Instant
2526
import kotlin.test.assertEquals
@@ -79,7 +80,12 @@ class FindClaimsFlowTests : FlowTest() {
7980
it.transaction {
8081
Pipeline
8182
.create(network)
82-
.run(it) { FindClaimsFlow<CordaClaim<*>>(linearId = CLAIM_1.linearId) }
83+
.run(it) {
84+
FindClaimsFlow<CordaClaim<*>>(
85+
linearId = CLAIM_1.linearId,
86+
stateStatus = Vault.StateStatus.ALL
87+
)
88+
}
8389
.finally { assertEquals(3, it.size) }
8490
}
8591
}
@@ -91,7 +97,12 @@ class FindClaimsFlowTests : FlowTest() {
9197
it.transaction {
9298
Pipeline
9399
.create(network)
94-
.run(it) { FindClaimsFlow<CordaClaim<*>>(externalId = CLAIM_1.linearId.externalId) }
100+
.run(it) {
101+
FindClaimsFlow<CordaClaim<*>>(
102+
externalId = CLAIM_1.linearId.externalId,
103+
stateStatus = Vault.StateStatus.ALL
104+
)
105+
}
95106
.finally { assertEquals(3, it.size) }
96107
}
97108
}
@@ -103,7 +114,12 @@ class FindClaimsFlowTests : FlowTest() {
103114
it.transaction {
104115
Pipeline
105116
.create(network)
106-
.run(it) { FindClaimsFlow<CordaClaim<*>>(issuer = CLAIM_1.issuer) }
117+
.run(it) {
118+
FindClaimsFlow<CordaClaim<*>>(
119+
issuer = CLAIM_1.issuer,
120+
stateStatus = Vault.StateStatus.ALL
121+
)
122+
}
107123
.finally { assertEquals(3, it.size) }
108124
}
109125
}
@@ -115,7 +131,12 @@ class FindClaimsFlowTests : FlowTest() {
115131
it.transaction {
116132
Pipeline
117133
.create(network)
118-
.run(it) { FindClaimsFlow<CordaClaim<*>>(holder = CLAIM_1.holder) }
134+
.run(it) {
135+
FindClaimsFlow<CordaClaim<*>>(
136+
holder = CLAIM_1.holder,
137+
stateStatus = Vault.StateStatus.ALL
138+
)
139+
}
119140
.finally { assertEquals(6, it.size) }
120141
}
121142
}
@@ -127,7 +148,12 @@ class FindClaimsFlowTests : FlowTest() {
127148
it.transaction {
128149
Pipeline
129150
.create(network)
130-
.run(it) { FindClaimsFlow<CordaClaim<*>>(property = CLAIM_1.property) }
151+
.run(it) {
152+
FindClaimsFlow<CordaClaim<*>>(
153+
property = CLAIM_1.property,
154+
stateStatus = Vault.StateStatus.ALL
155+
)
156+
}
131157
.finally { assertEquals(3, it.size) }
132158
}
133159
}
@@ -139,7 +165,12 @@ class FindClaimsFlowTests : FlowTest() {
139165
it.transaction {
140166
Pipeline
141167
.create(network)
142-
.run(it) { FindClaimsFlow<CordaClaim<*>>(value = CLAIM_1.value) }
168+
.run(it) {
169+
FindClaimsFlow<CordaClaim<*>>(
170+
value = CLAIM_1.value,
171+
stateStatus = Vault.StateStatus.ALL
172+
)
173+
}
143174
.finally { assertEquals(1, it.size) }
144175
}
145176
}
@@ -151,7 +182,12 @@ class FindClaimsFlowTests : FlowTest() {
151182
it.transaction {
152183
Pipeline
153184
.create(network)
154-
.run(it) { FindClaimsFlow<CordaClaim<*>>(previousStateRef = claim.state.data.previousStateRef) }
185+
.run(it) {
186+
FindClaimsFlow<CordaClaim<*>>(
187+
previousStateRef = claim.state.data.previousStateRef,
188+
stateStatus = Vault.StateStatus.ALL
189+
)
190+
}
155191
.finally { assertEquals(1, it.size) }
156192
}
157193
}
@@ -163,7 +199,12 @@ class FindClaimsFlowTests : FlowTest() {
163199
it.transaction {
164200
Pipeline
165201
.create(network)
166-
.run(it) { FindClaimsFlow<CordaClaim<*>>(isSelfIssued = true) }
202+
.run(it) {
203+
FindClaimsFlow<CordaClaim<*>>(
204+
isSelfIssued = true,
205+
stateStatus = Vault.StateStatus.ALL
206+
)
207+
}
167208
.finally { assertEquals(6, it.size) }
168209
}
169210
}
@@ -175,7 +216,12 @@ class FindClaimsFlowTests : FlowTest() {
175216
it.transaction {
176217
Pipeline
177218
.create(network)
178-
.run(it) { FindClaimsFlow<CordaClaim<*>>(hash = CLAIM_1.hash) }
219+
.run(it) {
220+
FindClaimsFlow<CordaClaim<*>>(
221+
hash = CLAIM_1.hash,
222+
stateStatus = Vault.StateStatus.ALL
223+
)
224+
}
179225
.finally { assertEquals(1, it.size) }
180226
}
181227
}

0 commit comments

Comments
 (0)