BROKEN COMMIT: FIX OR REVERT!

Author: MrMatthewLayton

onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/NetworkState.kt

@@ -16,14 +16,13 @@
 
 package io.onixlabs.corda.bnms.contract
 
-import net.corda.core.contracts.LinearState
-import net.corda.core.schemas.QueryableState
+import net.corda.core.contracts.ContractState
 
 /**
  * Defines a contract state that belongs to a business network.
  *
  * @property network The business network that the state belongs to.
  */
-interface NetworkState : LinearState, QueryableState {
+interface NetworkState : ContractState {
     val network: Network
 }

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

@@ -25,4 +25,4 @@ package io.onixlabs.corda.bnms.contract
  * @property normalizedValue The normalized value of the role.
  * @property hash The hash that uniquely identifies the role.
  */
-class Role(value: String) : StringSetting(ROLE, value)
+class Role(value: String) : StringSetting(ROLE, value)

onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/membership/Membership.kt

@@ -23,12 +23,14 @@ import io.onixlabs.corda.core.contract.ChainState
 import io.onixlabs.corda.core.contract.Hashable
 import io.onixlabs.corda.identityframework.contract.AbstractClaim
 import net.corda.core.contracts.BelongsToContract
+import net.corda.core.contracts.LinearState
 import net.corda.core.contracts.StateRef
 import net.corda.core.contracts.UniqueIdentifier
 import net.corda.core.crypto.SecureHash
 import net.corda.core.identity.AbstractParty
 import net.corda.core.schemas.MappedSchema
 import net.corda.core.schemas.PersistentState
+import net.corda.core.schemas.QueryableState
 
 /**
  * Represents a membership to a business network.
@@ -51,7 +53,7 @@ data class Membership(
     val configuration: Configuration = Configuration(),
     override val linearId: UniqueIdentifier = UniqueIdentifier(),
     override val previousStateRef: StateRef? = null
-) : NetworkState, ChainState, Hashable {
+) : NetworkState, ChainState, LinearState, QueryableState, Hashable {
 
     constructor(
         network: Network,

onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/relationship/Relationship.kt

@@ -30,6 +30,7 @@ import net.corda.core.identity.AbstractParty
 import net.corda.core.node.services.vault.QueryCriteria
 import net.corda.core.schemas.MappedSchema
 import net.corda.core.schemas.PersistentState
+import net.corda.core.schemas.QueryableState
 
 /**
  * Represents a multi-lateral relationship between participants of a business network.
@@ -48,7 +49,7 @@ data class Relationship(
     val members: Map<out AbstractParty, Configuration> = emptyMap(),
     override val linearId: UniqueIdentifier = UniqueIdentifier(),
     override val previousStateRef: StateRef? = null
-) : NetworkState, ChainState, Hashable {
+) : NetworkState, ChainState, LinearState, QueryableState, Hashable {
 
     val configurations: PluralResolvable<RelationshipConfiguration>
         get() = RelationshipConfigurationResolver(linearId)

onixlabs-corda-bnms-contract/src/main/kotlin/io/onixlabs/corda/bnms/contract/relationship/RelationshipConfiguration.kt

@@ -26,12 +26,14 @@ import io.onixlabs.corda.core.contract.Hashable
 import io.onixlabs.corda.core.contract.SingularResolvable
 import io.onixlabs.corda.core.services.vaultQuery
 import net.corda.core.contracts.BelongsToContract
+import net.corda.core.contracts.LinearState
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.UniqueIdentifier
 import net.corda.core.crypto.SecureHash
 import net.corda.core.identity.AbstractParty
 import net.corda.core.node.services.vault.QueryCriteria
 import net.corda.core.schemas.MappedSchema
+import net.corda.core.schemas.QueryableState
 
 @BelongsToContract(RelationshipConfigurationContract::class)
 class RelationshipConfiguration private constructor(
@@ -40,7 +42,7 @@ class RelationshipConfiguration private constructor(
     val configuration: Configuration,
     val relationshipLinearId: UniqueIdentifier,
     override val linearId: UniqueIdentifier
-) : NetworkState, Hashable {
+) : NetworkState, LinearState, QueryableState, Hashable {
 
     constructor(
         relationship: Relationship,

onixlabs-corda-bnms-contract/src/test/kotlin/io/onixlabs/corda/bnms/contract/settings/SettingExtensionTests.kt

@@ -78,7 +78,6 @@ class SettingExtensionTests {
         assertEquals(2, result.size)
     }
 
-
     @Test
     fun `inline filterByType should filter all settings of type Setting where the value type is unknown`() {
         val result = settings.filterByType<Setting<*>>()