Merge branch 'main' into rk/doc-fixes

n0-computer · Jul 5, 2024 · 66f4cd1 · 66f4cd1
2 parents 6541b28 + 2c40984
commit 66f4cd1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/iroh-cli/src/commands.rs b/iroh-cli/src/commands.rs
@@ -118,7 +118,7 @@ impl Cli {
             Commands::Console => {
                 let data_dir_owned = data_dir.to_owned();
                 if self.start {
-                    let config = NodeConfig::load(self.config.as_deref()).await?;
+                    let config = Self::load_config(self.config, self.metrics_port).await?;
                     start::run_with_command(
                         &config,
                         data_dir,
@@ -139,7 +139,7 @@ impl Cli {
             Commands::Rpc(command) => {
                 let data_dir_owned = data_dir.to_owned();
                 if self.start {
-                    let config = NodeConfig::load(self.config.as_deref()).await?;
+                    let config = Self::load_config(self.config, self.metrics_port).await?;
                     start::run_with_command(
                         &config,
                         data_dir,
@@ -166,13 +166,7 @@ impl Cli {
                         path.display()
                     );
                 }
-                let mut config = NodeConfig::load(self.config.as_deref()).await?;
-                if let Some(metrics_port) = self.metrics_port {
-                    config.metrics_addr = match metrics_port {
-                        MetricsPort::Disabled => None,
-                        MetricsPort::Port(port) => Some(([127, 0, 0, 1], port).into()),
-                    };
-                }
+                let config = Self::load_config(self.config, self.metrics_port).await?;
 
                 let add_command = add.map(|source| blob::BlobCommands::Add {
                     source,
@@ -193,15 +187,23 @@ impl Cli {
                 .await
             }
             Commands::Doctor { command } => {
-                let mut config = NodeConfig::load(self.config.as_deref()).await?;
-                if let Some(metrics_port) = self.metrics_port {
-                    config.metrics_addr = match metrics_port {
-                        MetricsPort::Disabled => None,
-                        MetricsPort::Port(port) => Some(([127, 0, 0, 1], port).into()),
-                    };
-                }
+                let config = Self::load_config(self.config, self.metrics_port).await?;
                 self::doctor::run(command, &config).await
             }
         }
     }
+
+    async fn load_config(
+        config: Option<PathBuf>,
+        metrics_port: Option<MetricsPort>,
+    ) -> Result<NodeConfig> {
+        let mut config = NodeConfig::load(config.as_deref()).await?;
+        if let Some(metrics_port) = metrics_port {
+            config.metrics_addr = match metrics_port {
+                MetricsPort::Disabled => None,
+                MetricsPort::Port(port) => Some(([127, 0, 0, 1], port).into()),
+            };
+        }
+        Ok(config)
+    }
 }
diff --git a/iroh/src/lib.rs b/iroh/src/lib.rs
@@ -8,10 +8,13 @@
 //! available over the network.
 //!
 //! ```rust
+//! # async fn run() -> anyhow::Result<()> {
 //! let node = iroh::node::Node::memory().spawn().await?;
 //! let client = node.client();
 //! let hash = client.blobs().add_bytes(b"some data".to_vec()).await?.hash;
 //! println!("hash: {}", hash);
+//! # Ok(())
+//! # }
 //! ```
 //!
 //! ## Explanation