Merge branch 'dev' into more-datatypes-for-assets

OpenMined · Jun 20, 2024 · 1f51ef7 · 1f51ef7
2 parents a5de3f7 + 7640dc1
commit 1f51ef7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/syft/src/syft/service/code/user_code_service.py b/packages/syft/src/syft/service/code/user_code_service.py
@@ -519,10 +519,12 @@ def _call(
                 if not can_execute:
                     # We check output policy only in l2 deployment.
                     # code is from low side (L0 setup)
-                    if not code.is_output_policy_approved(context):
-                        return Err(
-                            "Execution denied: Your code is waiting for approval"
-                        )
+                    status = code.get_status(context)
+                    if not status.approved:
+                        # return Err(
+                        #     "Execution denied: Your code is waiting for approval"
+                        # )
+                        return Err(status.get_status_message().message)
                     is_valid = (
                         output_policy._is_valid(context) if output_policy else False
                     )

diff --git a/packages/syft/tests/syft/request/request_code_accept_deny_test.py b/packages/syft/tests/syft/request/request_code_accept_deny_test.py
@@ -202,4 +202,4 @@ def simple_function(data):
 
     result = ds_client.code.simple_function(data=action_obj)
     assert isinstance(result, SyftError)
-    assert "Execution denied" in result.message
+    assert "DENIED" in result.message