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

refactor: extract trusted peer resolve into separate function (#8660)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
caglarkaya
2024-06-07 14:04:08 +03:00
committed by GitHub
parent 280aaaedc4
commit bbfb81bbda
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
crates/node/builder/src/launch/common.rs
View File

@ -82,20 +82,6 @@ impl LaunchContext {
// Update the config with the command line arguments
toml_config.peers.trusted_nodes_only = config.network.trusted_only;
if !config.network.trusted_peers.is_empty() {
info!(target: "reth::cli", "Adding trusted nodes");
// resolve trusted peers if they use a domain instead of dns
for peer in &config.network.trusted_peers {
let backoff = ConstantBuilder::default().with_max_times(config.network.dns_retries);
let resolved = (move || { peer.resolve() })
.retry(&backoff)
.notify(|err, _| warn!(target: "reth::cli", "Error resolving peer domain: {err}. Retrying..."))
.await?;
toml_config.peers.trusted_nodes.insert(resolved);
}
}
Ok(toml_config)
}
@ -202,6 +188,27 @@ impl<T> LaunchContextWith<T> {
}
}
impl LaunchContextWith<WithConfigs> {
/// Resolves the trusted peers and adds them to the toml config.
pub async fn with_resolved_peers(mut self) -> eyre::Result<Self> {
if !self.attachment.config.network.trusted_peers.is_empty() {
info!(target: "reth::cli", "Adding trusted nodes");
// resolve trusted peers if they use a domain instead of dns
for peer in &self.attachment.config.network.trusted_peers {
let backoff = ConstantBuilder::default()
.with_max_times(self.attachment.config.network.dns_retries);
let resolved = (move || { peer.resolve() })
.retry(&backoff)
.notify(|err, _| warn!(target: "reth::cli", "Error resolving peer domain: {err}. Retrying..."))
.await?;
self.attachment.toml_config.peers.trusted_nodes.insert(resolved);
}
}
Ok(self)
}
}
impl<L, R> LaunchContextWith<Attached<L, R>> {
/// Get a reference to the left value.
pub const fn left(&self) -> &L {

2
crates/node/builder/src/launch/mod.rs
View File

@ -96,6 +96,8 @@ where
.with_configured_globals()
// load the toml config
.with_loaded_toml_config(config).await?
// add resolved peers
.with_resolved_peers().await?
// attach the database
.attach(database.clone())
// ensure certain settings take effect