Skip to content

Commit e8af715

Browse files
Corrected step names in handler flows.
1 parent df8eda4 commit e8af715

File tree

10 files changed

+36
-43
lines changed

10 files changed

+36
-43
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ class AmendAttestationFlowHandler(
6565
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
6666

6767
private companion object {
68-
object ObserveAmendedAttestationStep : Step("Observing amended attestation.") {
68+
object HandleAmendedAttestationStep : Step("Handling amended attestation.") {
6969
override fun childProgressTracker(): ProgressTracker = tracker()
7070
}
7171
}
7272

73-
override val progressTracker = ProgressTracker(ObserveAmendedAttestationStep)
73+
override val progressTracker = ProgressTracker(HandleAmendedAttestationStep)
7474

7575
@Suspendable
7676
override fun call(): SignedTransaction {
77-
currentStep(ObserveAmendedAttestationStep)
77+
currentStep(HandleAmendedAttestationStep)
7878
return subFlow(
7979
AmendAttestationFlowHandler(
8080
session,
81-
progressTracker = ObserveAmendedAttestationStep.childProgressTracker()
81+
progressTracker = HandleAmendedAttestationStep.childProgressTracker()
8282
)
8383
)
8484
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ class AmendClaimFlowHandler(
6565
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
6666

6767
private companion object {
68-
object ObserveAmendedClaimStep : Step("Observing amended claim.") {
68+
object HandlingAmendedClaimStep : Step("Handling amended claim.") {
6969
override fun childProgressTracker(): ProgressTracker = tracker()
7070
}
7171
}
7272

73-
override val progressTracker = ProgressTracker(ObserveAmendedClaimStep)
73+
override val progressTracker = ProgressTracker(HandlingAmendedClaimStep)
7474

7575
@Suspendable
7676
override fun call(): SignedTransaction {
77-
currentStep(ObserveAmendedClaimStep)
77+
currentStep(HandlingAmendedClaimStep)
7878
return subFlow(
7979
AmendClaimFlowHandler(
8080
session,
81-
progressTracker = ObserveAmendedClaimStep.childProgressTracker()
81+
progressTracker = HandlingAmendedClaimStep.childProgressTracker()
8282
)
8383
)
8484
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ class IssueAttestationFlowHandler(
6565
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
6666

6767
private companion object {
68-
object ObserveIssuedAttestationStep : Step("Observing issued attestation.") {
68+
object HandleIssuedAttestationStep : Step("Handling issued attestation.") {
6969
override fun childProgressTracker(): ProgressTracker = tracker()
7070
}
7171
}
7272

73-
override val progressTracker = ProgressTracker(ObserveIssuedAttestationStep)
73+
override val progressTracker = ProgressTracker(HandleIssuedAttestationStep)
7474

7575
@Suspendable
7676
override fun call(): SignedTransaction {
77-
currentStep(ObserveIssuedAttestationStep)
77+
currentStep(HandleIssuedAttestationStep)
7878
return subFlow(
7979
IssueAttestationFlowHandler(
8080
session,
81-
progressTracker = ObserveIssuedAttestationStep.childProgressTracker()
81+
progressTracker = HandleIssuedAttestationStep.childProgressTracker()
8282
)
8383
)
8484
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ class IssueClaimFlowHandler(
6565
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
6666

6767
private companion object {
68-
object ObserveIssuedClaimStep : Step("Observing issued claim.") {
68+
object HandleIssuedClaimStep : Step("Handling issued claim.") {
6969
override fun childProgressTracker(): ProgressTracker = tracker()
7070
}
7171
}
7272

73-
override val progressTracker = ProgressTracker(ObserveIssuedClaimStep)
73+
override val progressTracker = ProgressTracker(HandleIssuedClaimStep)
7474

7575
@Suspendable
7676
override fun call(): SignedTransaction {
77-
currentStep(ObserveIssuedClaimStep)
77+
currentStep(HandleIssuedClaimStep)
7878
return subFlow(
7979
IssueClaimFlowHandler(
8080
session,
81-
progressTracker = ObserveIssuedClaimStep.childProgressTracker()
81+
progressTracker = HandleIssuedClaimStep.childProgressTracker()
8282
)
8383
)
8484
}

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

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

1919
import co.paralleluniverse.fibers.Suspendable
20-
import io.onixlabs.corda.core.workflow.ReceiveStatesToRecordStep
2120
import io.onixlabs.corda.core.workflow.currentStep
2221
import net.corda.core.flows.FlowLogic
2322
import net.corda.core.flows.FlowSession
@@ -59,20 +58,20 @@ class PublishAttestationFlowHandler(
5958
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
6059

6160
private companion object {
62-
object ReceivePublishedAttestationTransactionStep : Step("Receiving published attestation transaction.") {
61+
object HandlePublishedAttestationStep : Step("Handling published attestation.") {
6362
override fun childProgressTracker() = tracker()
6463
}
6564
}
6665

67-
override val progressTracker = ProgressTracker(ReceivePublishedAttestationTransactionStep)
66+
override val progressTracker = ProgressTracker(HandlePublishedAttestationStep)
6867

6968
@Suspendable
7069
override fun call(): SignedTransaction {
71-
currentStep(ReceivePublishedAttestationTransactionStep)
70+
currentStep(HandlePublishedAttestationStep)
7271
return subFlow(
7372
PublishAttestationFlowHandler(
7473
session,
75-
ReceivePublishedAttestationTransactionStep.childProgressTracker()
74+
HandlePublishedAttestationStep.childProgressTracker()
7675
)
7776
)
7877
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,20 @@ class PublishClaimFlowHandler(
5858
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
5959

6060
private companion object {
61-
object ReceivePublishedClaimTransactionStep : Step("Receiving published claim transaction.") {
61+
object HandlePublishedClaimStep : Step("Handling published claim.") {
6262
override fun childProgressTracker() = tracker()
6363
}
6464
}
6565

66-
override val progressTracker = ProgressTracker(ReceivePublishedClaimTransactionStep)
66+
override val progressTracker = ProgressTracker(HandlePublishedClaimStep)
6767

6868
@Suspendable
6969
override fun call(): SignedTransaction {
70-
currentStep(ReceivePublishedClaimTransactionStep)
70+
currentStep(HandlePublishedClaimStep)
7171
return subFlow(
7272
PublishClaimFlowHandler(
7373
session,
74-
ReceivePublishedClaimTransactionStep.childProgressTracker()
74+
HandlePublishedClaimStep.childProgressTracker()
7575
)
7676
)
7777
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ class RevokeAttestationFlowHandler(
6565
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
6666

6767
private companion object {
68-
object ObserveRevokedAttestationStep : Step("Observing revoked attestation.") {
68+
object HandleRevokedAttestationStep : Step("Handling revoked attestation.") {
6969
override fun childProgressTracker(): ProgressTracker = tracker()
7070
}
7171
}
7272

73-
override val progressTracker = ProgressTracker(ObserveRevokedAttestationStep)
73+
override val progressTracker = ProgressTracker(HandleRevokedAttestationStep)
7474

7575
@Suspendable
7676
override fun call(): SignedTransaction {
77-
currentStep(ObserveRevokedAttestationStep)
77+
currentStep(HandleRevokedAttestationStep)
7878
return subFlow(
7979
RevokeAttestationFlowHandler(
8080
session,
81-
progressTracker = ObserveRevokedAttestationStep.childProgressTracker()
81+
progressTracker = HandleRevokedAttestationStep.childProgressTracker()
8282
)
8383
)
8484
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ class RevokeClaimFlowHandler(
6565
private class Handler(private val session: FlowSession) : FlowLogic<SignedTransaction>() {
6666

6767
private companion object {
68-
object ObserveRevokedClaimStep : Step("Observing revoked claim.") {
68+
object HandleRevokedClaimStep : Step("Handling revoked claim.") {
6969
override fun childProgressTracker(): ProgressTracker = tracker()
7070
}
7171
}
7272

73-
override val progressTracker = ProgressTracker(ObserveRevokedClaimStep)
73+
override val progressTracker = ProgressTracker(HandleRevokedClaimStep)
7474

7575
@Suspendable
7676
override fun call(): SignedTransaction {
77-
currentStep(ObserveRevokedClaimStep)
77+
currentStep(HandleRevokedClaimStep)
7878
return subFlow(
7979
RevokeClaimFlowHandler(
8080
session,
81-
progressTracker = ObserveRevokedClaimStep.childProgressTracker()
81+
progressTracker = HandleRevokedClaimStep.childProgressTracker()
8282
)
8383
)
8484
}

onixlabs-test-cordapp-contract/src/main/kotlin/io/onixlabs/test/cordapp/contract/GreetingAttestationContract.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,17 @@
1616

1717
package io.onixlabs.test.cordapp.contract
1818

19+
import io.onixlabs.corda.core.contract.ContractID
1920
import io.onixlabs.corda.identityframework.contract.AttestationContract
2021
import io.onixlabs.corda.identityframework.contract.AttestationStatus
2122
import net.corda.core.contracts.Contract
22-
import net.corda.core.contracts.ContractClassName
2323
import net.corda.core.contracts.requireThat
2424
import net.corda.core.transactions.LedgerTransaction
2525
import java.security.PublicKey
2626

2727
class GreetingAttestationContract : AttestationContract(), Contract {
2828

29-
companion object {
30-
@JvmStatic
31-
val ID: ContractClassName = this::class.java.enclosingClass.canonicalName
32-
}
29+
companion object : ContractID
3330

3431
internal object Issue {
3532
const val CONTRACT_RULE_REFERENCES =

onixlabs-test-cordapp-contract/src/main/kotlin/io/onixlabs/test/cordapp/contract/GreetingClaimContract.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,16 @@
1616

1717
package io.onixlabs.test.cordapp.contract
1818

19+
import io.onixlabs.corda.core.contract.ContractID
1920
import io.onixlabs.corda.identityframework.contract.CordaClaimContract
2021
import net.corda.core.contracts.Contract
21-
import net.corda.core.contracts.ContractClassName
2222
import net.corda.core.contracts.requireThat
2323
import net.corda.core.transactions.LedgerTransaction
2424
import java.security.PublicKey
2525

2626
class GreetingClaimContract : CordaClaimContract(), Contract {
2727

28-
companion object {
29-
@JvmStatic
30-
val ID: ContractClassName = this::class.java.enclosingClass.canonicalName
31-
}
28+
companion object : ContractID
3229

3330
internal object Issue {
3431
const val CONTRACT_RULE_OUTPUT_PROPERTY =

0 commit comments

Comments
 (0)