Merge branch 'main' into release

Author: MrMatthewLayton

README.md

@@ -1,4 +1,4 @@
-![ONIX Labs](https://raw.githubusercontent.com/onix-labs/onix-labs.github.io/master/content/logo/master_full_md.png)
+![ONIX Labs](https://raw.githubusercontent.com/onix-labs/onixlabs-website/main/src/assets/images/logo/full/original/original-md.png)
 
 # ONIXLabs Corda Identity Framework
 

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         junit_version = '5.3.1'
 
         onixlabs_group = 'io.onixlabs'
-        onixlabs_corda_core_release_version = '3.0.0'
+        onixlabs_corda_core_release_version = '3.1.0'
 
         cordapp_platform_version = 10
         cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract'

gradle.properties

@@ -1,5 +1,5 @@
 name=onixlabs-corda-identity-framework
 group=io.onixlabs
-version=3.0.0
+version=3.1.0
 onixlabs.development.jarsign.keystore=../lib/onixlabs.development.pkcs12
 onixlabs.development.jarsign.password=5891f47942424d2acbe108691fdb5ba258712fca7e4762be4327241ebf3dbfa3

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

@@ -37,7 +37,7 @@ class GetAccountStateRefsByClaimFlow(
     private val property: String? = null,
     private val value: Any? = null,
     private val hash: SecureHash? = null
-) : FlowLogic<List<StateRef>>() {
+) : FlowLogic<List<StateRef>?>() {
 
     private companion object {
 
@@ -53,8 +53,8 @@ class GetAccountStateRefsByClaimFlow(
     }
 
     @Suspendable
-    override fun call(): List<StateRef> {
-        return if (property == null && value == null && hash == null) emptyList() else executeQuery()
+    override fun call(): List<StateRef>? {
+        return if (property == null && value == null && hash == null) null else executeQuery()
     }
 
     /**

onixlabs-corda-identity-framework-workflow/src/test/kotlin/io/onixlabs/corda/identityframework/workflow/accounts/VaultServiceAccountClaimQueryTests.kt

@@ -242,7 +242,7 @@ class VaultServiceAccountClaimQueryTests : FlowTest() {
         property: String? = null,
         value: Any? = null,
         hash: SecureHash? = null
-    ): List<StateRef> {
+    ): List<StateRef>? {
         return Pipeline
             .create(network)
             .run(this) { GetAccountStateRefsByClaimFlow(property, value, hash) }

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

@@ -78,7 +78,7 @@ class VaultServiceAttestationsQueryTests : FlowTest() {
         listOf(nodeA, nodeB, nodeC).forEach {
             val results = it.services.vaultServiceFor<Attestation<CordaClaim<String>>>().filter {
                 stateStatus(Vault.StateStatus.ALL)
-                externalIds(attestation.state.data.linearId.externalId)
+                externalIds(attestation.state.data.linearId.externalId!!)
                 attestationType()
             }
 

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

@@ -62,7 +62,7 @@ class VaultServiceClaimQueryTests : FlowTest() {
         listOf(nodeA, nodeB, nodeC).forEach {
             val result = it.services.vaultServiceFor<CordaClaim<String>>().singleOrNull {
                 stateStatus(Vault.StateStatus.UNCONSUMED)
-                externalIds(claim.state.data.linearId.externalId)
+                externalIds(claim.state.data.linearId.externalId!!)
                 claimType()
             }
 

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

@@ -98,7 +98,7 @@ class VaultServiceClaimsQueryTests : FlowTest() {
         listOf(nodeA, nodeB, nodeC).forEach {
             val results = it.services.vaultServiceFor<CordaClaim<*>>().filter {
                 stateStatus(Vault.StateStatus.ALL)
-                externalIds(CLAIM_1.linearId.externalId)
+                externalIds(CLAIM_1.linearId.externalId!!)
                 claimType()
             }
 

onixlabs-test-cordapp-workflow/src/test/kotlin/io/onixlabs/test/cordapp/workflow/attestations/VaultServiceAttestationsQueryTests.kt

@@ -81,7 +81,7 @@ class VaultServiceAttestationsQueryTests : FlowTest() {
         listOf(nodeA, nodeB, nodeC).forEach {
             val results = it.services.vaultServiceFor<Attestation<*>>().filter {
                 stateStatus(Vault.StateStatus.ALL)
-                externalIds(attestation.state.data.linearId.externalId)
+                externalIds(attestation.state.data.linearId.externalId!!)
                 attestationType()
             }