2 files changed, 14 insertions, 11 deletions
diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs
index 8b329a7ca..e47cc8f3c 100644
--- a/ext/crypto/lib.rs
+++ b/ext/crypto/lib.rs
@@ -8,7 +8,6 @@ use deno_core::error::custom_error;
 use deno_core::error::not_supported;
 use deno_core::error::type_error;
 use deno_core::error::AnyError;
-use deno_core::op;
 use deno_core::op2;
 use deno_core::ToJsBuffer;
 
@@ -46,7 +45,6 @@ use sha2::Sha512;
 use signature::RandomizedSigner;
 use signature::Signer;
 use signature::Verifier;
-use std::convert::TryFrom;
 use std::num::NonZeroU32;
 use std::path::PathBuf;
 
@@ -422,10 +420,11 @@ pub struct DeriveKeyArg {
   info: Option<JsBuffer>,
 }
 
-#[op]
+#[op2(async)]
+#[serde]
 pub async fn op_crypto_derive_bits(
-  args: DeriveKeyArg,
-  zero_copy: Option<JsBuffer>,
+  #[serde] args: DeriveKeyArg,
+  #[buffer] zero_copy: Option<JsBuffer>,
 ) -> Result<ToJsBuffer, AnyError> {
   let algorithm = args.algorithm;
   match algorithm {
diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs
index 4485a3dbe..dd3526ff8 100644
--- a/ext/fetch/lib.rs
+++ b/ext/fetch/lib.rs
@@ -21,6 +21,7 @@ use deno_core::futures::FutureExt;
 use deno_core::futures::Stream;
 use deno_core::futures::StreamExt;
 use deno_core::op;
+use deno_core::op2;
 use deno_core::BufView;
 use deno_core::WriteOutcome;
 
@@ -411,10 +412,11 @@ pub struct FetchResponse {
   pub remote_addr_port: Option<u16>,
 }
 
-#[op]
+#[op2(async)]
+#[serde]
 pub async fn op_fetch_send(
   state: Rc<RefCell<OpState>>,
-  rid: ResourceId,
+  #[smi] rid: ResourceId,
 ) -> Result<FetchResponse, AnyError> {
   let request = state
     .borrow_mut()
@@ -463,10 +465,11 @@ pub async fn op_fetch_send(
   })
 }
 
-#[op]
+#[op2(async)]
+#[smi]
 pub async fn op_fetch_response_upgrade(
   state: Rc<RefCell<OpState>>,
-  rid: ResourceId,
+  #[smi] rid: ResourceId,
 ) -> Result<ResourceId, AnyError> {
   let raw_response = state
     .borrow_mut()
@@ -811,10 +814,11 @@ fn default_true() -> bool {
   true
 }
 
-#[op]
+#[op2]
+#[smi]
 pub fn op_fetch_custom_client<FP>(
   state: &mut OpState,
-  args: CreateHttpClientArgs,
+  #[serde] args: CreateHttpClientArgs,
 ) -> Result<ResourceId, AnyError>
 where
   FP: FetchPermissions + 'static,