From f7fe1078cd98f00d1b4c9ae722efdb7938b9871c Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Sat, 17 Feb 2024 16:37:43 -0700 Subject: [PATCH] clone, dont serialize --- rpc-toolkit/src/cli.rs | 9 ++------- rpc-toolkit/src/handler/adapters.rs | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/rpc-toolkit/src/cli.rs b/rpc-toolkit/src/cli.rs index cf050df..4581bef 100644 --- a/rpc-toolkit/src/cli.rs +++ b/rpc-toolkit/src/cli.rs @@ -1,7 +1,6 @@ use std::any::TypeId; use std::collections::VecDeque; use std::ffi::OsString; -use std::time::Duration; use clap::{CommandFactory, FromArgMatches}; use imbl_value::Value; @@ -13,7 +12,7 @@ use tokio::io::{AsyncBufReadExt, AsyncRead, AsyncWrite, AsyncWriteExt, BufReader use url::Url; use yajrc::{Id, RpcError}; -use crate::util::{internal_error, parse_error, Flat, PhantomData}; +use crate::util::{internal_error, parse_error, PhantomData}; use crate::{ AnyHandler, CliBindingsAny, DynHandler, HandleAny, HandleAnyArgs, Handler, HandlerArgs, HandlerArgsFor, HandlerTypes, IntoContext, Name, ParentHandler, PrintCliResult, @@ -226,11 +225,7 @@ where .collect::>(); match handle_args .context - .call_remote( - &full_method.join("."), - imbl_value::to_value(&Flat(handle_args.params, handle_args.inherited_params)) - .map_err(parse_error)?, - ) + .call_remote(&full_method.join("."), handle_args.raw_params.clone()) .await { Ok(a) => imbl_value::from_value(a) diff --git a/rpc-toolkit/src/handler/adapters.rs b/rpc-toolkit/src/handler/adapters.rs index 7f48550..2b05cd5 100644 --- a/rpc-toolkit/src/handler/adapters.rs +++ b/rpc-toolkit/src/handler/adapters.rs @@ -500,10 +500,7 @@ where EitherContext::C1(context) => { let full_method = parent_method.into_iter().chain(method).collect::>(); match context - .call_remote( - &full_method.join("."), - imbl_value::to_value(&raw_params).map_err(parse_error)?, - ) + .call_remote(&full_method.join("."), raw_params.clone()) .await { Ok(a) => imbl_value::from_value(a)