Skip to content

Commit 243ed67

Browse files
1.0.0-rc6
1 parent 793342e commit 243ed67

File tree

98 files changed

+172
-169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+172
-169
lines changed

.idea/runConfigurations/Run_V1_Contract_Tests.xml renamed to .idea/runConfigurations/Run_Contract_Tests.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717
onixlabs_corda_core_release_version = '1.0.0-rc4'
1818

1919
cordapp_platform_version = 8
20-
cordapp_signing_enabled = false
20+
cordapp_signing_enabled = true
2121
cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract'
2222
cordapp_workflow_name = 'ONIXLabs Corda Identity Framework Workflow'
2323
cordapp_vendor_name = 'ONIXLabs'

onixlabs-corda-identity-framework-v1-contract/build.gradle renamed to onixlabs-corda-identity-framework-contract/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ publishing {
4242
gpr(MavenPublication) {
4343
groupId = project.parent.group
4444
version = project.parent.version
45-
artifactId = 'onixlabs-corda-identity-framework-v1-contract'
45+
artifactId = 'onixlabs-corda-identity-framework-contract'
4646
from components.java
4747
}
4848
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import net.corda.core.serialization.CordaSerializable
2020
import java.util.*
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import net.corda.core.contracts.Attachment
2020
import net.corda.core.contracts.BelongsToContract
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import io.onixlabs.corda.core.contract.ChainState
2020
import io.onixlabs.corda.core.contract.Hashable
21-
import io.onixlabs.corda.identityframework.v1.contract.AttestationSchema.AttestationEntity
22-
import io.onixlabs.corda.identityframework.v1.contract.AttestationSchema.AttestationSchemaV1
21+
import io.onixlabs.corda.identityframework.contract.AttestationSchema.AttestationEntity
22+
import io.onixlabs.corda.identityframework.contract.AttestationSchema.AttestationSchemaV1
2323
import net.corda.core.contracts.*
2424
import net.corda.core.crypto.SecureHash
2525
import net.corda.core.identity.AbstractParty
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import io.onixlabs.corda.core.contract.isPointingTo
2020
import net.corda.core.contracts.*
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import net.corda.core.contracts.ContractState
2020
import net.corda.core.contracts.StateAndRef
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import io.onixlabs.corda.core.contract.Hashable
2020
import io.onixlabs.corda.core.contract.Resolvable
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import net.corda.core.crypto.NullKeys.NULL_PARTY
2020
import net.corda.core.identity.AbstractParty
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.AttestationStatus.ACCEPTED
20-
import io.onixlabs.corda.identityframework.v1.contract.AttestationStatus.REJECTED
19+
import io.onixlabs.corda.identityframework.contract.AttestationStatus.ACCEPTED
20+
import io.onixlabs.corda.identityframework.contract.AttestationStatus.REJECTED
2121
import net.corda.core.serialization.CordaSerializable
2222

2323
/**
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
/**
2020
* Represents a generic claim.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import io.onixlabs.corda.core.contract.Resolvable
2020
import io.onixlabs.corda.core.contract.TransactionResolution
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import io.onixlabs.corda.core.contract.ChainState
2020
import io.onixlabs.corda.core.contract.Hashable
21-
import io.onixlabs.corda.identityframework.v1.contract.CordaClaimSchema.CordaClaimEntity
22-
import io.onixlabs.corda.identityframework.v1.contract.CordaClaimSchema.CordaClaimSchemaV1
21+
import io.onixlabs.corda.identityframework.contract.CordaClaimSchema.CordaClaimEntity
22+
import io.onixlabs.corda.identityframework.contract.CordaClaimSchema.CordaClaimSchemaV1
2323
import net.corda.core.contracts.BelongsToContract
2424
import net.corda.core.contracts.LinearState
2525
import net.corda.core.contracts.StateRef
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import io.onixlabs.corda.core.contract.isPointingTo
2020
import net.corda.core.contracts.*
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import net.corda.core.contracts.StateAndRef
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import net.corda.core.crypto.NullKeys.NULL_PARTY
2020
import net.corda.core.identity.AbstractParty
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
/**
2020
* Represents an empty claim.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import java.time.Instant
2020

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import kotlin.reflect.KVisibility
20+
import kotlin.reflect.full.declaredMemberProperties
2021
import kotlin.reflect.full.memberProperties
2122

2223
/**
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import java.time.Instant
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import net.corda.core.contracts.ContractState
2020
import net.corda.core.contracts.LinearState
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import net.corda.core.contracts.*
2020
import net.corda.core.crypto.SecureHash
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.BeforeEach
3131
abstract class ContractTest {
3232

3333
protected companion object {
34-
private val cordapps = listOf("io.onixlabs.corda.identityframework.v1.contract")
34+
private val cordapps = listOf("io.onixlabs.corda.identityframework.contract")
3535
private val contracts = listOf(CordaClaimContract.ID, AttestationContract.ID)
3636
fun keysOf(vararg identities: TestIdentity) = identities.map { it.publicKey }
3737
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract
17+
package io.onixlabs.corda.identityframework.contract
1818

1919
import net.corda.core.contracts.StateRef
2020
import net.corda.core.crypto.SecureHash
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract.attestation
17+
package io.onixlabs.corda.identityframework.contract.attestation
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.*
19+
import io.onixlabs.corda.identityframework.contract.*
2020
import net.corda.testing.node.ledger
2121
import org.junit.jupiter.api.Test
2222

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract.attestation
17+
package io.onixlabs.corda.identityframework.contract.attestation
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.*
19+
import io.onixlabs.corda.identityframework.contract.*
2020
import net.corda.testing.node.ledger
2121
import org.junit.jupiter.api.Test
2222

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract.attestation
17+
package io.onixlabs.corda.identityframework.contract.attestation
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.*
19+
import io.onixlabs.corda.identityframework.contract.*
2020
import net.corda.testing.node.ledger
2121
import org.junit.jupiter.api.Test
2222

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract.claims
17+
package io.onixlabs.corda.identityframework.contract.claims
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.*
19+
import io.onixlabs.corda.identityframework.contract.*
2020
import net.corda.testing.node.ledger
2121
import org.junit.jupiter.api.Test
2222

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract.claims
17+
package io.onixlabs.corda.identityframework.contract.claims
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.*
19+
import io.onixlabs.corda.identityframework.contract.*
2020
import net.corda.testing.node.ledger
2121
import org.junit.jupiter.api.Test
2222

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract.claims
17+
package io.onixlabs.corda.identityframework.contract.claims
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.*
19+
import io.onixlabs.corda.identityframework.contract.*
2020
import net.corda.testing.node.ledger
2121
import org.junit.jupiter.api.Test
2222

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.identityframework.v1.contract.general
17+
package io.onixlabs.corda.identityframework.contract.general
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.Claim
19+
import io.onixlabs.corda.identityframework.contract.Claim
2020
import org.junit.jupiter.api.Test
2121
import kotlin.test.assertEquals
2222

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package io.onixlabs.corda.identityframework.contract.general
2+
3+
import io.onixlabs.corda.identityframework.contract.Claim
4+
5+
class GreetingClaim(val greeter: String) : Claim<String>("Greeting", "Hello, World!")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies {
77
implementation "$onixlabs_group:onixlabs-corda-core-integration:$onixlabs_corda_core_release_version"
88

99
// CorDapp Dependencies
10-
implementation project(":onixlabs-corda-identity-framework-v1-contract")
10+
implementation project(":onixlabs-corda-identity-framework-contract")
1111
implementation project(":onixlabs-corda-identity-framework-workflow")
1212

1313
// Test Dependencies

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.onixlabs.corda.identityframework.integration
1818

1919
import io.onixlabs.corda.core.integration.RPCService
20-
import io.onixlabs.corda.identityframework.v1.contract.*
20+
import io.onixlabs.corda.identityframework.contract.*
2121
import io.onixlabs.corda.identityframework.workflow.AmendAttestationFlow
2222
import io.onixlabs.corda.identityframework.workflow.IssueAttestationFlow
2323
import io.onixlabs.corda.identityframework.workflow.PublishAttestationFlow

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package io.onixlabs.corda.identityframework.integration
1919
import io.onixlabs.corda.core.contract.cast
2020
import io.onixlabs.corda.core.integration.RPCService
2121
import io.onixlabs.corda.core.workflow.DEFAULT_PAGE_SPECIFICATION
22-
import io.onixlabs.corda.identityframework.v1.contract.Attestation
23-
import io.onixlabs.corda.identityframework.v1.contract.AttestationPointer
24-
import io.onixlabs.corda.identityframework.v1.contract.AttestationStatus
22+
import io.onixlabs.corda.identityframework.contract.Attestation
23+
import io.onixlabs.corda.identityframework.contract.AttestationPointer
24+
import io.onixlabs.corda.identityframework.contract.AttestationStatus
2525
import io.onixlabs.corda.identityframework.workflow.FindAttestationFlow
2626
import io.onixlabs.corda.identityframework.workflow.FindAttestationsFlow
2727
import net.corda.core.contracts.ContractState

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package io.onixlabs.corda.identityframework.integration
1818

1919
import io.onixlabs.corda.core.integration.RPCService
20-
import io.onixlabs.corda.identityframework.v1.contract.CordaClaim
21-
import io.onixlabs.corda.identityframework.v1.contract.amend
20+
import io.onixlabs.corda.identityframework.contract.CordaClaim
21+
import io.onixlabs.corda.identityframework.contract.amend
2222
import io.onixlabs.corda.identityframework.workflow.AmendClaimFlow
2323
import io.onixlabs.corda.identityframework.workflow.IssueClaimFlow
2424
import io.onixlabs.corda.identityframework.workflow.PublishClaimFlow

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package io.onixlabs.corda.identityframework.integration
1919
import io.onixlabs.corda.core.contract.cast
2020
import io.onixlabs.corda.core.integration.RPCService
2121
import io.onixlabs.corda.core.workflow.DEFAULT_PAGE_SPECIFICATION
22-
import io.onixlabs.corda.identityframework.v1.contract.CordaClaim
22+
import io.onixlabs.corda.identityframework.contract.CordaClaim
2323
import io.onixlabs.corda.identityframework.workflow.FindClaimFlow
2424
import io.onixlabs.corda.identityframework.workflow.FindClaimsFlow
2525
import net.corda.core.contracts.StateAndRef

0 commit comments

Comments
 (0)