n0-computer · faassen · Oct 6, 2022 · Oct 6, 2022 · Oct 6, 2022 · Oct 6, 2022
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,6 @@ members = [
   "iroh",
   "iroh-bitswap",
   "iroh-car",
-  "iroh-ctl",
   "iroh-rpc-client",
   "iroh-rpc-types",
   "iroh-gateway",

diff --git a/iroh-ctl/Cargo.toml b/iroh-ctl/Cargo.toml
diff --git a/iroh-ctl/README.md b/iroh-ctl/README.md
diff --git a/iroh-ctl/src/lib.rs b/iroh-ctl/src/lib.rs
diff --git a/iroh-ctl/src/main.rs b/iroh-ctl/src/main.rs
diff --git a/iroh-ctl/src/metrics.rs b/iroh-ctl/src/metrics.rs
diff --git a/iroh-ctl/src/run.rs b/iroh-ctl/src/run.rs
diff --git a/iroh-one/Cargo.toml b/iroh-one/Cargo.toml
@@ -7,6 +7,10 @@ readme = "README.md"
 repository = "https://github.com/dignifiedquire/iroh"
 version = "0.1.0"
 
+[[bin]]
+path = "src/main.rs"
+name = "iroh"
+
 [dependencies]
 anyhow = "1"
 async-trait = "0.1.56"
@@ -30,10 +34,25 @@ serde = {version = "1.0", features = ["derive"]}
 tempdir = "0.3.7"
 tokio = {version = "1", features = ["macros", "rt-multi-thread", "process"]}
 tracing = "0.1.33"
+crossterm = "0.25"
+tonic = "0.8"
+iroh = { path = "../iroh"}
+libp2p = { version = "0.49", default-features = false }
 
 [dev-dependencies]
 axum-macros = "0.2.0" # use #[axum_macros::debug_handler] for better error messages on handlers
 http = "0.2" 
+trycmd = "0.13.7"
+iroh = { path = "../iroh", features = ["testing"] }
+# We want to compile the `iroh` CLI in test mode, but we can't specify that yet:
+# https://github.com/rust-lang/cargo/issues/1982
+# This is a workaround for enabling features only during testing: 
+# https://github.com/DesmondWillowbrook/cargo-optional-features-for-testing-and-examples
+# It is needed to have trycmd invoke a version of the iroh CLI in testing
+# mode. trycmd needs to have an actual binary to invoke.
+# Unfortunately this also turns on the feature during development, which may be
+# confusing. See the comments in `run.rs` surrounding this.
+iroh-one = { path = ".", features = ["testing"] }
 
 [features]
 default = ["rpc-mem", "rpc-grpc"]
@@ -42,3 +61,5 @@ rpc-mem = ["iroh-rpc-types/mem", "iroh-rpc-client/mem"]
 # uds-gateway controls whether http over uds is enabled. This is independent of the
 # rpc-grpc control endpoint.
 uds-gateway = []
+# testing controls whether we want to run the CLI in testing mode
+testing = []
diff --git a/iroh-one/README.md b/iroh-one/README.md
@@ -9,7 +9,7 @@ services as micro services.
 
 ## Running / Building
 
-`cargo run --release -- -p 10000 --store-path=tmpstore`
+`cargo run --release -- start -p 10000 --store-path=tmpstore`
 
 ### Options