From 32ea59d085856849dc0d1ae00018eb893ef1c89a Mon Sep 17 00:00:00 2001 From: Andrzej Cichocki Date: Fri, 8 Dec 2017 10:45:22 +0000 Subject: [PATCH] Inline some DUMMY constants. (#2200) --- .../core/serialization/TransactionSerializationTests.kt | 3 ++- .../serialization/UniquenessExceptionSerializationTest.kt | 7 +++++-- .../corda/core/transactions/CompatibleTransactionTests.kt | 5 +++++ .../kotlin/net/corda/core/transactions/TransactionTests.kt | 5 +++++ .../corda/node/services/events/NodeSchedulerServiceTest.kt | 5 +++-- .../src/test/kotlin/net/corda/irs/contract/IRSTests.kt | 4 ++++ .../src/main/kotlin/net/corda/testing/TestConstants.kt | 7 ------- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/core/src/test/kotlin/net/corda/core/serialization/TransactionSerializationTests.kt b/core/src/test/kotlin/net/corda/core/serialization/TransactionSerializationTests.kt index 631af14bfd..bfdc34d30a 100644 --- a/core/src/test/kotlin/net/corda/core/serialization/TransactionSerializationTests.kt +++ b/core/src/test/kotlin/net/corda/core/serialization/TransactionSerializationTests.kt @@ -1,6 +1,7 @@ package net.corda.core.serialization import net.corda.core.contracts.* +import net.corda.core.crypto.generateKeyPair import net.corda.core.identity.AbstractParty import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.TransactionBuilder @@ -87,7 +88,7 @@ class TransactionSerializationTests { assertFailsWith(IllegalArgumentException::class) { stx.copy(sigs = emptyList()) } - + val DUMMY_KEY_2 = generateKeyPair() // If the signature was replaced in transit, we don't like it. assertFailsWith(SignatureException::class) { val tx2 = TransactionBuilder(DUMMY_NOTARY).withItems(inputState, outputState, changeState, diff --git a/core/src/test/kotlin/net/corda/core/serialization/UniquenessExceptionSerializationTest.kt b/core/src/test/kotlin/net/corda/core/serialization/UniquenessExceptionSerializationTest.kt index 8c431b4e20..d0da8a2bcb 100644 --- a/core/src/test/kotlin/net/corda/core/serialization/UniquenessExceptionSerializationTest.kt +++ b/core/src/test/kotlin/net/corda/core/serialization/UniquenessExceptionSerializationTest.kt @@ -2,9 +2,11 @@ package net.corda.core.serialization import net.corda.core.contracts.StateRef import net.corda.core.crypto.SecureHash +import net.corda.core.crypto.generateKeyPair +import net.corda.core.identity.CordaX500Name +import net.corda.core.identity.Party import net.corda.core.node.services.UniquenessException import net.corda.core.node.services.UniquenessProvider -import net.corda.testing.DUMMY_PARTY import net.corda.testing.SerializationEnvironmentRule import org.junit.Rule import org.junit.Test @@ -19,7 +21,8 @@ class UniquenessExceptionSerializationTest { fun testSerializationRoundTrip() { val txhash = SecureHash.randomSHA256() val txHash2 = SecureHash.randomSHA256() - val stateHistory: Map = mapOf(StateRef(txhash, 0) to UniquenessProvider.ConsumingTx(txHash2, 1, DUMMY_PARTY)) + val dummyParty = Party(CordaX500Name("Dummy", "Madrid", "ES"), generateKeyPair().public) + val stateHistory: Map = mapOf(StateRef(txhash, 0) to UniquenessProvider.ConsumingTx(txHash2, 1, dummyParty)) val conflict = UniquenessProvider.Conflict(stateHistory) val instance = UniquenessException(conflict) diff --git a/core/src/test/kotlin/net/corda/core/transactions/CompatibleTransactionTests.kt b/core/src/test/kotlin/net/corda/core/transactions/CompatibleTransactionTests.kt index 7464126983..5461d280a1 100644 --- a/core/src/test/kotlin/net/corda/core/transactions/CompatibleTransactionTests.kt +++ b/core/src/test/kotlin/net/corda/core/transactions/CompatibleTransactionTests.kt @@ -15,6 +15,11 @@ import java.util.function.Predicate import kotlin.test.* class CompatibleTransactionTests { + private companion object { + val DUMMY_KEY_1 = generateKeyPair() + val DUMMY_KEY_2 = generateKeyPair() + } + @Rule @JvmField val testSerialization = SerializationEnvironmentRule() diff --git a/core/src/test/kotlin/net/corda/core/transactions/TransactionTests.kt b/core/src/test/kotlin/net/corda/core/transactions/TransactionTests.kt index 17cc1bb769..c5a4976876 100644 --- a/core/src/test/kotlin/net/corda/core/transactions/TransactionTests.kt +++ b/core/src/test/kotlin/net/corda/core/transactions/TransactionTests.kt @@ -16,6 +16,11 @@ import kotlin.test.assertFailsWith import kotlin.test.assertNotEquals class TransactionTests { + private companion object { + val DUMMY_KEY_1 = generateKeyPair() + val DUMMY_KEY_2 = generateKeyPair() + } + @Rule @JvmField val testSerialization = SerializationEnvironmentRule() diff --git a/node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt b/node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt index 2f686cf17f..c73f0a893a 100644 --- a/node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt +++ b/node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt @@ -4,6 +4,7 @@ import co.paralleluniverse.fibers.Suspendable import com.codahale.metrics.MetricRegistry import com.nhaarman.mockito_kotlin.* import net.corda.core.contracts.* +import net.corda.core.crypto.generateKeyPair import net.corda.core.flows.FlowLogic import net.corda.core.flows.FlowLogicRef import net.corda.core.flows.FlowLogicRefFactory @@ -20,7 +21,6 @@ import net.corda.node.internal.cordapp.CordappLoader import net.corda.node.internal.cordapp.CordappProviderImpl import net.corda.node.services.api.MonitoringService import net.corda.node.services.api.ServiceHubInternal -import net.corda.node.services.identity.InMemoryIdentityService import net.corda.node.services.network.NetworkMapCacheImpl import net.corda.node.services.persistence.DBCheckpointStorage import net.corda.node.services.statemachine.FlowLogicRefFactoryImpl @@ -50,6 +50,7 @@ import kotlin.test.assertTrue class NodeSchedulerServiceTest : SingletonSerializeAsToken() { companion object { + private val DUMMY_IDENTITY_1 = getTestPartyAndCertificate(Party(CordaX500Name("Dummy", "Madrid", "ES"), generateKeyPair().public)) private val myInfo = NodeInfo(listOf(MOCK_HOST_AND_PORT), listOf(DUMMY_IDENTITY_1), 1, serial = 1L) } @@ -292,7 +293,7 @@ class NodeSchedulerServiceTest : SingletonSerializeAsToken() { database.transaction { apply { val freshKey = kms.freshKey() - val state = TestState(FlowLogicRefFactoryImpl.createForRPC(TestFlowLogic::class.java, increment), instant, myInfo.chooseIdentity()) + val state = TestState(FlowLogicRefFactoryImpl.createForRPC(TestFlowLogic::class.java, increment), instant, DUMMY_IDENTITY_1.party) val builder = TransactionBuilder(null).apply { addOutputState(state, DummyContract.PROGRAM_ID, DUMMY_NOTARY) addCommand(Command(), freshKey) diff --git a/samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/contract/IRSTests.kt b/samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/contract/IRSTests.kt index 4f35dcc18e..9dd3180bd8 100644 --- a/samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/contract/IRSTests.kt +++ b/samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/contract/IRSTests.kt @@ -4,6 +4,9 @@ import com.nhaarman.mockito_kotlin.doReturn import com.nhaarman.mockito_kotlin.whenever import net.corda.core.contracts.Amount import net.corda.core.contracts.UniqueIdentifier +import net.corda.core.crypto.generateKeyPair +import net.corda.core.identity.CordaX500Name +import net.corda.core.identity.Party import net.corda.core.transactions.SignedTransaction import net.corda.core.transactions.TransactionBuilder import net.corda.core.utilities.seconds @@ -30,6 +33,7 @@ import java.time.LocalDate import java.util.* import kotlin.test.assertEquals +private val DUMMY_PARTY = Party(CordaX500Name("Dummy", "Madrid", "ES"), generateKeyPair().public) fun createDummyIRS(irsSelect: Int): InterestRateSwap.State { return when (irsSelect) { 1 -> { diff --git a/testing/test-utils/src/main/kotlin/net/corda/testing/TestConstants.kt b/testing/test-utils/src/main/kotlin/net/corda/testing/TestConstants.kt index 96f452e74c..83ec0a0bd1 100644 --- a/testing/test-utils/src/main/kotlin/net/corda/testing/TestConstants.kt +++ b/testing/test-utils/src/main/kotlin/net/corda/testing/TestConstants.kt @@ -22,10 +22,6 @@ import java.time.Instant // A dummy time at which we will be pretending test transactions are created. val TEST_TX_TIME: Instant get() = Instant.parse("2015-04-17T12:00:00.00Z") - -val DUMMY_KEY_1: KeyPair by lazy { generateKeyPair() } -val DUMMY_KEY_2: KeyPair by lazy { generateKeyPair() } - val DUMMY_NOTARY_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(20)) } /** Dummy notary identity for tests and simulations */ val DUMMY_NOTARY_IDENTITY: PartyAndCertificate get() = getTestPartyAndCertificate(DUMMY_NOTARY) @@ -79,6 +75,3 @@ val DEV_TRUST_ROOT: X509CertificateHolder by lazy { fun dummyCommand(vararg signers: PublicKey = arrayOf(generateKeyPair().public)) = Command(DummyCommandData, signers.toList()) object DummyCommandData : TypeOnlyCommandData() - -val DUMMY_IDENTITY_1: PartyAndCertificate get() = getTestPartyAndCertificate(DUMMY_PARTY) -val DUMMY_PARTY: Party get() = Party(CordaX500Name(organisation = "Dummy", locality = "Madrid", country = "ES"), DUMMY_KEY_1.public)