Remove unneeded Option returned by decodeTransactionRejectionEntry

digital-asset · Oct 14, 2021 · 7537e93 · 7537e93
1 parent 4b4861e
commit 7537e93
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/...-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/Conversions.scala b/...-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/Conversions.scala
@@ -469,8 +469,8 @@ private[state] object Conversions {
   def decodeTransactionRejectionEntry(
       entry: DamlTransactionRejectionEntry,
       errorVersionSwitch: ValueSwitch[Status],
-  ): Option[FinalReason] = {
-    val status = Some(entry.getReasonCase match {
+  ): FinalReason =
+    FinalReason(entry.getReasonCase match {
       case DamlTransactionRejectionEntry.ReasonCase.INVALID_LEDGER_TIME =>
         val rejection = entry.getInvalidLedgerTime
         invalidLedgerTimeStatus(entry, rejection, errorVersionSwitch)
@@ -524,8 +524,6 @@ private[state] object Conversions {
       case DamlTransactionRejectionEntry.ReasonCase.REASON_NOT_SET =>
         reasonNotSetStatus(entry, errorVersionSwitch)
     })
-    status.map(FinalReason)
-  }
 
   private def encodeParties(parties: Set[Ref.Party]): List[String] =
     (parties.toList: List[String]).sorted

diff --git a/...vutils/src/main/scala/com/daml/ledger/participant/state/kvutils/KeyValueConsumption.scala b/...vutils/src/main/scala/com/daml/ledger/participant/state/kvutils/KeyValueConsumption.scala
@@ -208,11 +208,11 @@ object KeyValueConsumption {
         }
 
       case DamlLogEntry.PayloadCase.TRANSACTION_REJECTION_ENTRY =>
-        transactionRejectionEntryToUpdate(
+        List(transactionRejectionEntryToUpdate(
           recordTime,
           entry.getTransactionRejectionEntry,
           errorVersionSwitch,
-        ).toList
+        ))
 
       case DamlLogEntry.PayloadCase.OUT_OF_TIME_BOUNDS_ENTRY =>
         outOfTimeBoundsEntryToUpdate(
@@ -244,15 +244,14 @@ object KeyValueConsumption {
       recordTime: Timestamp,
       rejEntry: DamlTransactionRejectionEntry,
       errorVersionSwitch: ValueSwitch[Status],
-  ): Option[Update] = Conversions
-    .decodeTransactionRejectionEntry(rejEntry, errorVersionSwitch)
-    .map { reason =>
-      Update.CommandRejected(
-        recordTime = recordTime,
-        completionInfo = parseCompletionInfo(parseInstant(recordTime), rejEntry.getSubmitterInfo),
-        reasonTemplate = reason,
-      )
-    }
+  ): Update = {
+    val reason = Conversions.decodeTransactionRejectionEntry(rejEntry, errorVersionSwitch)
+    Update.CommandRejected(
+      recordTime = recordTime,
+      completionInfo = parseCompletionInfo(parseInstant(recordTime), rejEntry.getSubmitterInfo),
+      reasonTemplate = reason,
+    )
+  }
 
   /** Transform the transaction entry into the [[Update.TransactionAccepted]] event. */
   private def transactionEntryToUpdate(