Skip to content

Commit af708bf

Browse files
committed
wip
1 parent b666e5e commit af708bf

File tree

10 files changed

+988
-2747
lines changed

10 files changed

+988
-2747
lines changed

Cargo.lock

Lines changed: 870 additions & 1241 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 32 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -27,50 +27,55 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)"] }
2727
[dependencies]
2828
anyhow = "1"
2929
async-channel = "2.3.1"
30-
blake3 = { package = "iroh-blake3", version = "1.4.5"}
30+
blake3 = "1.8"
3131
bytes = { version = "1.7", features = ["serde"] }
32-
derive_more = { version = "1.0.0", features = ["debug", "deref", "display", "from", "try_into", "into", "as_ref"] }
32+
derive_more = { version = "1.0.0", features = [
33+
"debug",
34+
"deref",
35+
"display",
36+
"from",
37+
"try_into",
38+
"into",
39+
"as_ref",
40+
] }
3341
ed25519-dalek = { version = "2.0.0", features = ["serde", "rand_core"] }
3442
futures-buffered = "0.2.4"
3543
futures-lite = "2.3.0"
3644
futures-util = { version = "0.3.25" }
3745
hex = "0.4"
38-
iroh-base = { version = "0.35", features = ["ticket"] }
39-
iroh-blobs = { version = "0.35" }
40-
iroh-gossip = { version = "0.35", optional = true, features = ["net"] }
41-
iroh-metrics = { version = "0.34", default-features = false }
42-
iroh = { version = "0.35", optional = true }
46+
iroh-base = { version = "0.90", features = ["ticket"] }
47+
iroh-blobs = { version = "0.90" }
48+
iroh-gossip = { version = "0.90", optional = true, features = ["net"] }
49+
iroh-metrics = { version = "0.35", default-features = false }
50+
iroh = { version = "0.90", optional = true }
4351
num_enum = "0.7"
44-
postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
52+
postcard = { version = "1", default-features = false, features = [
53+
"alloc",
54+
"use-std",
55+
"experimental-derive",
56+
] }
4557
rand = "0.8.5"
4658
rand_core = "0.6.4"
4759
redb = { version = "2.0.0" }
48-
redb_v1 = { package = "redb", version = "1.5.1" }
60+
redb_v1 = { package = "redb", version = "1.5.1" }
4961
self_cell = "1.0.3"
5062
serde = { version = "1.0.164", features = ["derive"] }
5163
strum = { version = "0.26", features = ["derive"] }
5264
tempfile = { version = "3.4" }
5365
thiserror = "2"
5466
tokio = { version = "1", features = ["sync", "rt", "time", "macros"] }
55-
tokio-stream = { version = "0.1", optional = true, features = ["sync"]}
56-
tokio-util = { version = "0.7.12", optional = true, features = ["codec", "io-util", "io", "rt"] }
67+
tokio-stream = { version = "0.1", optional = true, features = ["sync"] }
68+
tokio-util = { version = "0.7.12", optional = true, features = [
69+
"codec",
70+
"io-util",
71+
"io",
72+
"rt",
73+
] }
5774
tracing = "0.1"
5875

5976
# rpc
60-
nested_enum_utils = { version = "0.1.0", optional = true }
61-
quic-rpc = { version = "0.20", optional = true }
62-
quic-rpc-derive = { version = "0.20", optional = true }
63-
serde-error = { version = "0.1.3", optional = true }
64-
portable-atomic = { version = "1.9.0", optional = true }
65-
66-
# cli
67-
clap = { version = "4", features = ["derive"], optional = true }
68-
console = { version = "0.15", optional = true }
69-
data-encoding = { version = "2.3.3", optional = true }
70-
indicatif = { version = "0.17", features = ["tokio"], optional = true }
71-
dialoguer = { version = "0.11", optional = true }
72-
colored = { version = "2.1", optional = true }
73-
shellexpand = { version = "3.1", optional = true }
77+
irpc = { version = "0.5.0" }
78+
n0-future = "0.1.3"
7479

7580
[dev-dependencies]
7681
rand_chacha = "0.3.1"
@@ -83,36 +88,16 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
8388
parking_lot = "0.12.3"
8489
testresult = "0.4.1"
8590
nested_enum_utils = "0.1.0"
86-
iroh-io = "0.6.1"
8791
testdir = "0.7"
8892
data-encoding = "2.6.0"
8993

9094
[features]
9195
default = ["net", "metrics", "engine", "test-utils"]
9296
net = ["dep:iroh", "tokio/io-util", "dep:tokio-stream", "dep:tokio-util"]
9397
metrics = ["iroh-metrics/metrics", "iroh/metrics"]
94-
engine = ["net", "dep:iroh-gossip", "iroh-blobs/downloader"]
98+
engine = ["net", "dep:iroh-gossip"]
9599
test-utils = ["iroh/test-utils"]
96-
cli = [
97-
"rpc",
98-
"dep:clap",
99-
"dep:indicatif",
100-
"dep:console",
101-
"dep:colored",
102-
"dep:dialoguer",
103-
"dep:shellexpand",
104-
"dep:data-encoding",
105-
"iroh-blobs/rpc",
106-
]
107-
rpc = [
108-
"engine",
109-
"dep:nested_enum_utils",
110-
"dep:quic-rpc",
111-
"dep:quic-rpc-derive",
112-
"dep:serde-error",
113-
"dep:portable-atomic",
114-
"iroh-blobs/rpc",
115-
]
100+
rpc = ["engine"]
116101

117102
[package.metadata.docs.rs]
118103
all-features = true

0 commit comments

Comments
 (0)