Split TransactionBuilder extensions into separate files for maintainability.

Author: MrMatthewLayton

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/Extensions.TransactionBuilder.Accounts.kt

@@ -19,38 +19,46 @@ package io.onixlabs.corda.identityframework.workflow
 import io.onixlabs.corda.identityframework.contract.accounts.Account
 import io.onixlabs.corda.identityframework.contract.accounts.AccountContract
 import net.corda.core.contracts.StateAndRef
+import net.corda.core.transactions.TransactionBuilder
 
 /**
  * Adds an account for issuance to a transaction builder, including the required command.
  *
- * @param state The account state to be created in the transaction.
+ * @param account The account state to be created in the transaction.
  * @return Returns the current transaction builder.
  */
-fun Builder.addIssuedAccount(state: Account): Builder = apply {
-    addOutputState(state)
-    addCommand(AccountContract.Issue, state.owner.owningKey)
+fun TransactionBuilder.addIssuedAccount(
+    account: Account
+): TransactionBuilder = apply {
+    addOutputState(account)
+    addCommand(AccountContract.Issue, account.owner.owningKey)
 }
 
 /**
  * Adds an account for amendment to a transaction builder, including the required command.
  *
- * @param oldState The old account state to be consumed in the transaction.
- * @param newState The new account state to be created in the transaction.
+ * @param oldAccount The old account state to be consumed in the transaction.
+ * @param newAccount The new account state to be created in the transaction.
  * @return Returns the current transaction builder.
  */
-fun Builder.addAmendedAccount(oldState: StateAndRef<Account>, newState: Account): Builder = apply {
-    addInputState(oldState)
-    addOutputState(newState)
-    addCommand(AccountContract.Amend, newState.owner.owningKey)
+fun TransactionBuilder.addAmendedAccount(
+    oldAccount: StateAndRef<Account>,
+    newAccount: Account
+): TransactionBuilder = apply {
+    addInputState(oldAccount)
+    addOutputState(newAccount)
+    addCommand(AccountContract.Amend, newAccount.owner.owningKey)
 }
 
 /**
  * Adds an account for revocation to a transaction builder, including the required command.
  *
- * @param state The account state to be consumed in the transaction.
+ * @param account The account state to be consumed in the transaction.
  * @return Returns the current transaction builder.
  */
-fun Builder.addRevokedAccount(state: StateAndRef<Account>): Builder = apply {
-    addInputState(state)
-    addCommand(AccountContract.Revoke, state.state.data.owner.owningKey)
+fun TransactionBuilder.addRevokedAccount(
+    account: StateAndRef<Account>
+): TransactionBuilder = apply {
+    addInputState(account)
+    addCommand(AccountContract.Revoke, account.state.data.owner.owningKey)
 }

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/Extensions.TransactionBuilder.Attestations.kt

@@ -19,38 +19,46 @@ package io.onixlabs.corda.identityframework.workflow
 import io.onixlabs.corda.identityframework.contract.attestations.Attestation
 import io.onixlabs.corda.identityframework.contract.attestations.AttestationContract
 import net.corda.core.contracts.StateAndRef
+import net.corda.core.transactions.TransactionBuilder
 
 /**
  * Adds an attestation for issuance to a transaction builder, including the required command.
  *
- * @param state The attestation state to be created in the transaction.
+ * @param attestation The attestation state to be created in the transaction.
  * @return Returns the current transaction builder.
  */
-fun Builder.addIssuedAttestation(state: Attestation<*>): Builder = apply {
-    addOutputState(state)
-    addCommand(AttestationContract.Issue, state.attestor.owningKey)
+fun TransactionBuilder.addIssuedAttestation(
+    attestation: Attestation<*>
+): TransactionBuilder = apply {
+    addOutputState(attestation)
+    addCommand(AttestationContract.Issue, attestation.attestor.owningKey)
 }
 
 /**
  * Adds an attestation for amendment to a transaction builder, including the required command.
  *
- * @param oldState The old attestation state to be consumed in the transaction.
- * @param newState The new attestation state to be created in the transaction.
+ * @param oldAttestation The old attestation state to be consumed in the transaction.
+ * @param newAttestation The new attestation state to be created in the transaction.
  * @return Returns the current transaction builder.
  */
-fun Builder.addAmendedAttestation(oldState: StateAndRef<Attestation<*>>, newState: Attestation<*>): Builder = apply {
-    addInputState(oldState)
-    addOutputState(newState)
-    addCommand(AttestationContract.Amend, newState.attestor.owningKey)
+fun TransactionBuilder.addAmendedAttestation(
+    oldAttestation: StateAndRef<Attestation<*>>,
+    newAttestation: Attestation<*>
+): TransactionBuilder = apply {
+    addInputState(oldAttestation)
+    addOutputState(newAttestation)
+    addCommand(AttestationContract.Amend, newAttestation.attestor.owningKey)
 }
 
 /**
  * Adds an attestation for revocation to a transaction builder, including the required command.
  *
- * @param state The attestation state to be consumed in the transaction.
+ * @param attestation The attestation state to be consumed in the transaction.
  * @return Returns the current transaction builder.
  */
-fun Builder.addRevokedAttestation(state: StateAndRef<Attestation<*>>): Builder = apply {
-    addInputState(state)
-    addCommand(AttestationContract.Revoke, state.state.data.attestor.owningKey)
+fun TransactionBuilder.addRevokedAttestation(
+    attestation: StateAndRef<Attestation<*>>
+): TransactionBuilder = apply {
+    addInputState(attestation)
+    addCommand(AttestationContract.Revoke, attestation.state.data.attestor.owningKey)
 }

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/Extensions.TransactionBuilder.Claims.kt

@@ -19,38 +19,46 @@ package io.onixlabs.corda.identityframework.workflow
 import io.onixlabs.corda.identityframework.contract.claims.CordaClaim
 import io.onixlabs.corda.identityframework.contract.claims.CordaClaimContract
 import net.corda.core.contracts.StateAndRef
+import net.corda.core.transactions.TransactionBuilder
 
 /**
  * Adds a claim for issuance to a transaction builder, including the required command.
  *
- * @param state The claim state to be created in the transaction.
+ * @param claim The claim state to be created in the transaction.
  * @return Returns the current transaction builder.
  */
-fun Builder.addIssuedClaim(state: CordaClaim<*>): Builder = apply {
-    addOutputState(state)
-    addCommand(CordaClaimContract.Issue, state.issuer.owningKey)
+fun TransactionBuilder.addIssuedClaim(
+    claim: CordaClaim<*>
+): TransactionBuilder = apply {
+    addOutputState(claim)
+    addCommand(CordaClaimContract.Issue, claim.issuer.owningKey)
 }
 
 /**
  * Adds a claim for amendment to a transaction builder, including the required command.
  *
- * @param oldState The old claim state to be consumed in the transaction.
- * @param newState The new claim state to be created in the transaction.
+ * @param oldClaim The old claim state to be consumed in the transaction.
+ * @param newClaim The new claim state to be created in the transaction.
  * @return Returns the current transaction builder.
  */
-fun Builder.addAmendedClaim(oldState: StateAndRef<CordaClaim<*>>, newState: CordaClaim<*>): Builder = apply {
-    addInputState(oldState)
-    addOutputState(newState)
-    addCommand(CordaClaimContract.Amend, newState.issuer.owningKey)
+fun TransactionBuilder.addAmendedClaim(
+    oldClaim: StateAndRef<CordaClaim<*>>,
+    newClaim: CordaClaim<*>
+): TransactionBuilder = apply {
+    addInputState(oldClaim)
+    addOutputState(newClaim)
+    addCommand(CordaClaimContract.Amend, newClaim.issuer.owningKey)
 }
 
 /**
  * Adds a claim for revocation to a transaction builder, including the required command.
  *
- * @param state The claim state to be consumed in the transaction.
+ * @param claim The claim state to be consumed in the transaction.
  * @return Returns the current transaction builder.
  */
-fun Builder.addRevokedClaim(state: StateAndRef<CordaClaim<*>>): Builder = apply {
-    addInputState(state)
-    addCommand(CordaClaimContract.Revoke, state.state.data.issuer.owningKey)
+fun TransactionBuilder.addRevokedClaim(
+    claim: StateAndRef<CordaClaim<*>>
+): TransactionBuilder = apply {
+    addInputState(claim)
+    addCommand(CordaClaimContract.Revoke, claim.state.data.issuer.owningKey)
 }