From 8f4e6f69749820e381200eee6e0893bf55a70ef8 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Wed, 22 Feb 2023 12:53:45 +0100 Subject: [PATCH] chore(deps): bump backon (#1499) --- Cargo.lock | 4 ++-- bin/reth/Cargo.toml | 2 +- bin/reth/src/p2p/mod.rs | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 563084db04..f94e0e8f89 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -297,9 +297,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backon" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cd1a59bc091e593ee9ed62df4e4a07115e00a0e0a52fd7e0e04540773939b80" +checksum = "f34fac4d7cdaefa2deded0eda2d5d59dbfd43370ff3f856209e72340ae84c294" dependencies = [ "futures", "pin-project", diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml index 84bca20202..d83f4f213c 100644 --- a/bin/reth/Cargo.toml +++ b/bin/reth/Cargo.toml @@ -58,7 +58,7 @@ tokio = { version = "1.21", features = ["sync", "macros", "rt-multi-thread"] } tokio-stream = "0.1" futures = "0.3.25" tempfile = { version = "3.3.0" } -backon = "0.2.0" +backon = "0.4" comfy-table = "6.1.4" crossterm = "0.25.0" tui = "0.19.0" diff --git a/bin/reth/src/p2p/mod.rs b/bin/reth/src/p2p/mod.rs index bc036d7d7d..f340f851b9 100644 --- a/bin/reth/src/p2p/mod.rs +++ b/bin/reth/src/p2p/mod.rs @@ -3,7 +3,7 @@ use crate::{ args::DiscoveryArgs, dirs::{ConfigPath, PlatformPath}, }; -use backon::{ConstantBackoff, Retryable}; +use backon::{ConstantBuilder, Retryable}; use clap::{Parser, Subcommand}; use reth_db::mdbx::{Env, EnvKind, WriteMap}; use reth_discv4::NatResolver; @@ -113,12 +113,12 @@ impl Command { let fetch_client = network.fetch_client().await?; let retries = self.retries.max(1); - let backoff = ConstantBackoff::default().with_max_times(retries); + let backoff = ConstantBuilder::default().with_max_times(retries); match self.command { Subcommands::Header { id } => { let header = (move || self.get_single_header(fetch_client.clone(), id)) - .retry(backoff) + .retry(&backoff) .notify(|err, _| println!("Error requesting header: {err}. Retrying...")) .await?; println!("Successfully downloaded header: {header:?}"); @@ -135,7 +135,7 @@ impl Command { BlockHashOrNumber::Number(number), ) }) - .retry(backoff.clone()) + .retry(&backoff) .notify(|err, _| println!("Error requesting header: {err}. Retrying...")) .await?; header.hash() @@ -145,7 +145,7 @@ impl Command { let client = fetch_client.clone(); async move { client.get_block_bodies(vec![hash]).await } }) - .retry(backoff) + .retry(&backoff) .notify(|err, _| println!("Error requesting block: {err}. Retrying...")) .await? .split();