testdsl: Clean up TestUtils.kt

contracts/src/main/kotlin/com/r3corda/contracts/testing/TestUtils.kt

@@ -1,15 +1,10 @@
 package com.r3corda.contracts.testing
 
 import com.r3corda.contracts.*
-import com.r3corda.contracts.asset.CASH_PROGRAM_ID
 import com.r3corda.contracts.asset.Cash
 import com.r3corda.contracts.asset.Obligation
 import com.r3corda.core.contracts.Amount
-import com.r3corda.core.contracts.Contract
 import com.r3corda.core.contracts.ContractState
-import com.r3corda.core.contracts.DUMMY_PROGRAM_ID
-import com.r3corda.core.contracts.DummyContract
-import com.r3corda.core.contracts.DummyState
 import com.r3corda.core.contracts.PartyAndReference
 import com.r3corda.core.contracts.Issued
 import com.r3corda.core.contracts.TransactionState
@@ -57,8 +52,8 @@ fun generateState() = DummyState(Random().nextInt())
 // For Java compatibility please define helper methods here and then define the infix notation
 object JavaTestHelpers {
     @JvmStatic fun ownedBy(state: Cash.State, owner: PublicKey) = state.copy(owner = owner)
-    @JvmStatic fun issuedBy(state: Cash.State, party: Party) = state.copy(amount = Amount<Issued<Currency>>(state.amount.quantity, state.issuanceDef.copy(issuer = state.deposit.copy(party = party))))
+    @JvmStatic fun issuedBy(state: Cash.State, party: Party) = state.copy(amount = Amount(state.amount.quantity, state.issuanceDef.copy(issuer = state.deposit.copy(party = party))))
-    @JvmStatic fun issuedBy(state: Cash.State, deposit: PartyAndReference) = state.copy(amount = Amount<Issued<Currency>>(state.amount.quantity, state.issuanceDef.copy(issuer = deposit)))
+    @JvmStatic fun issuedBy(state: Cash.State, deposit: PartyAndReference) = state.copy(amount = Amount(state.amount.quantity, state.issuanceDef.copy(issuer = deposit)))
     @JvmStatic fun withNotary(state: Cash.State, notary: Party) = TransactionState(state, notary)
     @JvmStatic fun withDeposit(state: Cash.State, deposit: PartyAndReference) = state.copy(amount = state.amount.copy(token = state.amount.token.copy(issuer = deposit)))
 
@@ -70,12 +65,12 @@ object JavaTestHelpers {
 
     @JvmStatic fun ownedBy(state: CommercialPaper.State, owner: PublicKey) = state.copy(owner = owner)
     @JvmStatic fun withNotary(state: CommercialPaper.State, notary: Party) = TransactionState(state, notary)
-    @JvmStatic fun ownedBy(state: ICommercialPaperState, new_owner: PublicKey) = state.withOwner(new_owner)
+    @JvmStatic fun ownedBy(state: ICommercialPaperState, new_owner: PublicKey): ICommercialPaperState = state.withOwner(new_owner)
 
     @JvmStatic fun withNotary(state: ContractState, notary: Party) = TransactionState(state, notary)
 
     @JvmStatic fun CASH(amount: Amount<Currency>) = Cash.State(
-            Amount<Issued<Currency>>(amount.quantity, Issued<Currency>(DUMMY_CASH_ISSUER, amount.token)),
+            Amount(amount.quantity, Issued(DUMMY_CASH_ISSUER, amount.token)),
             NullPublicKey)
     @JvmStatic fun STATE(amount: Amount<Issued<Currency>>) = Cash.State(amount, NullPublicKey)
 
@@ -86,7 +81,6 @@ object JavaTestHelpers {
             OBLIGATION_DEF(amount.token), amount.quantity, NullPublicKey)
 }
 
-
 infix fun Cash.State.`owned by`(owner: PublicKey) = JavaTestHelpers.ownedBy(this, owner)
 infix fun Cash.State.`issued by`(party: Party) = JavaTestHelpers.issuedBy(this, party)
 infix fun Cash.State.`issued by`(deposit: PartyAndReference) = JavaTestHelpers.issuedBy(this, deposit)

core/src/main/kotlin/com/r3corda/core/testing/TestUtils.kt

@@ -15,26 +15,6 @@ import java.security.KeyPair
 import java.security.PublicKey
 import java.time.Instant
 
-/** If an exception is thrown by the body, rethrows the root cause exception. */
-inline fun <R> rootCauseExceptions(body: () -> R): R {
-    try {
-        return body()
-    } catch(e: Exception) {
-        throw Throwables.getRootCause(e)
-    }
-}
-
-fun freeLocalHostAndPort(): HostAndPort {
-    val freePort = ServerSocket(0).use { it.localPort }
-    return HostAndPort.fromParts("localhost", freePort)
-}
-
-object TestUtils {
-    val keypair = generateKeyPair()
-    val keypair2 = generateKeyPair()
-    val keypair3 = generateKeyPair()
-}
-
 /**
  *  JAVA INTEROP. Please keep the following points in mind when extending the Kotlin DSL
  *
@@ -58,18 +38,22 @@ object JavaTestHelpers {
     @JvmStatic val TEST_TX_TIME: Instant get() = Instant.parse("2015-04-17T12:00:00.00Z")
 
     // A few dummy values for testing.
-    @JvmStatic val MEGA_CORP_KEY: KeyPair get() = TestUtils.keypair
+    @JvmStatic val MEGA_CORP_KEY: KeyPair by lazy { generateKeyPair() }
     @JvmStatic val MEGA_CORP_PUBKEY: PublicKey get() = MEGA_CORP_KEY.public
 
-    @JvmStatic val MINI_CORP_KEY: KeyPair get() = TestUtils.keypair2
+    @JvmStatic val MINI_CORP_KEY: KeyPair by lazy { generateKeyPair() }
     @JvmStatic val MINI_CORP_PUBKEY: PublicKey get() = MINI_CORP_KEY.public
 
-    @JvmStatic val ORACLE_KEY: KeyPair get() = TestUtils.keypair3
+    @JvmStatic val ORACLE_KEY: KeyPair by lazy { generateKeyPair() }
     @JvmStatic val ORACLE_PUBKEY: PublicKey get() = ORACLE_KEY.public
 
     @JvmStatic val DUMMY_PUBKEY_1: PublicKey get() = DummyPublicKey("x1")
     @JvmStatic val DUMMY_PUBKEY_2: PublicKey get() = DummyPublicKey("x2")
 
+    @JvmStatic val DUMMY_KEY_1: KeyPair by lazy { generateKeyPair() }
+    @JvmStatic val DUMMY_KEY_2: KeyPair by lazy { generateKeyPair() }
+    @JvmStatic val DUMMY_KEY_3: KeyPair by lazy { generateKeyPair() }
+
     @JvmStatic val ALICE_KEY: KeyPair by lazy { generateKeyPair() }
     @JvmStatic val ALICE_PUBKEY: PublicKey get() = ALICE_KEY.public
     @JvmStatic val ALICE: Party get() = Party("Alice", ALICE_PUBKEY)
@@ -90,6 +74,20 @@ object JavaTestHelpers {
 
     @JvmStatic fun generateStateRef() = StateRef(SecureHash.randomSHA256(), 0)
 
+    /** If an exception is thrown by the body, rethrows the root cause exception. */
+    @JvmStatic inline fun <R> rootCauseExceptions(body: () -> R): R {
+        try {
+            return body()
+        } catch(e: Exception) {
+            throw Throwables.getRootCause(e)
+        }
+    }
+
+    @JvmStatic fun freeLocalHostAndPort(): HostAndPort {
+        val freePort = ServerSocket(0).use { it.localPort }
+        return HostAndPort.fromParts("localhost", freePort)
+    }
+
     @JvmStatic @JvmOverloads fun ledger(
             identityService: IdentityService = MOCK_IDENTITY_SERVICE,
             storageService: StorageService = MockStorageService(),
@@ -119,6 +117,9 @@ val ORACLE_KEY = JavaTestHelpers.ORACLE_KEY
 val ORACLE_PUBKEY = JavaTestHelpers.ORACLE_PUBKEY
 val DUMMY_PUBKEY_1 = JavaTestHelpers.DUMMY_PUBKEY_1
 val DUMMY_PUBKEY_2 = JavaTestHelpers.DUMMY_PUBKEY_2
+val DUMMY_KEY_1 = JavaTestHelpers.DUMMY_KEY_1
+val DUMMY_KEY_2 = JavaTestHelpers.DUMMY_KEY_2
+val DUMMY_KEY_3 = JavaTestHelpers.DUMMY_KEY_3
 val ALICE_KEY = JavaTestHelpers.ALICE_KEY
 val ALICE_PUBKEY = JavaTestHelpers.ALICE_PUBKEY
 val ALICE = JavaTestHelpers.ALICE
@@ -133,12 +134,5 @@ val ALL_TEST_KEYS = JavaTestHelpers.ALL_TEST_KEYS
 val MOCK_IDENTITY_SERVICE = JavaTestHelpers.MOCK_IDENTITY_SERVICE
 
 fun generateStateRef() = JavaTestHelpers.generateStateRef()
-
+fun freeLocalHostAndPort() = JavaTestHelpers.freeLocalHostAndPort()
-class LabeledOutput(val label: String?, val state: TransactionState<*>) {
+inline fun <R> rootCauseExceptions(body: () -> R) = JavaTestHelpers.rootCauseExceptions(body)
-    override fun toString() = state.toString() + (if (label != null) " ($label)" else "")
-    override fun equals(other: Any?) = other is LabeledOutput && state.equals(other.state)
-    override fun hashCode(): Int = state.hashCode()
-}
-
-infix fun TransactionState<*>.label(label: String) = LabeledOutput(label, this)
-

core/src/test/kotlin/com/r3corda/core/serialization/TransactionSerializationTests.kt

@@ -47,7 +47,7 @@ class TransactionSerializationTests {
     val fakeStateRef = generateStateRef()
     val inputState = StateAndRef(TransactionState(TestCash.State(depositRef, 100.POUNDS, DUMMY_PUBKEY_1), DUMMY_NOTARY), fakeStateRef)
     val outputState = TransactionState(TestCash.State(depositRef, 600.POUNDS, DUMMY_PUBKEY_1), DUMMY_NOTARY)
-    val changeState = TransactionState(TestCash.State(depositRef, 400.POUNDS, TestUtils.keypair.public), DUMMY_NOTARY)
+    val changeState = TransactionState(TestCash.State(depositRef, 400.POUNDS, DUMMY_KEY_1.public), DUMMY_NOTARY)
 
 
     lateinit var tx: TransactionBuilder
@@ -55,14 +55,14 @@ class TransactionSerializationTests {
     @Before
     fun setup() {
         tx = TransactionType.General.Builder().withItems(
-                inputState, outputState, changeState, Command(TestCash.Commands.Move(), arrayListOf(TestUtils.keypair.public))
+                inputState, outputState, changeState, Command(TestCash.Commands.Move(), arrayListOf(DUMMY_KEY_1.public))
         )
     }
 
     @Test
     fun signWireTX() {
         tx.signWith(DUMMY_NOTARY_KEY)
-        tx.signWith(TestUtils.keypair)
+        tx.signWith(DUMMY_KEY_1)
         val signedTX = tx.toSignedTransaction()
 
         // Now check that the signature we just made verifies.
@@ -82,7 +82,7 @@ class TransactionSerializationTests {
             tx.toSignedTransaction()
         }
 
-        tx.signWith(TestUtils.keypair)
+        tx.signWith(DUMMY_KEY_1)
         tx.signWith(DUMMY_NOTARY_KEY)
         val signedTX = tx.toSignedTransaction()
 
@@ -94,9 +94,9 @@ class TransactionSerializationTests {
         // If the signature was replaced in transit, we don't like it.
         assertFailsWith(SignatureException::class) {
             val tx2 = TransactionType.General.Builder().withItems(inputState, outputState, changeState,
-                    Command(TestCash.Commands.Move(), TestUtils.keypair2.public))
+                    Command(TestCash.Commands.Move(), DUMMY_KEY_2.public))
             tx2.signWith(DUMMY_NOTARY_KEY)
-            tx2.signWith(TestUtils.keypair2)
+            tx2.signWith(DUMMY_KEY_2)
 
             signedTX.copy(sigs = tx2.toSignedTransaction().sigs).verify()
         }
@@ -105,7 +105,7 @@ class TransactionSerializationTests {
     @Test
     fun timestamp() {
         tx.setTime(TEST_TX_TIME, DUMMY_NOTARY, 30.seconds)
-        tx.signWith(TestUtils.keypair)
+        tx.signWith(DUMMY_KEY_1)
         tx.signWith(DUMMY_NOTARY_KEY)
         val stx = tx.toSignedTransaction()
         val ltx = stx.verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, MockStorageService().attachments)