tornadocontrib/ web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more Cow

This commit is contained in:
Bryan Stitt 2023-10-23 15:30:01 -07:00
parent 4b44e787cb
commit cef4edc17a
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web3_proxy/src/jsonrpc/mod.rs
View File

@ -32,7 +32,7 @@ mod tests {
#[test] #[test]
fn serialize_response() { fn serialize_response() {
let obj = ParsedResponse { let obj = ParsedResponse {
jsonrpc: "2.0".to_string(), jsonrpc: "2.0".into(),
id: Default::default(), id: Default::default(),
payload: ResponsePayload::Success { payload: ResponsePayload::Success {
result: serde_json::value::RawValue::from_string("100".to_string()).unwrap(), result: serde_json::value::RawValue::from_string("100".to_string()).unwrap(),

16
web3_proxy/src/jsonrpc/response.rs
View File

@ -10,6 +10,7 @@ use futures_util::stream::{self, StreamExt};
use futures_util::TryStreamExt; use futures_util::TryStreamExt;
use serde::{de, Deserialize, Serialize}; use serde::{de, Deserialize, Serialize};
use serde_json::value::RawValue; use serde_json::value::RawValue;
use std::borrow::Cow;
use std::fmt; use std::fmt;
use std::marker::PhantomData; use std::marker::PhantomData;
use std::sync::Arc; use std::sync::Arc;
@ -21,13 +22,14 @@ pub trait JsonRpcResultData = serde::Serialize + serde::de::DeserializeOwned + f
/// TODO: lots of overlap with `SingleForwardedResponse` /// TODO: lots of overlap with `SingleForwardedResponse`
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
pub struct ParsedResponse<T = Arc<RawValue>> { pub struct ParsedResponse<T = Arc<RawValue>> {
pub jsonrpc: String, pub jsonrpc: Cow<'static, str>,
pub id: Box<RawValue>, pub id: Box<RawValue>,
#[serde(flatten)] #[serde(flatten)]
pub payload: ResponsePayload<T>, pub payload: ResponsePayload<T>,
} }
impl ParsedResponse { impl ParsedResponse {
#[inline]
pub fn from_value(value: serde_json::Value, id: Box<RawValue>) -> Self { pub fn from_value(value: serde_json::Value, id: Box<RawValue>) -> Self {
let result = serde_json::value::to_raw_value(&value) let result = serde_json::value::to_raw_value(&value)
.expect("this should not fail") .expect("this should not fail")
@ -37,6 +39,7 @@ impl ParsedResponse {
} }
impl ParsedResponse<Arc<RawValue>> { impl ParsedResponse<Arc<RawValue>> {
#[inline]
pub fn from_response_data(data: ForwardedResponse<Arc<RawValue>>, id: Box<RawValue>) -> Self { pub fn from_response_data(data: ForwardedResponse<Arc<RawValue>>, id: Box<RawValue>) -> Self {
match data { match data {
ForwardedResponse::RpcError { error_data, .. } => Self::from_error(error_data, id), ForwardedResponse::RpcError { error_data, .. } => Self::from_error(error_data, id),
@ -46,22 +49,25 @@ impl ParsedResponse<Arc<RawValue>> {
} }
impl<T> ParsedResponse<T> { impl<T> ParsedResponse<T> {
#[inline]
pub fn from_result(result: T, id: Box<RawValue>) -> Self { pub fn from_result(result: T, id: Box<RawValue>) -> Self {
Self { Self {
jsonrpc: "2.0".to_string(), jsonrpc: "2.0".into(),
id, id,
payload: ResponsePayload::Success { result }, payload: ResponsePayload::Success { result },
} }
} }
#[inline]
pub fn from_error(error: JsonRpcErrorData, id: Box<RawValue>) -> Self { pub fn from_error(error: JsonRpcErrorData, id: Box<RawValue>) -> Self {
Self { Self {
jsonrpc: "2.0".to_string(), jsonrpc: "2.0".into(),
id, id,
payload: ResponsePayload::Error { error }, payload: ResponsePayload::Error { error },
} }
} }
#[inline]
pub fn result(&self) -> Option<&T> { pub fn result(&self) -> Option<&T> {
match &self.payload { match &self.payload {
ResponsePayload::Success { result } => Some(result), ResponsePayload::Success { result } => Some(result),
@ -69,6 +75,7 @@ impl<T> ParsedResponse<T> {
} }
} }
#[inline]
pub fn into_result(self) -> Web3ProxyResult<T> { pub fn into_result(self) -> Web3ProxyResult<T> {
match self.payload { match self.payload {
ResponsePayload::Success { result } => Ok(result), ResponsePayload::Success { result } => Ok(result),
@ -164,7 +171,8 @@ where
// jsonrpc version must be present in all responses // jsonrpc version must be present in all responses
let jsonrpc = jsonrpc let jsonrpc = jsonrpc
.ok_or_else(|| de::Error::missing_field("jsonrpc"))? .ok_or_else(|| de::Error::missing_field("jsonrpc"))?
.to_string(); .to_string()
.into();
let payload = match (result, error) { let payload = match (result, error) {
(Some(result), None) => ResponsePayload::Success { result }, (Some(result), None) => ResponsePayload::Success { result },