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

error instead of panic

This commit is contained in:
Bryan Stitt 2023-10-03 19:05:15 -07:00
parent e917a11d6c
commit dd3fc165e3
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web3_proxy/src/app/mod.rs
View File

@ -1363,6 +1363,7 @@ impl Web3ProxyApp {
"eth_getTransactionReceipt" | "eth_getTransactionByHash" => {
// try to get the transaction without specifying a min_block_height
// TODO: timeout
// TODO: change this to send serially until we get a success
let result = self
.balanced_rpcs
@ -1699,20 +1700,26 @@ impl Web3ProxyApp {
// this is spawned so that if the client disconnects, the app keeps polling the future with a lock inside the moka cache
// TODO: is this expect actually safe!? could there be a background process that still has the arc?
let mut x = match tokio::spawn(f).await? {
let x = match tokio::spawn(f).await? {
Ok(response_data) => Ok(jsonrpc::ParsedResponse::from_response_data(response_data, Default::default()).into()),
Err(err) => {
self.jsonrpc_response_failed_cache_keys.insert(cache_key, ()).await;
if let Web3ProxyError::StreamResponse(x) = err.as_ref() {
let x = x.lock().take().expect("stream processing should only happen once");
if let Some(x) = x.lock().take() {
Ok(jsonrpc::SingleResponse::Stream(x))
} else {
let err: Web3ProxyError = anyhow::anyhow!("stream was already taken. please report this in Discord").into();
Ok(jsonrpc::SingleResponse::Stream(x))
Err(Arc::new(err))
}
} else {
Err(err)
}
},
}?;
};
let mut x = x?;
// clear the id. theres no point including it in our cached response
x.set_id(Default::default());