Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

fix: send error back #556

Merged
merged 1 commit into from
Nov 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ethers-providers/src/transports/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ impl<R> ResponseData<R> {
}
}

impl ResponseData<serde_json::Value> {
/// Encode the error to json value if it is an error
pub fn into_value(self) -> serde_json::Result<serde_json::Value> {
match self {
ResponseData::Success { result } => Ok(result),
ResponseData::Error { error } => serde_json::to_value(error),
}
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
8 changes: 4 additions & 4 deletions ethers-providers/src/transports/ipc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ where
},
// Handle socket messages
msg = self.socket_reader.next() => match msg {
Some(Ok(msg)) => self.handle_socket(read_buffer, msg).await?,
Some(Ok(msg)) => self.handle_socket(read_buffer, msg)?,
Some(Err(err)) => {
error!("IPC read error: {:?}", err);
return Err(err.into());
Expand All @@ -207,7 +207,7 @@ where
}

if let Err(err) = self.socket_writer.write(request.as_bytes()).await {
error!("WS connection error: {:?}", err);
error!("IPC connection error: {:?}", err);
self.pending.remove(&id);
}
}
Expand All @@ -229,7 +229,7 @@ where
Ok(())
}

async fn handle_socket(
fn handle_socket(
&mut self,
read_buffer: &mut Vec<u8>,
bytes: bytes::Bytes,
Expand Down Expand Up @@ -292,7 +292,7 @@ where
let id = output.id;

// Converts output into result, to send data if valid response.
let value = output.data.into_result()?;
let value = output.data.into_value()?;

let response_tx = self.pending.remove(&id).ok_or_else(|| {
IpcError::ChannelError("No response channel exists for the response ID".to_string())
Expand Down