mirror of
https://github.com/corda/corda.git
synced 2025-04-05 10:27:11 +00:00
ENT-1791 Stop performance tests returning whole transactions (#752)
This commit is contained in:
Rick Parker
GitHub
parent
f64226364b
commit
51df3872b2
@ -12,6 +12,7 @@ package com.r3.corda.enterprise.perftestcordapp.flows
|
||||
|
||||
import co.paralleluniverse.fibers.Suspendable
|
||||
import net.corda.core.contracts.Amount
|
||||
import net.corda.core.crypto.SecureHash
|
||||
import net.corda.core.flows.FinalityFlow
|
||||
import net.corda.core.flows.FlowException
|
||||
import net.corda.core.flows.FlowLogic
|
||||
@ -55,7 +56,7 @@ abstract class AbstractCashFlow<out T>(override val progressTracker: ProgressTra
|
||||
* transaction, otherwise this is the well known identity.
|
||||
*/
|
||||
@CordaSerializable
|
||||
data class Result(val stx: SignedTransaction, val recipient: AbstractParty?)
|
||||
data class Result(val id: SecureHash, val recipient: AbstractParty?)
|
||||
|
||||
abstract class AbstractRequest(val amount: Amount<Currency>)
|
||||
}
|
||||
|
||||
@ -11,6 +11,9 @@
|
||||
package com.r3.corda.enterprise.perftestcordapp.flows
|
||||
|
||||
import co.paralleluniverse.fibers.Suspendable
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.Cash
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.cash.selection.AbstractCashSelection
|
||||
import com.r3.corda.enterprise.perftestcordapp.issuedBy
|
||||
import net.corda.core.contracts.Amount
|
||||
import net.corda.core.contracts.InsufficientBalanceException
|
||||
import net.corda.core.flows.StartableByRPC
|
||||
@ -23,9 +26,6 @@ import net.corda.core.serialization.CordaSerializable
|
||||
import net.corda.core.transactions.TransactionBuilder
|
||||
import net.corda.core.utilities.OpaqueBytes
|
||||
import net.corda.core.utilities.ProgressTracker
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.Cash
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.cash.selection.AbstractCashSelection
|
||||
import com.r3.corda.enterprise.perftestcordapp.issuedBy
|
||||
import java.util.*
|
||||
|
||||
/**
|
||||
@ -84,7 +84,7 @@ class CashExitFlow(private val amount: Amount<Currency>,
|
||||
// Commit the transaction
|
||||
progressTracker.currentStep = FINALISING_TX
|
||||
val notarised = finaliseTx(tx, participants, "Unable to notarise exit")
|
||||
return Result(notarised, null)
|
||||
return Result(notarised.id, null)
|
||||
}
|
||||
|
||||
@CordaSerializable
|
||||
|
||||
@ -15,9 +15,7 @@ import com.r3.corda.enterprise.perftestcordapp.contracts.asset.Cash
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.OnLedgerAsset
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.PartyAndAmount
|
||||
import net.corda.confidential.SwapIdentitiesFlow
|
||||
import net.corda.core.contracts.Amount
|
||||
import net.corda.core.contracts.Issued
|
||||
import net.corda.core.contracts.TransactionState
|
||||
import net.corda.core.contracts.*
|
||||
import net.corda.core.flows.FlowException
|
||||
import net.corda.core.flows.NotaryError
|
||||
import net.corda.core.flows.NotaryException
|
||||
@ -56,7 +54,7 @@ class CashIssueAndDoublePayment(val amount: Amount<Currency>,
|
||||
= txState.copy(data = txState.data.copy(amount = amt, owner = owner))
|
||||
|
||||
val issueResult = subFlow(CashIssueFlow(amount, issueRef, notary))
|
||||
val cashStateAndRef = issueResult.stx.tx.outRef<Cash.State>(0)
|
||||
val cashStateAndRef = serviceHub.loadStates(setOf(StateRef(issueResult.id, 0))).single() as StateAndRef<Cash.State>
|
||||
|
||||
progressTracker.currentStep = GENERATING_ID
|
||||
val txIdentities = if (anonymous) {
|
||||
@ -93,7 +91,7 @@ class CashIssueAndDoublePayment(val amount: Amount<Currency>,
|
||||
val cause = expected.cause
|
||||
if (cause is NotaryException) {
|
||||
if (cause.error is NotaryError.Conflict) {
|
||||
return Result(notarised1, recipient)
|
||||
return Result(notarised1.id, recipient)
|
||||
}
|
||||
throw expected // Wasn't actually expected!
|
||||
}
|
||||
|
||||
@ -15,9 +15,7 @@ import com.r3.corda.enterprise.perftestcordapp.contracts.asset.Cash
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.OnLedgerAsset
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.PartyAndAmount
|
||||
import net.corda.confidential.SwapIdentitiesFlow
|
||||
import net.corda.core.contracts.Amount
|
||||
import net.corda.core.contracts.Issued
|
||||
import net.corda.core.contracts.TransactionState
|
||||
import net.corda.core.contracts.*
|
||||
import net.corda.core.flows.StartableByRPC
|
||||
import net.corda.core.identity.AbstractParty
|
||||
import net.corda.core.identity.AnonymousParty
|
||||
@ -53,7 +51,7 @@ class CashIssueAndDuplicatePayment(val amount: Amount<Currency>,
|
||||
= txState.copy(data = txState.data.copy(amount = amt, owner = owner))
|
||||
|
||||
val issueResult = subFlow(CashIssueFlow(amount, issueRef, notary))
|
||||
val cashStateAndRef = issueResult.stx.tx.outRef<Cash.State>(0)
|
||||
val cashStateAndRef = serviceHub.loadStates(setOf(StateRef(issueResult.id, 0))).single() as StateAndRef<Cash.State>
|
||||
|
||||
progressTracker.currentStep = GENERATING_ID
|
||||
val txIdentities = if (anonymous) {
|
||||
@ -79,6 +77,6 @@ class CashIssueAndDuplicatePayment(val amount: Amount<Currency>,
|
||||
val notarised1 = finaliseTx(tx, setOf(recipient), "Unable to notarise spend first time")
|
||||
val notarised2 = finaliseTx(tx, setOf(recipient), "Unable to notarise spend second time")
|
||||
|
||||
return Result(notarised2, recipient)
|
||||
return Result(notarised2.id, recipient)
|
||||
}
|
||||
}
|
||||
@ -15,9 +15,7 @@ import com.r3.corda.enterprise.perftestcordapp.contracts.asset.Cash
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.OnLedgerAsset
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.PartyAndAmount
|
||||
import net.corda.confidential.SwapIdentitiesFlow
|
||||
import net.corda.core.contracts.Amount
|
||||
import net.corda.core.contracts.Issued
|
||||
import net.corda.core.contracts.TransactionState
|
||||
import net.corda.core.contracts.*
|
||||
import net.corda.core.flows.StartableByRPC
|
||||
import net.corda.core.identity.AbstractParty
|
||||
import net.corda.core.identity.AnonymousParty
|
||||
@ -53,7 +51,7 @@ class CashIssueAndPaymentNoSelection(val amount: Amount<Currency>,
|
||||
|
||||
progressTracker.currentStep = GENERATING_TX
|
||||
val issueResult = subFlow(CashIssueFlow(amount, issueRef, notary))
|
||||
val cashStateAndRef = issueResult.stx.tx.outRef<Cash.State>(0)
|
||||
val cashStateAndRef = serviceHub.loadStates(setOf(StateRef(issueResult.id, 0))).single() as StateAndRef<Cash.State>
|
||||
|
||||
progressTracker.currentStep = GENERATING_ID
|
||||
val txIdentities = if (anonymous) {
|
||||
@ -77,6 +75,6 @@ class CashIssueAndPaymentNoSelection(val amount: Amount<Currency>,
|
||||
|
||||
progressTracker.currentStep = FINALISING_TX
|
||||
val notarised = finaliseTx(tx, setOf(recipient), "Unable to notarise spend")
|
||||
return Result(notarised, recipient)
|
||||
return Result(notarised.id, recipient)
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,6 +11,8 @@
|
||||
package com.r3.corda.enterprise.perftestcordapp.flows
|
||||
|
||||
import co.paralleluniverse.fibers.Suspendable
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.Cash
|
||||
import com.r3.corda.enterprise.perftestcordapp.issuedBy
|
||||
import net.corda.core.contracts.Amount
|
||||
import net.corda.core.flows.StartableByRPC
|
||||
import net.corda.core.identity.Party
|
||||
@ -18,8 +20,6 @@ import net.corda.core.serialization.CordaSerializable
|
||||
import net.corda.core.transactions.TransactionBuilder
|
||||
import net.corda.core.utilities.OpaqueBytes
|
||||
import net.corda.core.utilities.ProgressTracker
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.Cash
|
||||
import com.r3.corda.enterprise.perftestcordapp.issuedBy
|
||||
import java.util.*
|
||||
|
||||
/**
|
||||
@ -54,7 +54,7 @@ class CashIssueFlow(private val amount: Amount<Currency>,
|
||||
progressTracker.currentStep = FINALISING_TX
|
||||
// There is no one to send the tx to as we're the only participants
|
||||
val notarised = finaliseTx(tx, emptySet(), "Unable to notarise issue")
|
||||
return Result(notarised, ourIdentity)
|
||||
return Result(notarised.id, ourIdentity)
|
||||
}
|
||||
|
||||
@CordaSerializable
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
package com.r3.corda.enterprise.perftestcordapp.flows
|
||||
|
||||
import co.paralleluniverse.fibers.Suspendable
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.Cash
|
||||
import net.corda.confidential.SwapIdentitiesFlow
|
||||
import net.corda.core.contracts.Amount
|
||||
import net.corda.core.contracts.InsufficientBalanceException
|
||||
@ -20,7 +21,6 @@ import net.corda.core.identity.Party
|
||||
import net.corda.core.serialization.CordaSerializable
|
||||
import net.corda.core.transactions.TransactionBuilder
|
||||
import net.corda.core.utilities.ProgressTracker
|
||||
import com.r3.corda.enterprise.perftestcordapp.contracts.asset.Cash
|
||||
import java.util.*
|
||||
|
||||
/**
|
||||
@ -73,7 +73,7 @@ open class CashPaymentFlow(
|
||||
|
||||
progressTracker.currentStep = FINALISING_TX
|
||||
val notarised = finaliseTx(tx, setOf(recipient), "Unable to notarise spend")
|
||||
return Result(notarised, anonymousRecipient)
|
||||
return Result(notarised.id, anonymousRecipient)
|
||||
}
|
||||
|
||||
@CordaSerializable
|
||||
|
||||
@ -56,7 +56,7 @@ class CashExitFlowTests {
|
||||
val exitAmount = 500.DOLLARS
|
||||
val future = bankOfCordaNode.startFlow(CashExitFlow(exitAmount, ref))
|
||||
mockNet.runNetwork()
|
||||
val exitTx = future.getOrThrow().stx.tx
|
||||
val exitTx = bankOfCordaNode.services.validatedTransactions.getTransaction(future.getOrThrow().id)!!.tx
|
||||
val expected = (initialBalance - exitAmount).`issued by`(bankOfCorda.ref(ref))
|
||||
assertEquals(1, exitTx.inputs.size)
|
||||
assertEquals(1, exitTx.outputs.size)
|
||||
|
||||
@ -53,7 +53,7 @@ class CashIssueFlowTests {
|
||||
val ref = OpaqueBytes.of(0x01)
|
||||
val future = bankOfCordaNode.startFlow(CashIssueFlow(expected, ref, notary))
|
||||
mockNet.runNetwork()
|
||||
val issueTx = future.getOrThrow().stx
|
||||
val issueTx = bankOfCordaNode.services.validatedTransactions.getTransaction(future.getOrThrow().id)!!
|
||||
val output = issueTx.tx.outputsOfType<Cash.State>().single()
|
||||
assertEquals(expected.`issued by`(bankOfCorda.ref(ref)), output.amount)
|
||||
}
|
||||
|
||||
1093
tools/jmeter/src/main/resources/Testplans/NightlyBenchmark.jmx
Normal file
1093
tools/jmeter/src/main/resources/Testplans/NightlyBenchmark.jmx
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user