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

zebrad: tidy sync imports

This commit is contained in:
Henry de Valence 2020-09-09 12:17:17 -07:00
parent 9b6e66c1b9
commit 24de90c900
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,10 @@
use std::{collections::HashSet, iter, pin::Pin, sync::Arc, time::Duration}; use std::{collections::HashSet, iter, pin::Pin, sync::Arc, time::Duration};
use color_eyre::eyre::{eyre, Report, WrapErr}; use color_eyre::eyre::{eyre, Report, WrapErr};
use futures::future::{FutureExt, TryFutureExt}; use futures::{
use futures::stream::{FuturesUnordered, StreamExt}; future::{FutureExt, TryFutureExt},
stream::{FuturesUnordered, StreamExt},
};
use tokio::{task::JoinHandle, time::delay_for}; use tokio::{task::JoinHandle, time::delay_for};
use tower::{builder::ServiceBuilder, retry::Retry, timeout::Timeout, Service, ServiceExt}; use tower::{builder::ServiceBuilder, retry::Retry, timeout::Timeout, Service, ServiceExt};
use tracing_futures::Instrument; use tracing_futures::Instrument;
@ -11,9 +13,8 @@ use zebra_chain::{
block::{self, Block}, block::{self, Block},
parameters::Network, parameters::Network,
}; };
use zebra_consensus::checkpoint; use zebra_consensus::{checkpoint, parameters};
use zebra_consensus::parameters; use zebra_network as zn;
use zebra_network::{self as zn, RetryLimit};
use zebra_state as zs; use zebra_state as zs;
/// Controls the number of peers used for each ObtainTips and ExtendTips request. /// Controls the number of peers used for each ObtainTips and ExtendTips request.
@ -119,7 +120,7 @@ where
/// (failover is handled using fanout). /// (failover is handled using fanout).
tip_network: Timeout<ZN>, tip_network: Timeout<ZN>,
/// Used to download blocks, with retry logic. /// Used to download blocks, with retry logic.
block_network: Retry<RetryLimit, Timeout<ZN>>, block_network: Retry<zn::RetryLimit, Timeout<ZN>>,
state: ZS, state: ZS,
verifier: Timeout<ZV>, verifier: Timeout<ZV>,
prospective_tips: HashSet<CheckedTip>, prospective_tips: HashSet<CheckedTip>,
@ -144,7 +145,7 @@ where
pub fn new(chain: Network, peers: ZN, state: ZS, verifier: ZV) -> Self { pub fn new(chain: Network, peers: ZN, state: ZS, verifier: ZV) -> Self {
let tip_network = Timeout::new(peers.clone(), TIPS_RESPONSE_TIMEOUT); let tip_network = Timeout::new(peers.clone(), TIPS_RESPONSE_TIMEOUT);
let block_network = ServiceBuilder::new() let block_network = ServiceBuilder::new()
.retry(RetryLimit::new(BLOCK_DOWNLOAD_RETRY_LIMIT)) .retry(zn::RetryLimit::new(BLOCK_DOWNLOAD_RETRY_LIMIT))
.timeout(BLOCK_DOWNLOAD_TIMEOUT) .timeout(BLOCK_DOWNLOAD_TIMEOUT)
.service(peers); .service(peers);
let verifier = Timeout::new(verifier, BLOCK_VERIFY_TIMEOUT); let verifier = Timeout::new(verifier, BLOCK_VERIFY_TIMEOUT);