Updated test packages

MrMatthewLayton · MrMatthewLayton · commit ac2a385307a5 · 2021-07-27T19:52:51.000+01:00
diff --git a/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/RewardContract.kt b/onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/RewardContract.kt
@@ -70,7 +70,7 @@ class RewardContract : Contract {
 
             CONTRACT_RULE_OWNER using (rewardOutput.owner == customerReference.owner)
             CONTRACT_RULE_SIGNATURE_DATA using (rewardOutput.hash().bytes.contentEquals(signature.content))
-            CONTRACT_RULE_SIGNATURE_SIGNER using (signature.verify(rewardOutput.issuer.owningKey))
+            CONTRACT_RULE_SIGNATURE_SIGNER using (signature.isValid(rewardOutput.issuer.owningKey))
             CONTRACT_RULE_SIGNERS using (rewardOutput.participants.owningKeys.all { it in signers })
         }
     }
@@ -114,7 +114,7 @@ class RewardContract : Contract {
 
             CONTRACT_RULE_OWNER using (rewardInput.owner == customerReference.owner)
             CONTRACT_RULE_SIGNATURE_DATA using (rewardInput.hash().bytes.contentEquals(signature.content))
-            CONTRACT_RULE_SIGNATURE_SIGNER using (signature.verify(rewardInput.owner.owningKey))
+            CONTRACT_RULE_SIGNATURE_SIGNER using (signature.isValid(rewardInput.owner.owningKey))
             CONTRACT_RULE_SIGNERS using (rewardInput.participants.owningKeys.all { it in signers })
         }
     }
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/ContractTest.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/ContractTest.kt
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.test.contract
+package io.onixlabs.corda.test
 
+import io.onixlabs.corda.test.contract.Customer
+import io.onixlabs.corda.test.contract.CustomerContract
+import io.onixlabs.corda.test.contract.RewardContract
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.StateRef
 import net.corda.core.crypto.SecureHash
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/MockData.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/MockData.kt
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.test.contract
+package io.onixlabs.corda.test
 
+import io.onixlabs.corda.test.contract.Customer
+import io.onixlabs.corda.test.contract.Reward
 import net.corda.core.contracts.StateRef
 import net.corda.core.crypto.SecureHash
 import net.corda.core.identity.CordaX500Name
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/CustomerContractAmendCommandTests.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/CustomerContractAmendCommandTests.kt
@@ -16,6 +16,7 @@
 
 package io.onixlabs.corda.test.contract
 
+import io.onixlabs.corda.test.*
 import net.corda.testing.node.ledger
 import org.junit.jupiter.api.Test
 
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/CustomerContractIssueCommandTests.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/CustomerContractIssueCommandTests.kt
@@ -16,6 +16,7 @@
 
 package io.onixlabs.corda.test.contract
 
+import io.onixlabs.corda.test.*
 import net.corda.testing.node.ledger
 import org.junit.jupiter.api.Test
 
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/CustomerContractRevokeCommandTests.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/CustomerContractRevokeCommandTests.kt
@@ -16,6 +16,7 @@
 
 package io.onixlabs.corda.test.contract
 
+import io.onixlabs.corda.test.*
 import net.corda.testing.node.ledger
 import org.junit.jupiter.api.Test
 
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/RewardContractIssueCommandTests.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/RewardContractIssueCommandTests.kt
@@ -17,6 +17,7 @@
 package io.onixlabs.corda.test.contract
 
 import io.onixlabs.corda.core.contract.SignatureData
+import io.onixlabs.corda.test.*
 import net.corda.core.contracts.hash
 import net.corda.testing.node.ledger
 import org.junit.jupiter.api.Test
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/RewardContractSpendCommandTests.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/contract/RewardContractSpendCommandTests.kt
@@ -17,6 +17,7 @@
 package io.onixlabs.corda.test.contract
 
 import io.onixlabs.corda.core.contract.SignatureData
+import io.onixlabs.corda.test.*
 import net.corda.core.contracts.hash
 import net.corda.testing.node.ledger
 import org.junit.jupiter.api.Test
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/general/AbstractPartyExtensionTests.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/general/AbstractPartyExtensionTests.kt
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.test.contract
+package io.onixlabs.corda.test.general
 
 import io.onixlabs.corda.core.contract.owningKeys
 import io.onixlabs.corda.core.contract.participantHash
+import io.onixlabs.corda.test.IDENTITY_A
+import io.onixlabs.corda.test.IDENTITY_B
+import io.onixlabs.corda.test.IDENTITY_C
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/general/ChainStateExtensionTests.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/general/ChainStateExtensionTests.kt
@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.test.contract
+package io.onixlabs.corda.test.general
 
 import io.onixlabs.corda.core.contract.ChainState
 import io.onixlabs.corda.core.contract.isPointingTo
+import io.onixlabs.corda.test.EMPTY_STATE_REF
+import io.onixlabs.corda.test.NOTARY
+import io.onixlabs.corda.test.RANDOM_STATE_REF
+import io.onixlabs.corda.test.contract.Customer
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.TransactionState
 import net.corda.core.crypto.NullKeys.NULL_PARTY
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/general/ContractIDTests.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/general/ContractIDTests.kt
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.test.contract
+package io.onixlabs.corda.test.general
 
+import io.onixlabs.corda.test.contract.CustomerContract
+import io.onixlabs.corda.test.contract.RewardContract
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
diff --git a/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/general/SignatureDataTests.kt b/onixlabs-corda-test-contract/src/test/kotlin/io/onixlabs/corda/test/general/SignatureDataTests.kt
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.test.contract
+package io.onixlabs.corda.test.general
 
 import io.onixlabs.corda.core.contract.SignatureData
+import io.onixlabs.corda.test.IDENTITY_A
+import io.onixlabs.corda.test.IDENTITY_B
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.sign
 import org.junit.jupiter.api.Test
@@ -34,7 +36,7 @@ class SignatureDataTests {
         val signatureData = SignatureData(content, signature)
 
         // Act
-        val result = signatureData.verify(IDENTITY_A.publicKey)
+        val result = signatureData.isValid(IDENTITY_A.publicKey)
 
         // Assert
         assertTrue(result)
@@ -49,7 +51,7 @@ class SignatureDataTests {
         val signatureData = SignatureData(content, signature)
 
         // Act
-        val result = signatureData.verify(IDENTITY_B.publicKey)
+        val result = signatureData.isValid(IDENTITY_B.publicKey)
 
         // Assert
         assertFalse(result)

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class RewardContract : Contract {`
`70`	`70`
`71`	`71`	`CONTRACT_RULE_OWNER using (rewardOutput.owner == customerReference.owner)`
`72`	`72`	`CONTRACT_RULE_SIGNATURE_DATA using (rewardOutput.hash().bytes.contentEquals(signature.content))`
`73`		`- CONTRACT_RULE_SIGNATURE_SIGNER using (signature.verify(rewardOutput.issuer.owningKey))`
	`73`	`+ CONTRACT_RULE_SIGNATURE_SIGNER using (signature.isValid(rewardOutput.issuer.owningKey))`
`74`	`74`	`CONTRACT_RULE_SIGNERS using (rewardOutput.participants.owningKeys.all { it in signers })`
`75`	`75`	`}`
`76`	`76`	`}`
`@@ -114,7 +114,7 @@ class RewardContract : Contract {`
`114`	`114`
`115`	`115`	`CONTRACT_RULE_OWNER using (rewardInput.owner == customerReference.owner)`
`116`	`116`	`CONTRACT_RULE_SIGNATURE_DATA using (rewardInput.hash().bytes.contentEquals(signature.content))`
`117`		`- CONTRACT_RULE_SIGNATURE_SIGNER using (signature.verify(rewardInput.owner.owningKey))`
	`117`	`+ CONTRACT_RULE_SIGNATURE_SIGNER using (signature.isValid(rewardInput.owner.owningKey))`
`118`	`118`	`CONTRACT_RULE_SIGNERS using (rewardInput.participants.owningKeys.all { it in signers })`
`119`	`119`	`}`
`120`	`120`	`}`