Handle errors in ParseAndCheckProgram

runtime/runtime.go

@@ -865,7 +865,19 @@ func hasValidStaticType(value interpreter.Value) bool {
 // ParseAndCheckProgram parses the given code and checks it.
 // Returns a program that can be interpreted (AST + elaboration).
 //
-func (r *interpreterRuntime) ParseAndCheckProgram(code []byte, context Context) (*interpreter.Program, error) {
+func (r *interpreterRuntime) ParseAndCheckProgram(
+	code []byte,
+	context Context,
+) (
+	program *interpreter.Program,
+	err error,
+) {
+	defer func() {
+		if recovered, ok := recover().(error); ok {
+			err = newError(recovered, context)
+		}
+	}()
+
 	context.InitializeCodesAndPrograms()
 
 	storage := r.newStorage(context.Interface)
@@ -880,7 +892,7 @@ func (r *interpreterRuntime) ParseAndCheckProgram(code []byte, context Context)
 		checkerOptions,
 	)
 
-	program, err := r.parseAndCheckProgram(
+	program, err = r.parseAndCheckProgram(
 		code,
 		context,
 		functions,

runtime/runtime_test.go

@@ -6857,6 +6857,7 @@ func TestRuntimeInternalErrors(t *testing.T) {
 			},
 		)
 
+		require.Error(t, err)
 		require.ErrorAs(t, err, &Error{})
 	})
 
@@ -6889,6 +6890,7 @@ func TestRuntimeInternalErrors(t *testing.T) {
 			},
 		)
 
+		require.Error(t, err)
 		require.ErrorAs(t, err, &Error{})
 	})
 
@@ -6925,13 +6927,13 @@ func TestRuntimeInternalErrors(t *testing.T) {
 			},
 		)
 
+		require.Error(t, err)
 		require.ErrorAs(t, err, &Error{})
 	})
 
 	t.Run("contract function", func(t *testing.T) {
-		t.Parallel()
 
-		runtime := newTestInterpreterRuntime()
+		t.Parallel()
 
 		addressValue := Address{
 			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
@@ -6963,7 +6965,7 @@ func TestRuntimeInternalErrors(t *testing.T) {
 				return nil
 			},
 			emitEvent: func(_ cadence.Event) error {
-				return nil;
+				return nil
 			},
 			log: func(message string) {
 				// panic due to Cadence implementation error
@@ -7002,6 +7004,32 @@ func TestRuntimeInternalErrors(t *testing.T) {
 			},
 		)
 
+		require.Error(t, err)
+		require.ErrorAs(t, err, &Error{})
+	})
+
+	t.Run("parse and check", func(t *testing.T) {
+
+		t.Parallel()
+
+		script := []byte("pub fun test() {}")
+		runtimeInterface := &testRuntimeInterface{
+			setProgram: func(location Location, program *interpreter.Program) error {
+				panic(errors.New("crash while setting program"))
+			},
+		}
+
+		nextTransactionLocation := newTransactionLocationGenerator()
+
+		_, err := runtime.ParseAndCheckProgram(
+			script,
+			Context{
+				Interface: runtimeInterface,
+				Location:  nextTransactionLocation(),
+			},
+		)
+
+		require.Error(t, err)
 		require.ErrorAs(t, err, &Error{})
 	})
 }