refactor: move iroh-gossip to external repo (#2826)

the source now lives in https://github.com/n0-computer/iroh-gossip
n0-computer · Oct 23, 2024 · e659405 · e659405
1 parent b2e587d
commit e659405
Show file tree

Hide file tree

Showing 26 changed files with 42 additions and 5,563 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -190,7 +190,7 @@ jobs:
         # uses: obi1kenobi/cargo-semver-checks-action@v2
         uses: n0-computer/cargo-semver-checks-action@feat-baseline
         with:
-          package: iroh, iroh-base, iroh-blobs, iroh-cli, iroh-dns-server, iroh-gossip, iroh-metrics, iroh-net, iroh-net-bench, iroh-docs
+          package: iroh, iroh-base, iroh-blobs, iroh-cli, iroh-dns-server, iroh-metrics, iroh-net, iroh-net-bench, iroh-docs
           baseline-rev: ${{ env.HEAD_COMMIT_SHA }}
           use-cache: false
 
@@ -298,7 +298,7 @@ jobs:
       netsim_branch: "main"
       sim_paths: "sims/iroh/iroh.json,sims/integration"
       pr_number: ${{ github.event.pull_request.number || '' }}
-    
+
   docker_build_and_test:
     name: Docker Test
     if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -23,7 +23,7 @@ env:
   RUSTFLAGS: -Dwarnings
   RUSTDOCFLAGS: -Dwarnings
   SCCACHE_CACHE_SIZE: "50G"
-  CRATES_LIST: "iroh,iroh-blobs,iroh-gossip,iroh-metrics,iroh-net,iroh-net-bench,iroh-docs,iroh-test,iroh-cli,iroh-dns-server"
+  CRATES_LIST: "iroh,iroh-blobs,iroh-metrics,iroh-net,iroh-net-bench,iroh-docs,iroh-test,iroh-cli,iroh-dns-server"
   IROH_FORCE_STAGING_RELAYS: "1"
 
 jobs:
@@ -218,7 +218,7 @@ jobs:
       env:
         RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG'}}
         NEXTEST_EXPERIMENTAL_LIBTEST_JSON: 1
-  
+
     - name: upload results
       if: ${{ failure() && inputs.flaky }}
       uses: actions/upload-artifact@v4

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,6 @@ members = [
   "iroh-blobs",
   "iroh-base",
   "iroh-dns-server",
-  "iroh-gossip",
   "iroh-metrics",
   "iroh-net",
   "iroh-docs",
@@ -19,7 +18,7 @@ debug = true
 
 [profile.dev-ci]
 inherits = 'dev'
-opt-level = 1 
+opt-level = 1
 
 [profile.optimized-release]
 inherits = 'release'
@@ -46,3 +45,12 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)"] }
 
 [workspace.lints.clippy]
 unused-async = "warn"
+
+# Temporary fix for dependencies
+[patch.crates-io]
+iroh-base = { path = "./iroh-base" }
+iroh-net = { path = "./iroh-net" }
+iroh-blobs = { path = "./iroh-blobs" }
+iroh-metrics = { path = "./iroh-metrics" }
+iroh-docs = { path = "./iroh-docs" }
+iroh-test = { path = "./iroh-test" }
diff --git a/iroh-base/Cargo.toml b/iroh-base/Cargo.toml
@@ -41,7 +41,7 @@ url = { version = "2.5.0", features = ["serde"], optional = true }
 getrandom = { version = "0.2", default-features = false, optional = true }
 
 [dev-dependencies]
-iroh-test = { path = "../iroh-test" }
+iroh-test = "0.27.0"
 proptest = "1.0.0"
 serde_json = "1.0.107"
 serde_test = "1.0.176"

diff --git a/iroh-blobs/Cargo.toml b/iroh-blobs/Cargo.toml
@@ -27,10 +27,10 @@ futures-lite = "2.3"
 genawaiter = { version = "0.99.1", features = ["futures03"] }
 hashlink = { version = "0.9.0", optional = true }
 hex = "0.4.3"
-iroh-base = { version = "0.27.0", features = ["redb"], path = "../iroh-base" }
+iroh-base = { version = "0.27.0", features = ["redb"] }
 iroh-io = { version = "0.6.0", features = ["stats"] }
-iroh-metrics = { version = "0.27.0", path = "../iroh-metrics", default-features = false }
-iroh-net = { version = "0.27.0", path = "../iroh-net" }
+iroh-metrics = { version = "0.27.0", default-features = false }
+iroh-net = { version = "0.27.0" }
 num_cpus = "1.15.0"
 oneshot = "0.1.8"
 parking_lot = { version = "0.12.1", optional = true }
@@ -55,7 +55,7 @@ tracing-futures = "0.2.5"
 [dev-dependencies]
 http-body = "0.4.5"
 iroh-blobs = { path = ".", features = ["downloader"] }
-iroh-test = { path = "../iroh-test" }
+iroh-test = "0.27.0"
 futures-buffered = "0.2.4"
 proptest = "1.0.0"
 serde_json = "1.0.107"

diff --git a/iroh-cli/Cargo.toml b/iroh-cli/Cargo.toml
@@ -41,8 +41,8 @@ hex = "0.4.3"
 human-time = "0.1.6"
 indicatif = { version = "0.17", features = ["tokio"] }
 iroh = { version = "0.27.0", path = "../iroh", features = ["metrics"] }
-iroh-gossip = { version = "0.27.0", path = "../iroh-gossip" }
-iroh-metrics = { version = "0.27.0", path = "../iroh-metrics" }
+iroh-gossip = "0.27.0"
+iroh-metrics = { version = "0.27.0" }
 parking_lot = "0.12.1"
 pkarr = { version = "2.2.0", default-features = false }
 portable-atomic = "1"

diff --git a/iroh-dns-server/Cargo.toml b/iroh-dns-server/Cargo.toml
@@ -24,7 +24,7 @@ governor = "0.6.3"
 hickory-proto = "=0.25.0-alpha.2"
 hickory-server = { version = "=0.25.0-alpha.2", features = ["dns-over-rustls"] }
 http = "1.0.0"
-iroh-metrics = { version = "0.27.0", path = "../iroh-metrics" }
+iroh-metrics = { version = "0.27.0" }
 lru = "0.12.3"
 mainline = "2.0.1"
 parking_lot = "0.12.1"
@@ -53,8 +53,8 @@ z32 = "1.1.1"
 
 [dev-dependencies]
 hickory-resolver = "=0.25.0-alpha.2"
-iroh-net = { version = "0.27.0", path = "../iroh-net" }
-iroh-test = { path = "../iroh-test" }
+iroh-net = { version = "0.27.0" }
+iroh-test = "0.27.0"
 pkarr = { version = "2.2.0", features = ["rand"] }
 
 [package.metadata.docs.rs]

diff --git a/iroh-docs/Cargo.toml b/iroh-docs/Cargo.toml
@@ -25,11 +25,11 @@ futures-buffered = "0.2.4"
 futures-lite = "2.3.0"
 futures-util = { version = "0.3.25" }
 hex = "0.4"
-iroh-base = { version = "0.27.0", path = "../iroh-base" }
-iroh-blobs = { version = "0.27.0", path = "../iroh-blobs", optional = true, features = ["downloader"] }
-iroh-gossip = { version = "0.27.0", path = "../iroh-gossip", optional = true }
-iroh-metrics = { version = "0.27.0", path = "../iroh-metrics", default-features = false }
-iroh-net = { version = "0.27.0", optional = true, path = "../iroh-net" }
+iroh-base = { version = "0.27.0" }
+iroh-blobs = { version = "0.27.0", optional = true, features = ["downloader"] }
+iroh-gossip = { version = "0.27.0", optional = true }
+iroh-metrics = { version = "0.27.0", default-features = false }
+iroh-net = { version = "0.27.0", optional = true }
 lru = "0.12"
 num_enum = "0.7"
 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
 tracing = "0.1"
 
 [dev-dependencies]
-iroh-test = { path = "../iroh-test" }
+iroh-test = "0.27.0"
 rand_chacha = "0.3.1"
 tokio = { version = "1", features = ["sync", "macros"] }
 proptest = "1.2.0"

diff --git a/iroh-gossip/Cargo.toml b/iroh-gossip/Cargo.toml
diff --git a/iroh-gossip/README.md b/iroh-gossip/README.md