Skip to content

Commit 7dc5d83

Browse files
MrMatthewLaytonMrMatthewLayton
committed
Amended naming issues found in PR.
1 parent 773375f commit 7dc5d83

File tree

11 files changed

+41
-43
lines changed

11 files changed

+41
-43
lines changed

‎onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Attestation.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import net.corda.core.identity.AbstractParty
2626
import net.corda.core.schemas.MappedSchema
2727
import net.corda.core.schemas.PersistentState
2828
import net.corda.core.schemas.QueryableState
29-
import net.corda.core.serialization.serialize
3029
import java.util.*
3130

3231
/**

‎onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Extensions.Attestation.kt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import net.corda.core.contracts.StateAndRef
3030
* @param metadata Additional information about the attestation.
3131
* @return Returns an amended attestation.
3232
*/
33-
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.amend(
33+
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.amendAttestation(
3434
status: AttestationStatus,
3535
pointer: AttestationPointer<T> = this.state.data.pointer,
3636
metadata: Map<String, String> = emptyMap()
@@ -46,11 +46,11 @@ inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.amend(
4646
* @param metadata Additional information about the attestation.
4747
* @return Returns an amended attestation.
4848
*/
49-
inline fun <reified T : ContractState, reified U : Attestation<T>> StateAndRef<U>.amendStatic(
49+
inline fun <reified T : ContractState, reified U : Attestation<T>> StateAndRef<U>.amendStaticAttestation(
5050
status: AttestationStatus,
5151
stateAndRef: StateAndRef<T>,
5252
metadata: Map<String, String> = emptyMap()
53-
): U = amend(status, stateAndRef.toStaticAttestationPointer(), metadata)
53+
): U = amendAttestation(status, stateAndRef.toStaticAttestationPointer(), metadata)
5454

5555
/**
5656
* Amends an attestation of a [LinearState].
@@ -62,11 +62,11 @@ inline fun <reified T : ContractState, reified U : Attestation<T>> StateAndRef<U
6262
* @param metadata Additional information about the attestation.
6363
* @return Returns an amended attestation.
6464
*/
65-
inline fun <reified T : LinearState, reified U : Attestation<T>> StateAndRef<U>.amendLinear(
65+
inline fun <reified T : LinearState, reified U : Attestation<T>> StateAndRef<U>.amendLinearAttestation(
6666
status: AttestationStatus,
6767
stateAndRef: StateAndRef<T>,
6868
metadata: Map<String, String> = emptyMap()
69-
): U = amend(status, stateAndRef.toLinearAttestationPointer(), metadata)
69+
): U = amendAttestation(status, stateAndRef.toLinearAttestationPointer(), metadata)
7070

7171
/**
7272
* Accepts an attestation.
@@ -77,10 +77,10 @@ inline fun <reified T : LinearState, reified U : Attestation<T>> StateAndRef<U>.
7777
* @param metadata Additional information about the attestation.
7878
* @return Returns an accepted attestation.
7979
*/
80-
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.accept(
80+
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.acceptAttestation(
8181
pointer: AttestationPointer<T> = this.state.data.pointer,
8282
metadata: Map<String, String> = emptyMap()
83-
): U = amend(AttestationStatus.ACCEPTED, pointer, metadata)
83+
): U = amendAttestation(AttestationStatus.ACCEPTED, pointer, metadata)
8484

8585
/**
8686
* Accepts an attestation of a [ContractState].
@@ -91,10 +91,10 @@ inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.accept
9191
* @param metadata Additional information about the attestation.
9292
* @return Returns an accepted attestation.
9393
*/
94-
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.acceptStatic(
94+
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.acceptStaticAttestation(
9595
stateAndRef: StateAndRef<T>,
9696
metadata: Map<String, String> = emptyMap()
97-
): U = amend(AttestationStatus.ACCEPTED, stateAndRef.toStaticAttestationPointer(), metadata)
97+
): U = amendAttestation(AttestationStatus.ACCEPTED, stateAndRef.toStaticAttestationPointer(), metadata)
9898

9999
/**
100100
* Accepts an attestation of a [LinearState].
@@ -105,10 +105,10 @@ inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.accept
105105
* @param metadata Additional information about the attestation.
106106
* @return Returns an accepted attestation.
107107
*/
108-
inline fun <T : LinearState, reified U : Attestation<T>> StateAndRef<U>.acceptLinear(
108+
inline fun <T : LinearState, reified U : Attestation<T>> StateAndRef<U>.acceptLinearAttestation(
109109
stateAndRef: StateAndRef<T>,
110110
metadata: Map<String, String> = emptyMap()
111-
): U = amend(AttestationStatus.ACCEPTED, stateAndRef.toLinearAttestationPointer(), metadata)
111+
): U = amendAttestation(AttestationStatus.ACCEPTED, stateAndRef.toLinearAttestationPointer(), metadata)
112112

113113
/**
114114
* Rejects an attestation.
@@ -119,10 +119,10 @@ inline fun <T : LinearState, reified U : Attestation<T>> StateAndRef<U>.acceptLi
119119
* @param metadata Additional information about the attestation.
120120
* @return Returns an rejected attestation.
121121
*/
122-
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.reject(
122+
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.rejectAttestation(
123123
pointer: AttestationPointer<T> = this.state.data.pointer,
124124
metadata: Map<String, String> = emptyMap()
125-
): U = amend(AttestationStatus.REJECTED, pointer, metadata)
125+
): U = amendAttestation(AttestationStatus.REJECTED, pointer, metadata)
126126

127127
/**
128128
* Rejects an attestation of a [ContractState].
@@ -133,10 +133,10 @@ inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.reject
133133
* @param metadata Additional information about the attestation.
134134
* @return Returns an rejected attestation.
135135
*/
136-
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.rejectStatic(
136+
inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.rejectStaticAttestation(
137137
stateAndRef: StateAndRef<T>,
138138
metadata: Map<String, String> = emptyMap()
139-
): U = amend(AttestationStatus.REJECTED, stateAndRef.toStaticAttestationPointer(), metadata)
139+
): U = amendAttestation(AttestationStatus.REJECTED, stateAndRef.toStaticAttestationPointer(), metadata)
140140

141141
/**
142142
* Rejects an attestation of a [LinearState].
@@ -147,7 +147,7 @@ inline fun <T : ContractState, reified U : Attestation<T>> StateAndRef<U>.reject
147147
* @param metadata Additional information about the attestation.
148148
* @return Returns an rejected attestation.
149149
*/
150-
inline fun <T : LinearState, reified U : Attestation<T>> StateAndRef<U>.rejectLinear(
150+
inline fun <T : LinearState, reified U : Attestation<T>> StateAndRef<U>.rejectLinearAttestation(
151151
stateAndRef: StateAndRef<T>,
152152
metadata: Map<String, String> = emptyMap()
153-
): U = amend(AttestationStatus.REJECTED, stateAndRef.toLinearAttestationPointer(), metadata)
153+
): U = amendAttestation(AttestationStatus.REJECTED, stateAndRef.toLinearAttestationPointer(), metadata)

‎onixlabs-corda-identity-framework-contract/src/test/kotlin/io/onixlabs/corda/identityframework/contract/attestation/AttestationContractAmendCommandTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AttestationContractAmendCommandTests : ContractTest() {
2828
transaction {
2929
val issuedClaim1 = issue(CLAIM_1)
3030
val issuedAttestation1 = issue(issuedClaim1.createAcceptedLinearAttestation(IDENTITY_C.party))
31-
val amendedAttestation1 = issuedAttestation1.reject()
31+
val amendedAttestation1 = issuedAttestation1.rejectAttestation()
3232
input(issuedAttestation1.ref)
3333
output(AttestationContract.ID, amendedAttestation1)
3434
fails()
@@ -45,7 +45,7 @@ class AttestationContractAmendCommandTests : ContractTest() {
4545
val issuedClaim1 = issue(CLAIM_1)
4646
val issuedAttestation1 = issue(issuedClaim1.createAcceptedLinearAttestation(IDENTITY_C.party))
4747
val issuedAttestation2 = issue(issuedClaim1.createAcceptedLinearAttestation(IDENTITY_C.party))
48-
val amendedAttestation1 = issuedAttestation1.reject()
48+
val amendedAttestation1 = issuedAttestation1.rejectAttestation()
4949
input(issuedAttestation1.ref)
5050
input(issuedAttestation2.ref)
5151
output(AttestationContract.ID, amendedAttestation1)
@@ -61,7 +61,7 @@ class AttestationContractAmendCommandTests : ContractTest() {
6161
transaction {
6262
val issuedClaim1 = issue(CLAIM_1)
6363
val issuedAttestation1 = issue(issuedClaim1.createAcceptedLinearAttestation(IDENTITY_C.party))
64-
val amendedAttestation1 = issuedAttestation1.reject()
64+
val amendedAttestation1 = issuedAttestation1.rejectAttestation()
6565
input(issuedAttestation1.ref)
6666
output(AttestationContract.ID, amendedAttestation1)
6767
output(AttestationContract.ID, amendedAttestation1)
@@ -122,7 +122,7 @@ class AttestationContractAmendCommandTests : ContractTest() {
122122
transaction {
123123
val issuedClaim1 = issue(CLAIM_1)
124124
val issuedAttestation1 = issue(issuedClaim1.createAcceptedLinearAttestation(IDENTITY_C.party))
125-
val amendedAttestation1 = issuedAttestation1.reject()
125+
val amendedAttestation1 = issuedAttestation1.rejectAttestation()
126126
input(issuedAttestation1.ref)
127127
output(AttestationContract.ID, amendedAttestation1)
128128
command(keysOf(IDENTITY_B), AttestationContract.Amend)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class AttestationService(rpc: CordaRPCOps) : RPCService(rpc) {
257257
metadata: Map<String, String> = emptyMap(),
258258
observers: Set<Party> = emptySet()
259259
): FlowProgressHandle<SignedTransaction> {
260-
val newAttestation = oldAttestation.amend(status, metadata = metadata)
260+
val newAttestation = oldAttestation.amendAttestation(status, metadata = metadata)
261261
return amendAttestation(oldAttestation, newAttestation, observers)
262262
}
263263

@@ -279,7 +279,7 @@ class AttestationService(rpc: CordaRPCOps) : RPCService(rpc) {
279279
observers: Set<Party> = emptySet(),
280280
clientId: String = UUID.randomUUID().toString()
281281
): FlowHandleWithClientId<SignedTransaction> {
282-
val newAttestation = oldAttestation.amend(status, metadata = metadata)
282+
val newAttestation = oldAttestation.amendAttestation(status, metadata = metadata)
283283
return amendAttestation(oldAttestation, newAttestation, observers, clientId)
284284
}
285285

@@ -302,7 +302,7 @@ class AttestationService(rpc: CordaRPCOps) : RPCService(rpc) {
302302
observers: Set<Party> = emptySet()
303303
): FlowProgressHandle<SignedTransaction> {
304304
val pointer = state.toStaticAttestationPointer()
305-
val newAttestation = oldAttestation.amend(status, pointer, metadata)
305+
val newAttestation = oldAttestation.amendAttestation(status, pointer, metadata)
306306
return amendAttestation(oldAttestation, newAttestation, observers)
307307
}
308308

@@ -325,7 +325,7 @@ class AttestationService(rpc: CordaRPCOps) : RPCService(rpc) {
325325
observers: Set<Party> = emptySet()
326326
): FlowProgressHandle<SignedTransaction> {
327327
val pointer = state.toLinearAttestationPointer()
328-
val newAttestation = oldAttestation.amend(status, pointer, metadata)
328+
val newAttestation = oldAttestation.amendAttestation(status, pointer, metadata)
329329
return amendAttestation(oldAttestation, newAttestation, observers)
330330
}
331331

@@ -350,7 +350,7 @@ class AttestationService(rpc: CordaRPCOps) : RPCService(rpc) {
350350
clientId: String = UUID.randomUUID().toString()
351351
): FlowHandleWithClientId<SignedTransaction> {
352352
val pointer = state.toStaticAttestationPointer()
353-
val newAttestation = oldAttestation.amend(status, pointer, metadata)
353+
val newAttestation = oldAttestation.amendAttestation(status, pointer, metadata)
354354
return amendAttestation(oldAttestation, newAttestation, observers, clientId)
355355
}
356356

@@ -375,7 +375,7 @@ class AttestationService(rpc: CordaRPCOps) : RPCService(rpc) {
375375
clientId: String = UUID.randomUUID().toString()
376376
): FlowHandleWithClientId<SignedTransaction> {
377377
val pointer = state.toLinearAttestationPointer()
378-
val newAttestation = oldAttestation.amend(status, pointer, metadata)
378+
val newAttestation = oldAttestation.amendAttestation(status, pointer, metadata)
379379
return amendAttestation(oldAttestation, newAttestation, observers, clientId)
380380
}
381381

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class AmendAttestationFlowTests : FlowTest() {
4141
}
4242
.run(nodeC) {
4343
val oldAttestation = it.tx.outRefsOfType<Attestation<CordaClaim<String>>>().single()
44-
attestation = oldAttestation.reject()
44+
attestation = oldAttestation.rejectAttestation()
4545
AmendAttestationFlow.Initiator(oldAttestation, attestation)
4646
}
4747
.finally { transaction = it }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class VaultServiceAttestationQueryTests : FlowTest() {
4646
}
4747
.run(nodeC) {
4848
val oldAttestation = it.tx.outRefsOfType<Attestation<CordaClaim<String>>>().single()
49-
val newAttestation = oldAttestation.reject()
49+
val newAttestation = oldAttestation.rejectAttestation()
5050
AmendAttestationFlow.Initiator(oldAttestation, newAttestation)
5151
}
5252
.finally { attestation = it.tx.outRefsOfType<Attestation<CordaClaim<String>>>().single() }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ class VaultServiceAttestationsQueryTests : FlowTest() {
4646
}
4747
.run(nodeC) {
4848
val oldAttestation = it.tx.outRefsOfType<Attestation<CordaClaim<String>>>().single()
49-
val newAttestation = oldAttestation.reject()
49+
val newAttestation = oldAttestation.rejectAttestation()
5050
AmendAttestationFlow.Initiator(oldAttestation, newAttestation)
5151
}
5252
.run(nodeC) {
5353
val oldAttestation = it.tx.outRefsOfType<Attestation<CordaClaim<String>>>().single()
54-
val newAttestation = oldAttestation.accept()
54+
val newAttestation = oldAttestation.acceptAttestation()
5555
AmendAttestationFlow.Initiator(oldAttestation, newAttestation)
5656
}
5757
.finally { attestation = it.tx.outRefsOfType<Attestation<CordaClaim<String>>>().single() }

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import io.onixlabs.corda.core.services.equalTo
2020
import io.onixlabs.corda.core.services.singleOrNull
2121
import io.onixlabs.corda.core.services.vaultServiceFor
2222
import io.onixlabs.corda.identityframework.contract.CordaClaim
23-
import io.onixlabs.corda.identityframework.contract.CordaClaimSchema
2423
import io.onixlabs.corda.identityframework.contract.CordaClaimSchema.CordaClaimEntity
2524
import io.onixlabs.corda.identityframework.contract.amend
2625
import io.onixlabs.corda.identityframework.workflow.AmendClaimFlow

‎onixlabs-test-cordapp-contract/src/test/kotlin/io/onixlabs/test/cordapp/contract/attestations/GreetingAttestationContractAmendCommandTests.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package io.onixlabs.test.cordapp.contract.attestations
1818

1919
import io.onixlabs.corda.identityframework.contract.AttestationContract
2020
import io.onixlabs.corda.identityframework.contract.AttestationStatus
21-
import io.onixlabs.corda.identityframework.contract.accept
22-
import io.onixlabs.corda.identityframework.contract.reject
21+
import io.onixlabs.corda.identityframework.contract.acceptAttestation
22+
import io.onixlabs.corda.identityframework.contract.rejectAttestation
2323
import io.onixlabs.test.cordapp.contract.*
2424
import net.corda.testing.node.ledger
2525
import org.junit.jupiter.api.Test
@@ -33,7 +33,7 @@ class GreetingAttestationContractAmendCommandTests : ContractTest() {
3333
val issuedClaim1 = issue(GREETING_CLAIM)
3434
val attestation = GreetingAttestation(IDENTITY_C.party, issuedClaim1, AttestationStatus.ACCEPTED)
3535
val issuedAttestation1 = issue(attestation, issuedClaim1)
36-
val amendedAttestation1 = issuedAttestation1.reject()
36+
val amendedAttestation1 = issuedAttestation1.rejectAttestation()
3737
input(issuedAttestation1.ref)
3838
output(GreetingAttestationContract.ID, amendedAttestation1)
3939
reference(issuedClaim1.ref)
@@ -52,7 +52,7 @@ class GreetingAttestationContractAmendCommandTests : ContractTest() {
5252
val issuedClaim2 = issue(GREETING_CLAIM)
5353
val attestation = GreetingAttestation(IDENTITY_C.party, issuedClaim1, AttestationStatus.ACCEPTED)
5454
val issuedAttestation1 = issue(attestation, issuedClaim1)
55-
val amendedAttestation1 = issuedAttestation1.reject()
55+
val amendedAttestation1 = issuedAttestation1.rejectAttestation()
5656
input(issuedAttestation1.ref)
5757
output(GreetingAttestationContract.ID, amendedAttestation1)
5858
reference(issuedClaim1.ref)
@@ -71,7 +71,7 @@ class GreetingAttestationContractAmendCommandTests : ContractTest() {
7171
val issuedClaim2 = issue(GREETING_CLAIM)
7272
val attestation = GreetingAttestation(IDENTITY_C.party, issuedClaim1, AttestationStatus.ACCEPTED)
7373
val issuedAttestation1 = issue(attestation, issuedClaim1)
74-
val amendedAttestation1 = issuedAttestation1.reject()
74+
val amendedAttestation1 = issuedAttestation1.rejectAttestation()
7575
input(issuedAttestation1.ref)
7676
output(GreetingAttestationContract.ID, amendedAttestation1)
7777
reference(issuedClaim2.ref)
@@ -88,7 +88,7 @@ class GreetingAttestationContractAmendCommandTests : ContractTest() {
8888
val issuedClaim1 = issue(GREETING_CLAIM)
8989
val attestation = GreetingAttestation(IDENTITY_C.party, issuedClaim1, AttestationStatus.ACCEPTED)
9090
val issuedAttestation1 = issue(attestation, issuedClaim1)
91-
val amendedAttestation1 = issuedAttestation1.accept()
91+
val amendedAttestation1 = issuedAttestation1.acceptAttestation()
9292
input(issuedAttestation1.ref)
9393
output(GreetingAttestationContract.ID, amendedAttestation1)
9494
reference(issuedClaim1.ref)

‎onixlabs-test-cordapp-workflow/src/test/kotlin/io/onixlabs/test/cordapp/workflow/attestation/AmendAttestationFlowTests.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package io.onixlabs.test.cordapp.workflow.attestation
1818

1919
import io.onixlabs.corda.identityframework.contract.Attestation
2020
import io.onixlabs.corda.identityframework.contract.createAcceptedLinearAttestation
21-
import io.onixlabs.corda.identityframework.contract.reject
21+
import io.onixlabs.corda.identityframework.contract.rejectAttestation
2222
import io.onixlabs.corda.identityframework.workflow.AmendAttestationFlow
2323
import io.onixlabs.corda.identityframework.workflow.IssueAttestationFlow
2424
import io.onixlabs.corda.identityframework.workflow.IssueClaimFlow
@@ -48,7 +48,7 @@ class AmendAttestationFlowTests : FlowTest() {
4848
}
4949
.run(nodeC) {
5050
val oldAttestation = it.tx.outRefsOfType<Attestation<GreetingClaim>>().single()
51-
attestation = oldAttestation.reject()
51+
attestation = oldAttestation.rejectAttestation()
5252
AmendAttestationFlow.Initiator(oldAttestation, attestation)
5353
}
5454
.finally { transaction = it }

0 commit comments

Comments
 (0)