update to latest iroh@main

Author: dignifiedquire

Cargo.lock

@@ -40,7 +40,7 @@ genawaiter = { version = "0.99.1", features = ["futures03"] }
 hashlink = { version = "0.9.0", optional = true }
 hex = "0.4.3"
 indicatif = { version = "0.17.8", optional = true }
-iroh-base = { version = "0.29.0", features = ["redb"] }
+iroh-base = { version = "0.29.0" }
 iroh-io = { version = "0.6.0", features = ["stats"] }
 iroh-metrics = { version = "0.29.0", default-features = false }
 iroh = "0.29.0"
@@ -95,7 +95,7 @@ futures-util = "0.3.30"
 testdir = "0.9.1"
 
 [features]
-default = ["fs-store", "net_protocol", "cli"]
+default = ["fs-store", "net_protocol"]
 downloader = ["dep:parking_lot", "tokio-util/time", "dep:hashlink"]
 net_protocol = ["downloader", "dep:futures-util"]
 fs-store = ["dep:reflink-copy", "redb", "dep:tempfile"]

Cargo.toml

@@ -10,10 +10,8 @@ use std::path::PathBuf;
 use anyhow::ensure;
 use clap::{Parser, Subcommand};
 use iroh::{
-    discovery::local_swarm_discovery::LocalSwarmDiscovery,
-    key::{PublicKey, SecretKey},
-    protocol::Router,
-    Endpoint, NodeAddr, RelayMode,
+    discovery::local_swarm_discovery::LocalSwarmDiscovery, protocol::Router, Endpoint, NodeAddr,
+    PublicKey, RelayMode, SecretKey,
 };
 use iroh_blobs::{
     net_protocol::Blobs, rpc::client::blobs::WrapOption, util::local_pool::LocalPool, Hash,

examples/local-swarm-discovery.rs

@@ -15,7 +15,7 @@ use indicatif::{
     HumanBytes, HumanDuration, MultiProgress, ProgressBar, ProgressDrawTarget, ProgressState,
     ProgressStyle,
 };
-use iroh::{key::PublicKey, relay::RelayUrl, NodeAddr};
+use iroh::{NodeAddr, PublicKey, RelayUrl};
 use tokio::io::AsyncWriteExt;
 
 use crate::{

src/cli.rs

@@ -6,7 +6,7 @@ use std::{
 
 use anyhow::anyhow;
 use futures_util::future::FutureExt;
-use iroh::key::SecretKey;
+use iroh::SecretKey;
 
 use super::*;
 use crate::{

src/downloader/test.rs

@@ -991,7 +991,7 @@ pub struct DownloadOptions {
 mod tests {
     use std::{path::Path, time::Duration};
 
-    use iroh::{key::SecretKey, test_utils::DnsPkarrServer, NodeId, RelayMode};
+    use iroh::{test_utils::DnsPkarrServer, NodeId, RelayMode, SecretKey};
     use node::Node;
     use rand::RngCore;
     use testresult::TestResult;

src/rpc/client/blobs.rs

@@ -2,11 +2,8 @@
 use std::{collections::BTreeSet, net::SocketAddr, str::FromStr};
 
 use anyhow::Result;
-use iroh::{NodeId, RelayUrl};
-use iroh_base::{
-    node_addr::NodeAddr,
-    ticket::{self, Ticket},
-};
+use iroh::{NodeAddr, NodeId, RelayUrl};
+use iroh_base::ticket::{self, Ticket};
 use serde::{Deserialize, Serialize};
 
 use crate::{BlobFormat, Hash};
@@ -156,7 +153,7 @@ impl<'de> Deserialize<'de> for BlobTicket {
 mod tests {
     use std::net::SocketAddr;
 
-    use iroh::key::{PublicKey, SecretKey};
+    use iroh::{PublicKey, SecretKey};
     use iroh_base::base32;
     use iroh_test::{assert_eq_hex, hexdump::parse_hexdump};
 

src/ticket.rs

@@ -130,16 +130,16 @@ pub fn relative_canonicalized_path_to_string(path: impl AsRef<Path>) -> anyhow::
 /// at the given location.
 #[cfg(feature = "rpc")]
 #[cfg_attr(iroh_docsrs, doc(cfg(feature = "rpc")))]
-pub async fn load_secret_key(key_path: PathBuf) -> anyhow::Result<iroh::key::SecretKey> {
+pub async fn load_secret_key(key_path: PathBuf) -> anyhow::Result<iroh::SecretKey> {
+    use iroh::SecretKey;
     use tokio::io::AsyncWriteExt;
 
     if key_path.exists() {
         let keystr = tokio::fs::read(key_path).await?;
-        let secret_key =
-            iroh::key::SecretKey::try_from_openssh(keystr).context("invalid keyfile")?;
+        let secret_key = SecretKey::try_from_openssh(keystr).context("invalid keyfile")?;
         Ok(secret_key)
     } else {
-        let secret_key = iroh::key::SecretKey::generate();
+        let secret_key = SecretKey::generate();
         let ser_key = secret_key.to_openssh()?;
 
         // Try to canonicalize if possible