Skip to content

Commit 2b0c3b0

Browse files
1.0.0-rc4
1 parent 4772f70 commit 2b0c3b0

File tree

118 files changed

+320
-317
lines changed

Some content is hidden

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

118 files changed

+320
-317
lines changed

.idea/runConfigurations/Run_Contract_Tests.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
onixlabs_corda_idfx_release_version = '1.0.0-rc6'
1919

2020
cordapp_platform_version = 8
21-
cordapp_signing_enabled = false
21+
cordapp_signing_enabled = true
2222
cordapp_contract_name = 'ONIXLabs Corda BNMS Contract'
2323
cordapp_workflow_name = 'ONIXLabs Corda BNMS Workflow'
2424
cordapp_vendor_name = 'ONIXLabs'

onixlabs-corda-bnms-v1-contract/build.gradle renamed to onixlabs-corda-bnms-contract/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
// Corda Development Dependencies
2020
cordaCompile "$corda_group:corda-core:$corda_release_version"
2121
cordaCompile "$onixlabs_group:onixlabs-corda-core-contract:$onixlabs_corda_core_release_version"
22-
cordaCompile "$onixlabs_group:onixlabs-corda-identity-framework-v1-contract:$onixlabs_corda_idfx_release_version"
22+
cordaCompile "$onixlabs_group:onixlabs-corda-identity-framework-contract:$onixlabs_corda_idfx_release_version"
2323

2424
// Test Dependencies
2525
testRuntimeOnly "$junit_group:junit-jupiter-engine:$junit_version"
+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
inline fun <T, K> Iterable<T>.isDistinctBy(selector: (T) -> K): Boolean {
2020
return count() == distinctBy(selector).count()

onixlabs-corda-bnms-v1-contract/src/main/kotlin/io/onixlabs/corda/bnms/v1/contract/Network.kt renamed to onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/Network.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
import io.onixlabs.corda.core.contract.Hashable
2020
import net.corda.core.crypto.SecureHash
+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
import io.onixlabs.corda.core.contract.ChainState
2020
import net.corda.core.contracts.LinearState
+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
class Permission(value: String) : Setting<String>(PERMISSION, value.toUpperCase())

onixlabs-corda-bnms-v1-contract/src/main/kotlin/io/onixlabs/corda/bnms/v1/contract/Role.kt renamed to onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/Role.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
class Role(value: String) : Setting<String>(ROLE, value.toUpperCase())

onixlabs-corda-bnms-v1-contract/src/main/kotlin/io/onixlabs/corda/bnms/v1/contract/Setting.kt renamed to onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/Setting.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

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

19-
import io.onixlabs.corda.identityframework.v1.contract.Claim
19+
import io.onixlabs.corda.identityframework.contract.Claim
2020
import java.util.*
2121

2222
open class Setting<T : Any>(property: String, value: T) : Claim<T>(property.toUpperCase(), value) {
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.membership
17+
package io.onixlabs.corda.bnms.contract.membership
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.AttestationStatus
20-
import io.onixlabs.corda.identityframework.v1.contract.toAttestationPointer
19+
import io.onixlabs.corda.identityframework.contract.AttestationStatus
20+
import io.onixlabs.corda.identityframework.contract.toAttestationPointer
2121
import net.corda.core.contracts.StateAndRef
2222
import net.corda.core.contracts.UniqueIdentifier
2323
import net.corda.core.identity.AbstractParty
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.membership
17+
package io.onixlabs.corda.bnms.contract.membership
1818

19-
import io.onixlabs.corda.bnms.v1.contract.*
20-
import io.onixlabs.corda.bnms.v1.contract.membership.MembershipSchema.MembershipEntity
21-
import io.onixlabs.corda.bnms.v1.contract.membership.MembershipSchema.MembershipSchemaV1
19+
import io.onixlabs.corda.bnms.contract.*
20+
import io.onixlabs.corda.bnms.contract.membership.MembershipSchema.MembershipEntity
21+
import io.onixlabs.corda.bnms.contract.membership.MembershipSchema.MembershipSchemaV1
2222
import io.onixlabs.corda.core.contract.Hashable
23-
import io.onixlabs.corda.identityframework.v1.contract.AbstractClaim
23+
import io.onixlabs.corda.identityframework.contract.AbstractClaim
2424
import net.corda.core.contracts.BelongsToContract
2525
import net.corda.core.contracts.StateRef
2626
import net.corda.core.contracts.UniqueIdentifier
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.membership
17+
package io.onixlabs.corda.bnms.contract.membership
1818

19-
import io.onixlabs.corda.bnms.v1.contract.Network
20-
import io.onixlabs.corda.bnms.v1.contract.NetworkState
21-
import io.onixlabs.corda.bnms.v1.contract.membership.MembershipAttestationSchema.MembershipAttestationEntity
22-
import io.onixlabs.corda.bnms.v1.contract.membership.MembershipAttestationSchema.MembershipAttestationSchemaV1
23-
import io.onixlabs.corda.identityframework.v1.contract.Attestation
24-
import io.onixlabs.corda.identityframework.v1.contract.AttestationPointer
25-
import io.onixlabs.corda.identityframework.v1.contract.AttestationStatus
26-
import io.onixlabs.corda.identityframework.v1.contract.toAttestationPointer
19+
import io.onixlabs.corda.bnms.contract.Network
20+
import io.onixlabs.corda.bnms.contract.NetworkState
21+
import io.onixlabs.corda.bnms.contract.membership.MembershipAttestationSchema.MembershipAttestationEntity
22+
import io.onixlabs.corda.bnms.contract.membership.MembershipAttestationSchema.MembershipAttestationSchemaV1
23+
import io.onixlabs.corda.identityframework.contract.Attestation
24+
import io.onixlabs.corda.identityframework.contract.AttestationPointer
25+
import io.onixlabs.corda.identityframework.contract.AttestationStatus
26+
import io.onixlabs.corda.identityframework.contract.toAttestationPointer
2727
import net.corda.core.contracts.BelongsToContract
2828
import net.corda.core.contracts.StateAndRef
2929
import net.corda.core.contracts.StateRef
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.membership
17+
package io.onixlabs.corda.bnms.contract.membership
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.AttestationContract
19+
import io.onixlabs.corda.identityframework.contract.AttestationContract
2020
import net.corda.core.contracts.Contract
2121
import net.corda.core.contracts.ContractClassName
2222
import net.corda.core.contracts.requireThat
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.membership
17+
package io.onixlabs.corda.bnms.contract.membership
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.AttestationStatus
19+
import io.onixlabs.corda.identityframework.contract.AttestationStatus
2020
import net.corda.core.crypto.NullKeys.NULL_PARTY
2121
import net.corda.core.identity.AbstractParty
2222
import net.corda.core.schemas.MappedSchema
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.membership
17+
package io.onixlabs.corda.bnms.contract.membership
1818

1919
import net.corda.core.contracts.*
2020
import net.corda.core.transactions.LedgerTransaction
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.membership
17+
package io.onixlabs.corda.bnms.contract.membership
1818

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

17-
package io.onixlabs.corda.bnms.v1.contract.relationship
17+
package io.onixlabs.corda.bnms.contract.relationship
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.AttestationStatus
20-
import io.onixlabs.corda.identityframework.v1.contract.toAttestationPointer
19+
import io.onixlabs.corda.identityframework.contract.AttestationStatus
20+
import io.onixlabs.corda.identityframework.contract.toAttestationPointer
2121
import net.corda.core.contracts.StateAndRef
2222
import net.corda.core.contracts.UniqueIdentifier
2323
import net.corda.core.identity.AbstractParty
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.relationship
17+
package io.onixlabs.corda.bnms.contract.relationship
1818

19-
import io.onixlabs.corda.bnms.v1.contract.*
20-
import io.onixlabs.corda.bnms.v1.contract.relationship.RelationshipSchema.RelationshipEntity
21-
import io.onixlabs.corda.bnms.v1.contract.relationship.RelationshipSchema.RelationshipSchemaV1
22-
import io.onixlabs.corda.bnms.v1.contract.revocation.RevocationLock
19+
import io.onixlabs.corda.bnms.contract.*
20+
import io.onixlabs.corda.bnms.contract.relationship.RelationshipSchema.RelationshipEntity
21+
import io.onixlabs.corda.bnms.contract.relationship.RelationshipSchema.RelationshipSchemaV1
22+
import io.onixlabs.corda.bnms.contract.revocation.RevocationLock
2323
import io.onixlabs.corda.core.contract.Hashable
2424
import io.onixlabs.corda.core.contract.participantHash
2525
import net.corda.core.contracts.BelongsToContract
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.relationship
17+
package io.onixlabs.corda.bnms.contract.relationship
1818

19-
import io.onixlabs.corda.bnms.v1.contract.Network
20-
import io.onixlabs.corda.bnms.v1.contract.NetworkState
21-
import io.onixlabs.corda.bnms.v1.contract.relationship.RelationshipAttestationSchema.RelationshipAttestationEntity
22-
import io.onixlabs.corda.bnms.v1.contract.relationship.RelationshipAttestationSchema.RelationshipAttestationSchemaV1
23-
import io.onixlabs.corda.identityframework.v1.contract.Attestation
24-
import io.onixlabs.corda.identityframework.v1.contract.AttestationPointer
25-
import io.onixlabs.corda.identityframework.v1.contract.AttestationStatus
26-
import io.onixlabs.corda.identityframework.v1.contract.toAttestationPointer
19+
import io.onixlabs.corda.bnms.contract.Network
20+
import io.onixlabs.corda.bnms.contract.NetworkState
21+
import io.onixlabs.corda.bnms.contract.relationship.RelationshipAttestationSchema.RelationshipAttestationEntity
22+
import io.onixlabs.corda.bnms.contract.relationship.RelationshipAttestationSchema.RelationshipAttestationSchemaV1
23+
import io.onixlabs.corda.identityframework.contract.Attestation
24+
import io.onixlabs.corda.identityframework.contract.AttestationPointer
25+
import io.onixlabs.corda.identityframework.contract.AttestationStatus
26+
import io.onixlabs.corda.identityframework.contract.toAttestationPointer
2727
import net.corda.core.contracts.BelongsToContract
2828
import net.corda.core.contracts.StateAndRef
2929
import net.corda.core.contracts.StateRef
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.relationship
17+
package io.onixlabs.corda.bnms.contract.relationship
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.AttestationContract
19+
import io.onixlabs.corda.identityframework.contract.AttestationContract
2020
import net.corda.core.contracts.Contract
2121
import net.corda.core.contracts.ContractClassName
2222
import net.corda.core.contracts.requireThat
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.relationship
17+
package io.onixlabs.corda.bnms.contract.relationship
1818

19-
import io.onixlabs.corda.identityframework.v1.contract.AttestationStatus
19+
import io.onixlabs.corda.identityframework.contract.AttestationStatus
2020
import net.corda.core.crypto.NullKeys.NULL_PARTY
2121
import net.corda.core.identity.AbstractParty
2222
import net.corda.core.schemas.MappedSchema
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.relationship
17+
package io.onixlabs.corda.bnms.contract.relationship
1818

19-
import io.onixlabs.corda.bnms.v1.contract.revocation.RevocationLock
19+
import io.onixlabs.corda.bnms.contract.revocation.RevocationLock
2020
import net.corda.core.contracts.*
2121
import net.corda.core.transactions.LedgerTransaction
2222
import java.security.PublicKey
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.relationship
17+
package io.onixlabs.corda.bnms.contract.relationship
1818

19-
import io.onixlabs.corda.bnms.v1.contract.Setting
20-
import io.onixlabs.corda.bnms.v1.contract.cast
21-
import io.onixlabs.corda.identityframework.v1.contract.AbstractClaim
19+
import io.onixlabs.corda.bnms.contract.Setting
20+
import io.onixlabs.corda.bnms.contract.cast
21+
import io.onixlabs.corda.identityframework.contract.AbstractClaim
2222
import net.corda.core.identity.AbstractParty
2323
import net.corda.core.serialization.CordaSerializable
2424

Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.relationship
17+
package io.onixlabs.corda.bnms.contract.relationship
1818

1919
import net.corda.core.identity.AbstractParty
2020
import net.corda.core.schemas.MappedSchema
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.revocation
17+
package io.onixlabs.corda.bnms.contract.revocation
1818

19-
import io.onixlabs.corda.bnms.v1.contract.revocation.RevocationLockSchema.RevocationLockEntity
20-
import io.onixlabs.corda.bnms.v1.contract.revocation.RevocationLockSchema.RevocationLockSchemaV1
19+
import io.onixlabs.corda.bnms.contract.revocation.RevocationLockSchema.RevocationLockEntity
20+
import io.onixlabs.corda.bnms.contract.revocation.RevocationLockSchema.RevocationLockSchemaV1
2121
import net.corda.core.contracts.*
2222
import net.corda.core.identity.AbstractParty
2323
import net.corda.core.schemas.MappedSchema
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.revocation
17+
package io.onixlabs.corda.bnms.contract.revocation
1818

1919
import net.corda.core.contracts.*
2020
import net.corda.core.transactions.LedgerTransaction
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.onixlabs.corda.bnms.v1.contract.revocation
17+
package io.onixlabs.corda.bnms.contract.revocation
1818

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

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

19-
import io.onixlabs.corda.bnms.v1.contract.membership.*
20-
import io.onixlabs.corda.bnms.v1.contract.relationship.*
21-
import io.onixlabs.corda.bnms.v1.contract.revocation.RevocationLockContract
22-
import io.onixlabs.corda.identityframework.v1.contract.AttestationContract
19+
import io.onixlabs.corda.bnms.contract.membership.*
20+
import io.onixlabs.corda.bnms.contract.relationship.*
21+
import io.onixlabs.corda.bnms.contract.revocation.RevocationLockContract
22+
import io.onixlabs.corda.identityframework.contract.AttestationContract
2323
import net.corda.core.contracts.StateAndRef
2424
import net.corda.core.crypto.SecureHash
2525
import net.corda.core.identity.AbstractParty
@@ -34,8 +34,8 @@ abstract class ContractTest {
3434

3535
companion object {
3636
private val cordapps = listOf(
37-
"io.onixlabs.corda.identityframework.v1.contract",
38-
"io.onixlabs.corda.bnms.v1.contract"
37+
"io.onixlabs.corda.identityframework.contract",
38+
"io.onixlabs.corda.bnms.contract"
3939
)
4040

4141
private val contracts = listOf(
+6-6
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

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

19-
import io.onixlabs.corda.bnms.v1.contract.membership.Membership
20-
import io.onixlabs.corda.bnms.v1.contract.membership.MembershipAttestation
21-
import io.onixlabs.corda.bnms.v1.contract.relationship.Relationship
22-
import io.onixlabs.corda.bnms.v1.contract.relationship.RelationshipAttestation
23-
import io.onixlabs.corda.bnms.v1.contract.revocation.RevocationLock
19+
import io.onixlabs.corda.bnms.contract.membership.Membership
20+
import io.onixlabs.corda.bnms.contract.membership.MembershipAttestation
21+
import io.onixlabs.corda.bnms.contract.relationship.Relationship
22+
import io.onixlabs.corda.bnms.contract.relationship.RelationshipAttestation
23+
import io.onixlabs.corda.bnms.contract.revocation.RevocationLock
2424
import net.corda.core.contracts.LinearPointer
2525
import net.corda.core.contracts.StateRef
2626
import net.corda.core.contracts.UniqueIdentifier

0 commit comments

Comments
 (0)