1.0.0-rc4

Author: MrMatthewLayton

onixlabs-corda-identity-framework-integration/build.gradle

@@ -4,6 +4,7 @@ dependencies {
 
     // Corda Development Dependencies
     implementation "$corda_group:corda-core:$corda_release_version"
+    implementation "$onixlabs_group:onixlabs-corda-core-integration:$onixlabs_corda_core_release_version"
 
     // CorDapp Dependencies
     implementation project(":onixlabs-corda-identity-framework-contract")

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

@@ -16,6 +16,7 @@
 
 package io.onixlabs.corda.identityframework.integration
 
+import io.onixlabs.corda.core.integration.RPCService
 import io.onixlabs.corda.identityframework.contract.*
 import io.onixlabs.corda.identityframework.workflow.AmendAttestationFlow
 import io.onixlabs.corda.identityframework.workflow.IssueAttestationFlow
@@ -36,7 +37,7 @@ import net.corda.core.transactions.SignedTransaction
  *
  * @param rpc The Corda RPC instance that the service will bind to.
  */
-class AttestationCommandService(rpc: CordaRPCOps) : Service(rpc) {
+class AttestationCommandService(rpc: CordaRPCOps) : RPCService(rpc) {
 
     /**
      * Issues an attestation.

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

@@ -17,10 +17,11 @@
 package io.onixlabs.corda.identityframework.integration
 
 import io.onixlabs.corda.core.contract.cast
+import io.onixlabs.corda.core.integration.RPCService
+import io.onixlabs.corda.core.workflow.DEFAULT_PAGE_SPECIFICATION
 import io.onixlabs.corda.identityframework.contract.Attestation
 import io.onixlabs.corda.identityframework.contract.AttestationPointer
 import io.onixlabs.corda.identityframework.contract.AttestationStatus
-import io.onixlabs.corda.identityframework.workflow.DEFAULT_PAGE_SPECIFICATION
 import io.onixlabs.corda.identityframework.workflow.FindAttestationFlow
 import io.onixlabs.corda.identityframework.workflow.FindAttestationsFlow
 import net.corda.core.contracts.ContractState
@@ -41,7 +42,7 @@ import java.time.Instant
  *
  * @param rpc The Corda RPC instance that the service will bind to.
  */
-class AttestationQueryService(rpc: CordaRPCOps) : Service(rpc) {
+class AttestationQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
 
     /**
      * Finds a single attestation.

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

@@ -16,6 +16,7 @@
 
 package io.onixlabs.corda.identityframework.integration
 
+import io.onixlabs.corda.core.integration.RPCService
 import io.onixlabs.corda.identityframework.contract.CordaClaim
 import io.onixlabs.corda.identityframework.contract.amend
 import io.onixlabs.corda.identityframework.workflow.AmendClaimFlow
@@ -36,7 +37,7 @@ import net.corda.core.transactions.SignedTransaction
  *
  * @param rpc The Corda RPC instance that the service will bind to.
  */
-class ClaimCommandService(rpc: CordaRPCOps) : Service(rpc) {
+class ClaimCommandService(rpc: CordaRPCOps) : RPCService(rpc) {
 
     /**
      * Issues a claim.

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

@@ -17,8 +17,9 @@
 package io.onixlabs.corda.identityframework.integration
 
 import io.onixlabs.corda.core.contract.cast
+import io.onixlabs.corda.core.integration.RPCService
+import io.onixlabs.corda.core.workflow.DEFAULT_PAGE_SPECIFICATION
 import io.onixlabs.corda.identityframework.contract.CordaClaim
-import io.onixlabs.corda.identityframework.workflow.DEFAULT_PAGE_SPECIFICATION
 import io.onixlabs.corda.identityframework.workflow.FindClaimFlow
 import io.onixlabs.corda.identityframework.workflow.FindClaimsFlow
 import net.corda.core.contracts.StateAndRef
@@ -32,7 +33,7 @@ import net.corda.core.utilities.getOrThrow
 import java.time.Duration
 import java.time.Instant
 
-class ClaimQueryService(rpc: CordaRPCOps) : Service(rpc) {
+class ClaimQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
 
     /**
      * Finds a single claim.

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

@@ -17,6 +17,7 @@
 package io.onixlabs.corda.identityframework.workflow
 
 import co.paralleluniverse.fibers.Suspendable
+import io.onixlabs.corda.core.workflow.currentStep
 import io.onixlabs.corda.identityframework.contract.Attestation
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.flows.*

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

@@ -17,6 +17,7 @@
 package io.onixlabs.corda.identityframework.workflow
 
 import co.paralleluniverse.fibers.Suspendable
+import io.onixlabs.corda.core.workflow.currentStep
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.FlowSession

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

@@ -17,6 +17,7 @@
 package io.onixlabs.corda.identityframework.workflow
 
 import co.paralleluniverse.fibers.Suspendable
+import io.onixlabs.corda.core.workflow.currentStep
 import io.onixlabs.corda.identityframework.contract.CordaClaim
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.flows.*

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

@@ -17,6 +17,7 @@
 package io.onixlabs.corda.identityframework.workflow
 
 import co.paralleluniverse.fibers.Suspendable
+import io.onixlabs.corda.core.workflow.currentStep
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.FlowSession