fixup feature flags

Cargo.toml

@@ -35,6 +35,7 @@ futures-buffered = "0.2.4"
 futures-lite = "2.3.0"
 futures-util = { version = "0.3.25" }
 hex = "0.4"
+iroh-base = { version = "0.29" }
 iroh-blobs = { version = "0.29.0", optional = true, features = ["downloader"] }
 iroh-gossip = { version = "0.29.0", optional = true }
 iroh-metrics = { version = "0.29.0", default-features = false }
@@ -66,7 +67,6 @@ portable-atomic = { version = "1.9.0", optional = true }
 clap = { version = "4", features = ["derive"], optional = true }
 console = { version = "0.15", optional = true }
 indicatif = { version = "0.17", features = ["tokio"], optional = true }
-iroh-base = { version = "0.29", features = ["base32"], optional = true }
 dialoguer = { version = "0.11", optional = true }
 colored = { version = "2.1", optional = true }
 shellexpand = { version = "3.1", optional = true }
@@ -92,7 +92,7 @@ net = ["dep:iroh", "tokio/io-util", "dep:tokio-stream", "dep:tokio-util"]
 metrics = ["iroh-metrics/metrics", "iroh/metrics"]
 engine = ["net", "dep:iroh-gossip", "dep:iroh-blobs"]
 test-utils = ["iroh/test-utils"]
-cli = ["rpc", "dep:clap", "dep:indicatif", "dep:console", "dep:colored", "dep:dialoguer", "dep:shellexpand", "iroh-blobs/rpc", "dep:iroh-base"]
+cli = ["rpc", "dep:clap", "dep:indicatif", "dep:console", "dep:colored", "dep:dialoguer", "dep:shellexpand", "iroh-blobs/rpc", "iroh-base/base32"]
 rpc = [
   "engine",
   "dep:nested_enum_utils",

src/actor.rs

@@ -11,7 +11,7 @@ use std::{
 use anyhow::{anyhow, Context, Result};
 use bytes::Bytes;
 use futures_util::FutureExt;
-use iroh::hash::Hash;
+use iroh_base::hash::Hash;
 use iroh_metrics::inc;
 use serde::{Deserialize, Serialize};
 use tokio::{sync::oneshot, task::JoinSet};

src/store/fs.rs

@@ -11,7 +11,7 @@ use std::{
 
 use anyhow::{anyhow, Result};
 use ed25519_dalek::{SignatureError, VerifyingKey};
-use iroh::hash::Hash;
+use iroh_base::hash::Hash;
 use rand_core::CryptoRngCore;
 use redb::{Database, DatabaseError, ReadableMultimapTable, ReadableTable, ReadableTableMetadata};
 

src/store/fs/query.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use iroh::hash::Hash;
+use iroh_base::hash::Hash;
 
 use super::{
     bounds::{ByKeyBounds, RecordsBounds},

src/sync.rs

@@ -16,7 +16,7 @@ use std::{
 
 use bytes::{Bytes, BytesMut};
 use ed25519_dalek::{Signature, SignatureError};
-use iroh::hash::Hash;
+use iroh_base::hash::Hash;
 #[cfg(feature = "metrics")]
 use iroh_metrics::{inc, inc_by};
 use serde::{Deserialize, Serialize};