github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-08 03:01:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(node-builder): use datadir from config (#8615)

Browse Source
This commit is contained in:
Alexey Shekhirin
2024-06-05 16:48:14 +01:00
committed by GitHub
parent 01fd9b3c76
commit 5a4b3985ce
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/node-core/src/node_config.rs
View File

@@ -246,9 +246,9 @@ impl NodeConfig {
}
/// Get the network secret from the given data dir
pub fn network_secret(&self, data_dir: &ChainPath<DataDirPath>) -> eyre::Result<SecretKey> {
pub fn network_secret(&self) -> eyre::Result<SecretKey> {
let network_secret_path =
self.network.p2p_secret_key.clone().unwrap_or_else(|| data_dir.p2p_secret());
self.network.p2p_secret_key.clone().unwrap_or_else(|| self.datadir().p2p_secret());
debug!(target: "reth::cli", ?network_secret_path, "Loading p2p key file");
let secret_key = get_secret_key(&network_secret_path)?;
Ok(secret_key)
@@ -309,11 +309,10 @@ impl NodeConfig {
client: C,
executor: TaskExecutor,
head: Head,
data_dir: ChainPath<DataDirPath>,
) -> eyre::Result<NetworkConfig<C>> {
info!(target: "reth::cli", "Connecting to P2P network");
let secret_key = self.network_secret(&data_dir)?;
let default_peers_path = data_dir.known_peers();
let secret_key = self.network_secret()?;
let default_peers_path = self.datadir().known_peers();
Ok(self.load_network_config(config, client, executor, head, secret_key, default_peers_path))
}
@@ -326,12 +325,11 @@ impl NodeConfig {
client: C,
executor: TaskExecutor,
head: Head,
data_dir: ChainPath<DataDirPath>,
) -> eyre::Result<NetworkBuilder<C, (), ()>>
where
C: BlockNumReader,
{
let network_config = self.network_config(config, client, executor, head, data_dir)?;
let network_config = self.network_config(config, client, executor, head)?;
let builder = NetworkManager::builder(network_config).await?;
Ok(builder)
}