Skip to content

Commit e659405

Browse files
refactor: move iroh-gossip to external repo (#2826)
the source now lives in https://github.com/n0-computer/iroh-gossip
1 parent b2e587d commit e659405

File tree

26 files changed

+42
-5563
lines changed

26 files changed

+42
-5563
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
# uses: obi1kenobi/cargo-semver-checks-action@v2
191191
uses: n0-computer/cargo-semver-checks-action@feat-baseline
192192
with:
193-
package: iroh, iroh-base, iroh-blobs, iroh-cli, iroh-dns-server, iroh-gossip, iroh-metrics, iroh-net, iroh-net-bench, iroh-docs
193+
package: iroh, iroh-base, iroh-blobs, iroh-cli, iroh-dns-server, iroh-metrics, iroh-net, iroh-net-bench, iroh-docs
194194
baseline-rev: ${{ env.HEAD_COMMIT_SHA }}
195195
use-cache: false
196196

@@ -298,7 +298,7 @@ jobs:
298298
netsim_branch: "main"
299299
sim_paths: "sims/iroh/iroh.json,sims/integration"
300300
pr_number: ${{ github.event.pull_request.number || '' }}
301-
301+
302302
docker_build_and_test:
303303
name: Docker Test
304304
if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
RUSTFLAGS: -Dwarnings
2424
RUSTDOCFLAGS: -Dwarnings
2525
SCCACHE_CACHE_SIZE: "50G"
26-
CRATES_LIST: "iroh,iroh-blobs,iroh-gossip,iroh-metrics,iroh-net,iroh-net-bench,iroh-docs,iroh-test,iroh-cli,iroh-dns-server"
26+
CRATES_LIST: "iroh,iroh-blobs,iroh-metrics,iroh-net,iroh-net-bench,iroh-docs,iroh-test,iroh-cli,iroh-dns-server"
2727
IROH_FORCE_STAGING_RELAYS: "1"
2828

2929
jobs:
@@ -218,7 +218,7 @@ jobs:
218218
env:
219219
RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG'}}
220220
NEXTEST_EXPERIMENTAL_LIBTEST_JSON: 1
221-
221+
222222
- name: upload results
223223
if: ${{ failure() && inputs.flaky }}
224224
uses: actions/upload-artifact@v4

Cargo.lock

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

Cargo.toml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ members = [
44
"iroh-blobs",
55
"iroh-base",
66
"iroh-dns-server",
7-
"iroh-gossip",
87
"iroh-metrics",
98
"iroh-net",
109
"iroh-docs",
@@ -19,7 +18,7 @@ debug = true
1918

2019
[profile.dev-ci]
2120
inherits = 'dev'
22-
opt-level = 1
21+
opt-level = 1
2322

2423
[profile.optimized-release]
2524
inherits = 'release'
@@ -46,3 +45,12 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)"] }
4645

4746
[workspace.lints.clippy]
4847
unused-async = "warn"
48+
49+
# Temporary fix for dependencies
50+
[patch.crates-io]
51+
iroh-base = { path = "./iroh-base" }
52+
iroh-net = { path = "./iroh-net" }
53+
iroh-blobs = { path = "./iroh-blobs" }
54+
iroh-metrics = { path = "./iroh-metrics" }
55+
iroh-docs = { path = "./iroh-docs" }
56+
iroh-test = { path = "./iroh-test" }

iroh-base/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ url = { version = "2.5.0", features = ["serde"], optional = true }
4141
getrandom = { version = "0.2", default-features = false, optional = true }
4242

4343
[dev-dependencies]
44-
iroh-test = { path = "../iroh-test" }
44+
iroh-test = "0.27.0"
4545
proptest = "1.0.0"
4646
serde_json = "1.0.107"
4747
serde_test = "1.0.176"

iroh-blobs/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ futures-lite = "2.3"
2727
genawaiter = { version = "0.99.1", features = ["futures03"] }
2828
hashlink = { version = "0.9.0", optional = true }
2929
hex = "0.4.3"
30-
iroh-base = { version = "0.27.0", features = ["redb"], path = "../iroh-base" }
30+
iroh-base = { version = "0.27.0", features = ["redb"] }
3131
iroh-io = { version = "0.6.0", features = ["stats"] }
32-
iroh-metrics = { version = "0.27.0", path = "../iroh-metrics", default-features = false }
33-
iroh-net = { version = "0.27.0", path = "../iroh-net" }
32+
iroh-metrics = { version = "0.27.0", default-features = false }
33+
iroh-net = { version = "0.27.0" }
3434
num_cpus = "1.15.0"
3535
oneshot = "0.1.8"
3636
parking_lot = { version = "0.12.1", optional = true }
@@ -55,7 +55,7 @@ tracing-futures = "0.2.5"
5555
[dev-dependencies]
5656
http-body = "0.4.5"
5757
iroh-blobs = { path = ".", features = ["downloader"] }
58-
iroh-test = { path = "../iroh-test" }
58+
iroh-test = "0.27.0"
5959
futures-buffered = "0.2.4"
6060
proptest = "1.0.0"
6161
serde_json = "1.0.107"

iroh-cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ hex = "0.4.3"
4141
human-time = "0.1.6"
4242
indicatif = { version = "0.17", features = ["tokio"] }
4343
iroh = { version = "0.27.0", path = "../iroh", features = ["metrics"] }
44-
iroh-gossip = { version = "0.27.0", path = "../iroh-gossip" }
45-
iroh-metrics = { version = "0.27.0", path = "../iroh-metrics" }
44+
iroh-gossip = "0.27.0"
45+
iroh-metrics = { version = "0.27.0" }
4646
parking_lot = "0.12.1"
4747
pkarr = { version = "2.2.0", default-features = false }
4848
portable-atomic = "1"

iroh-dns-server/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ governor = "0.6.3"
2424
hickory-proto = "=0.25.0-alpha.2"
2525
hickory-server = { version = "=0.25.0-alpha.2", features = ["dns-over-rustls"] }
2626
http = "1.0.0"
27-
iroh-metrics = { version = "0.27.0", path = "../iroh-metrics" }
27+
iroh-metrics = { version = "0.27.0" }
2828
lru = "0.12.3"
2929
mainline = "2.0.1"
3030
parking_lot = "0.12.1"
@@ -53,8 +53,8 @@ z32 = "1.1.1"
5353

5454
[dev-dependencies]
5555
hickory-resolver = "=0.25.0-alpha.2"
56-
iroh-net = { version = "0.27.0", path = "../iroh-net" }
57-
iroh-test = { path = "../iroh-test" }
56+
iroh-net = { version = "0.27.0" }
57+
iroh-test = "0.27.0"
5858
pkarr = { version = "2.2.0", features = ["rand"] }
5959

6060
[package.metadata.docs.rs]

iroh-docs/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ futures-buffered = "0.2.4"
2525
futures-lite = "2.3.0"
2626
futures-util = { version = "0.3.25" }
2727
hex = "0.4"
28-
iroh-base = { version = "0.27.0", path = "../iroh-base" }
29-
iroh-blobs = { version = "0.27.0", path = "../iroh-blobs", optional = true, features = ["downloader"] }
30-
iroh-gossip = { version = "0.27.0", path = "../iroh-gossip", optional = true }
31-
iroh-metrics = { version = "0.27.0", path = "../iroh-metrics", default-features = false }
32-
iroh-net = { version = "0.27.0", optional = true, path = "../iroh-net" }
28+
iroh-base = { version = "0.27.0" }
29+
iroh-blobs = { version = "0.27.0", optional = true, features = ["downloader"] }
30+
iroh-gossip = { version = "0.27.0", optional = true }
31+
iroh-metrics = { version = "0.27.0", default-features = false }
32+
iroh-net = { version = "0.27.0", optional = true }
3333
lru = "0.12"
3434
num_enum = "0.7"
3535
postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
@@ -48,7 +48,7 @@ tokio-util = { version = "0.7.12", optional = true, features = ["codec", "io-uti
4848
tracing = "0.1"
4949

5050
[dev-dependencies]
51-
iroh-test = { path = "../iroh-test" }
51+
iroh-test = "0.27.0"
5252
rand_chacha = "0.3.1"
5353
tokio = { version = "1", features = ["sync", "macros"] }
5454
proptest = "1.2.0"

iroh-gossip/Cargo.toml

Lines changed: 0 additions & 67 deletions
This file was deleted.

iroh-gossip/README.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)