From 87d38d8ca6230f7003e1c50a54c0d875e95a1f79 Mon Sep 17 00:00:00 2001 From: Samir Talwar Date: Thu, 9 Apr 2020 09:27:50 +0200 Subject: [PATCH] kvutils: Don't measure submission interpretation twice. (#5496) This is already measured in the `run` method above. CHANGELOG_BEGIN CHANGELOG_END --- .../ProcessTransactionSubmission.scala | 41 ++++++++----------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/committing/ProcessTransactionSubmission.scala b/ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/committing/ProcessTransactionSubmission.scala index b220927510..ea4ea4bfdc 100644 --- a/ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/committing/ProcessTransactionSubmission.scala +++ b/ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/committing/ProcessTransactionSubmission.scala @@ -199,29 +199,24 @@ private[kvutils] class ProcessTransactionSubmission( value.getContractState.getContractKey -> Conversions.stateKeyToContractId(key) } - val ctx = Metrics.interpretTimer.time() - try { - engine - .validate( - transactionEntry.abs, - transactionEntry.ledgerEffectiveTime, - participantId, - transactionEntry.submissionSeedAndTime, - ) - .consume( - lookupContract(transactionEntry, inputState), - lookupPackage(transactionEntry, inputState), - lookupKey(transactionEntry, inputState, knownKeys), - ) - .fold( - err => - reject( - recordTime, - buildRejectionLogEntry(transactionEntry, RejectionReason.Disputed(err.msg))), - _ => pass) - } finally { - val _ = ctx.stop() - } + engine + .validate( + transactionEntry.abs, + transactionEntry.ledgerEffectiveTime, + participantId, + transactionEntry.submissionSeedAndTime, + ) + .consume( + lookupContract(transactionEntry, inputState), + lookupPackage(transactionEntry, inputState), + lookupKey(transactionEntry, inputState, knownKeys), + ) + .fold( + err => + reject( + recordTime, + buildRejectionLogEntry(transactionEntry, RejectionReason.Disputed(err.msg))), + _ => pass) } /** Validate the submission's conformance to the DAML model */