Fix builtin exceptions in Scenario service

digital-asset · May 21, 2021 · 852de80 · 852de80
1 parent fc4c0fb
commit 852de80
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/compiler/damlc/tests/daml-test-files/ExceptionSemantics.daml b/compiler/damlc/tests/daml-test-files/ExceptionSemantics.daml
@@ -3,7 +3,7 @@
 
 -- @SINCE-LF-FEATURE DAML_EXCEPTIONS
 -- @ERROR range=130:1-130:23; Unhandled exception: ExceptionSemantics:E
--- @ERROR range=145:1-145:25; CRASH: ArithmeticError while evaluating DIV_INT64(1,0).
+-- @ERROR range=145:1-145:25; Unhandled exception: ArithmeticError while evaluating (DIV_INT64 1 0).
 -- @ERROR range=182:1-182:11; Attempt to exercise a consumed contract
 module ExceptionSemantics where
 

diff --git a/compiler/scenario-service/client/src/DA/Daml/LF/PrettyScenario.hs b/compiler/scenario-service/client/src/DA/Daml/LF/PrettyScenario.hs
@@ -217,8 +217,9 @@ prettyScenarioErrorError (Just err) =  do
   case err of
     ScenarioErrorErrorCrash reason -> pure $ text "CRASH:" <-> ltext reason
     ScenarioErrorErrorUserError reason -> pure $ text "Aborted: " <-> ltext reason
-    ScenarioErrorErrorUnhandledException (ValueGeneralError reason) -> pure $ text "Aborted: " <-> ltext reason
-    ScenarioErrorErrorUnhandledException exc -> pure $ text "Unhandled exception: " <-> prettyValue' True 0 world exc
+    ScenarioErrorErrorUnhandledBuiltinException reason -> pure $ text $ "Unhandled exception: " <> TL.toStrict reason
+    ScenarioErrorErrorUnhandledUserException (ValueGeneralError reason) -> pure $ text "Aborted: " <-> ltext reason
+    ScenarioErrorErrorUnhandledUserException exc -> pure $ text "Unhandled exception: " <-> prettyValue' True 0 world exc
     ScenarioErrorErrorTemplatePrecondViolated ScenarioError_TemplatePreconditionViolated{..} -> do
       pure $
         "Template precondition violated in:"

diff --git a/compiler/scenario-service/protos/scenario_service.proto b/compiler/scenario-service/protos/scenario_service.proto
@@ -240,8 +240,9 @@ message ScenarioError {
     // Error was raised via the error builtin
     string user_error = 13;
 
-    // Unhandled exception
-    Value unhandled_exception = 26;
+    // Unhandled exceptions
+    string unhandled_builtin_exception = 26;
+    Value unhandled_user_exception = 27;
 
     // Errors related to update interpretation.
     TemplatePreconditionViolated template_precond_violated = 14;

diff --git a/...cenario-service/server/src/main/scala/com/digitalasset/daml/lf/scenario/Conversions.scala b/...cenario-service/server/src/main/scala/com/digitalasset/daml/lf/scenario/Conversions.scala
@@ -88,13 +88,10 @@ final class Conversions(
         setCrash(reason)
       case SError.DamlEUnhandledException(exc) =>
         exc match {
-          case SValue.SAnyException(_, sValue) =>
-            builder.setUnhandledException(convertValue(sValue.toValue))
           case error: SValue.SBuiltinException =>
-            // TODO https://github.com/digital-asset/daml/issues/8020
-            //  We should not crash here.
-            //  We however need conversion primitive for builtin exeception to be implemented.
-            setCrash(error.message)
+            builder.setUnhandledBuiltinException(error.message)
+          case SValue.SAnyException(_, sValue) =>
+            builder.setUnhandledUserException(convertValue(sValue.toValue))
         }
       case SError.DamlEUserError(msg) =>
         builder.setUserError(msg)

diff --git a/daml-lf/transaction/src/main/scala/com/digitalasset/daml/lf/transaction/Node.scala b/daml-lf/transaction/src/main/scala/com/digitalasset/daml/lf/transaction/Node.scala
@@ -387,4 +387,6 @@ final case class NodeId(index: Int)
 object NodeId {
   implicit def cidMapperInstance[In, Out]: CidMapper[NodeId, NodeId, In, Out] =
     CidMapper.trivialMapper
+
+  def cidMapperInstance[In, Out] = CidMapper.trivialMapper[Nothing, In, Out]
 }