zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Stop panicking when a state block commit fails (#4016)

This commit is contained in:
teor 2022-03-31 20:26:21 +10:00 committed by GitHub
parent 75ae05b257
commit aa5564dffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zebra-state/src/service.rs
View File

@ -12,6 +12,7 @@
//! - [`ChainTipChange`]: a read-only channel that can asynchronously await chain tip changes. //! - [`ChainTipChange`]: a read-only channel that can asynchronously await chain tip changes.
use std::{ use std::{
convert,
future::Future, future::Future,
pin::Pin, pin::Pin,
sync::Arc, sync::Arc,
@ -753,7 +754,12 @@ impl Service<Request> for StateService {
async move { async move {
rsp_rx rsp_rx
.await .await
.expect("sender is not dropped") .map_err(|_recv_error| {
BoxError::from("block was dropped from the state CommitBlock queue")
})
// TODO: replace with Result::flatten once it stabilises
// https://github.com/rust-lang/rust/issues/70142
.and_then(convert::identity)
.map(Response::Committed) .map(Response::Committed)
.map_err(Into::into) .map_err(Into::into)
} }
@ -773,7 +779,14 @@ impl Service<Request> for StateService {
async move { async move {
rsp_rx rsp_rx
.await .await
.expect("sender is not dropped") .map_err(|_recv_error| {
BoxError::from(
"block was dropped from the state CommitFinalizedBlock queue",
)
})
// TODO: replace with Result::flatten once it stabilises
// https://github.com/rust-lang/rust/issues/70142
.and_then(convert::identity)
.map(Response::Committed) .map(Response::Committed)
.map_err(Into::into) .map_err(Into::into)
} }