From b0e30dbbc63933642a35cd9c4deff21c009860a9 Mon Sep 17 00:00:00 2001 From: Casper Beyer Date: Fri, 14 May 2021 20:25:50 +0800 Subject: refactor(cli/ops): don't pass ops through json (#10629) --- cli/ops/testing.rs | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'cli/ops/testing.rs') diff --git a/cli/ops/testing.rs b/cli/ops/testing.rs index 3105fa67d..8f6a4e2b8 100644 --- a/cli/ops/testing.rs +++ b/cli/ops/testing.rs @@ -2,9 +2,6 @@ use crate::tools::test_runner::TestEvent; use crate::tools::test_runner::TestMessage; use deno_core::error::generic_error; use deno_core::error::AnyError; -use deno_core::serde_json; -use deno_core::serde_json::json; -use deno_core::serde_json::Value; use deno_core::JsRuntime; use deno_core::ModuleSpecifier; use deno_core::OpState; @@ -30,17 +27,15 @@ struct PermissionsHolder(Uuid, Permissions); pub fn op_pledge_test_permissions( state: &mut OpState, - args: Value, + args: PermissionsArg, _: (), ) -> Result { deno_runtime::ops::check_unstable(state, "Deno.test.permissions"); let token = Uuid::new_v4(); let parent_permissions = state.borrow::().clone(); - let worker_permissions = { - let permissions: PermissionsArg = serde_json::from_value(args)?; - create_worker_permissions(parent_permissions.clone(), permissions)? - }; + let worker_permissions = + create_worker_permissions(parent_permissions.clone(), args)?; state.put::(PermissionsHolder(token, parent_permissions)); @@ -78,10 +73,9 @@ struct PostTestMessageArgs { fn op_post_test_message( state: &mut OpState, - args: Value, + args: PostTestMessageArgs, _: (), -) -> Result { - let args: PostTestMessageArgs = serde_json::from_value(args)?; +) -> Result { let origin = state.borrow::().to_string(); let message = args.message; @@ -90,8 +84,8 @@ fn op_post_test_message( let sender = state.borrow::>().clone(); if sender.send(event).is_err() { - Ok(json!(false)) + Ok(false) } else { - Ok(json!(true)) + Ok(true) } } -- cgit v1.2.3