jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed lints

Browse Source
This commit is contained in:
Nicholas Wehr
2025-08-11 14:18:24 -07:00
parent 821846f671
commit 0d1c239a07
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
bin/reth/src/share_blocks.rs
View File

@ -1,15 +1,11 @@
use clap::Args; use clap::Args;
use once_cell::sync::Lazy;
use reth_hlfs::{Backfiller, Client, Server}; use reth_hlfs::{Backfiller, Client, Server};
use reth_network_api::{events::NetworkEvent, FullNetwork}; use reth_network_api::{events::NetworkEvent, FullNetwork};
use std::{ use std::{
collections::HashSet, collections::HashSet,
net::{IpAddr, SocketAddr}, net::{IpAddr, SocketAddr},
path::PathBuf, path::PathBuf,
sync::{ sync::Arc,
atomic::{AtomicUsize, Ordering},
Arc,
},
time::Duration, time::Duration,
}; };
use tokio::{task::JoinHandle, time::timeout}; use tokio::{task::JoinHandle, time::timeout};
@ -18,10 +14,8 @@ use tracing::{debug, info, warn};
// use futures_util::StreamExt; // use futures_util::StreamExt;
use futures_util::stream::StreamExt; use futures_util::stream::StreamExt;
static RR: Lazy<AtomicUsize> = Lazy::new(|| AtomicUsize::new(0));
#[derive(Args, Clone, Debug)] #[derive(Args, Clone, Debug)]
pub struct ShareBlocksArgs { pub(crate) struct ShareBlocksArgs {
#[arg(long, default_value_t = false)] #[arg(long, default_value_t = false)]
pub share_blocks: bool, pub share_blocks: bool,
#[arg(long, default_value = "0.0.0.0")] #[arg(long, default_value = "0.0.0.0")]
@ -34,14 +28,17 @@ pub struct ShareBlocksArgs {
pub hist_threshold: u64, pub hist_threshold: u64,
} }
pub struct ShareBlocks { pub(crate) struct ShareBlocks {
pub backfiller: Backfiller, pub(crate) _backfiller: Backfiller,
_server: JoinHandle<()>, _server: JoinHandle<()>,
_autodetect: JoinHandle<()>, _autodetect: JoinHandle<()>,
} }
impl ShareBlocks { impl ShareBlocks {
pub async fn start_with_network<Net>(args: &ShareBlocksArgs, network: Net) -> eyre::Result<Self> pub(crate) async fn start_with_network<Net>(
args: &ShareBlocksArgs,
network: Net,
) -> eyre::Result<Self>
where where
Net: FullNetwork + Clone + 'static, Net: FullNetwork + Clone + 'static,
{ {
@ -64,12 +61,13 @@ impl ShareBlocks {
let _autodetect = spawn_autodetect(network, args.share_blocks_port, bf.clone()); let _autodetect = spawn_autodetect(network, args.share_blocks_port, bf.clone());
info!(%bind, dir=%args.archive_dir.display(), hist_threshold=%args.hist_threshold, "hlfs: enabled (reth peers)"); info!(%bind, dir=%args.archive_dir.display(), hist_threshold=%args.hist_threshold, "hlfs: enabled (reth peers)");
Ok(Self { backfiller: bf, _server, _autodetect }) Ok(Self { _backfiller: bf, _server, _autodetect })
} }
pub async fn try_fetch_one(&self, block: u64, head: u64) -> eyre::Result<Option<usize>> { #[allow(dead_code)]
let rr = RR.fetch_add(1, Ordering::Relaxed); pub(crate) async fn try_fetch_one(&self, block: u64, head: u64) -> eyre::Result<Option<usize>> {
self.backfiller.fetch_if_missing(block, head, rr).await.map_err(|e| eyre::eyre!(e)) let rr = (block as usize) ^ (head as usize); // deterministic round-robin seed
self._backfiller.fetch_if_missing(block, head, rr).await.map_err(|e| eyre::eyre!(e))
// <- fix: HlfsError -> eyre::Report // <- fix: HlfsError -> eyre::Report
} }
} }