octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move BoxError to zebrad's lib.rs 

For consistency with other crates.
This commit is contained in:
teor 2021-01-25 19:33:47 +10:00 committed by Jane Lusby
parent b551d81f8d
commit 391c53aa60
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebrad/src/components/sync.rs
View File

@ -18,7 +18,7 @@ use zebra_chain::{
use zebra_network as zn; use zebra_network as zn;
use zebra_state as zs; use zebra_state as zs;
use crate::config::ZebradConfig; use crate::{config::ZebradConfig, BoxError};
mod downloads; mod downloads;
use downloads::{AlwaysHedge, Downloads}; use downloads::{AlwaysHedge, Downloads};
@ -114,8 +114,6 @@ pub(super) const BLOCK_VERIFY_TIMEOUT: Duration = Duration::from_secs(180);
/// previous sync runs. /// previous sync runs.
const SYNC_RESTART_DELAY: Duration = Duration::from_secs(61); const SYNC_RESTART_DELAY: Duration = Duration::from_secs(61);
type BoxError = Box<dyn std::error::Error + Send + Sync + 'static>;
/// Helps work around defects in the bitcoin protocol by checking whether /// Helps work around defects in the bitcoin protocol by checking whether
/// the returned hashes actually extend a chain tip. /// the returned hashes actually extend a chain tip.
#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)] #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]

7
zebrad/src/lib.rs
View File

@ -26,6 +26,13 @@
#[macro_use] #[macro_use]
extern crate tracing; extern crate tracing;
/// Error type alias to make working with tower traits easier.
///
/// Note: the 'static lifetime bound means that the *type* cannot have any
/// non-'static lifetimes, (e.g., when a type contains a borrow and is
/// parameterized by 'a), *not* that the object itself has 'static lifetime.
pub type BoxError = Box<dyn std::error::Error + Send + Sync + 'static>;
mod components; mod components;
pub mod application; pub mod application;