diff --git a/crates/json-rpc/src/packet.rs b/crates/json-rpc/src/packet.rs index 89cd8cfd01e..acd1b402491 100644 --- a/crates/json-rpc/src/packet.rs +++ b/crates/json-rpc/src/packet.rs @@ -50,9 +50,7 @@ impl RequestPacket { pub fn serialize(self) -> serde_json::Result> { match self { RequestPacket::Single(single) => Ok(single.take_request()), - RequestPacket::Batch(batch) => { - serde_json::to_string(&batch).and_then(RawValue::from_string) - } + RequestPacket::Batch(batch) => serde_json::value::to_raw_value(&batch), } } diff --git a/crates/json-rpc/src/request.rs b/crates/json-rpc/src/request.rs index 03d9a92ea48..a5753c0b6b2 100644 --- a/crates/json-rpc/src/request.rs +++ b/crates/json-rpc/src/request.rs @@ -49,16 +49,13 @@ where /// /// If serialization of the params fails. pub fn box_params(self) -> PartiallySerializedRequest { - Request { - meta: self.meta, - params: RawValue::from_string(serde_json::to_string(&self.params).unwrap()).unwrap(), - } + Request { meta: self.meta, params: serde_json::value::to_raw_value(&self.params).unwrap() } } /// Serialize the request, including the request parameters. pub fn serialize(self) -> serde_json::Result { - let request = serde_json::to_string(&self)?; - Ok(SerializedRequest { meta: self.meta, request: RawValue::from_string(request)? }) + let request = serde_json::value::to_raw_value(&self)?; + Ok(SerializedRequest { meta: self.meta, request }) } } diff --git a/crates/transport/src/utils.rs b/crates/transport/src/utils.rs index a667406c910..07727f0cd81 100644 --- a/crates/transport/src/utils.rs +++ b/crates/transport/src/utils.rs @@ -1,5 +1,8 @@ use serde::Serialize; -use serde_json::{self, value::RawValue}; +use serde_json::{ + self, + value::{to_raw_value, RawValue}, +}; use std::future::Future; use url::Url; @@ -11,8 +14,7 @@ pub fn to_json_raw_value(s: &S) -> TransportResult> where S: Serialize, { - RawValue::from_string(serde_json::to_string(s).map_err(TransportError::ser_err)?) - .map_err(TransportError::ser_err) + to_raw_value(s).map_err(TransportError::ser_err) } /// Guess whether the URL is local, based on the hostname.