From 1c7db35bc4d6b8caf92f6ddfabc04c8dadadbfe5 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <me@dignifiedquire.com>
Date: Mon, 6 May 2024 18:29:45 +0200
Subject: [PATCH] refactor: renames iroh-sync & iroh-bytes (#2271)

Aligns naming with actual usage.

## Breaking Changes

- crate rename:
  - `iroh-bytes` -> `iroh-blobs`
  - `iroh-sync` -> `iroh-docs`
- module rename:
  - `iroh::bytes` -> `iroh::blobs`
  - `iroh::sync` -> `iroh::docs`


Closes #2270,#2269
---
 .github/workflows/ci.yml     |  2 +-
 .github/workflows/tests.yaml |  4 +-
 Cargo.lock                   | 84 ++++++++++++++++++------------------
 Cargo.toml                   |  4 +-
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a147b81421..b5486b01aa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,7 +99,7 @@ jobs:
         # uses: obi1kenobi/cargo-semver-checks-action@v2
         uses: n0-computer/cargo-semver-checks-action@feat-baseline
         with:
-          package: iroh, iroh-base, iroh-bytes, iroh-cli, iroh-dns-server, iroh-gossip, iroh-metrics, iroh-net, iroh-sync
+          package: iroh, iroh-base, iroh-blobs, iroh-cli, iroh-dns-server, iroh-gossip, iroh-metrics, iroh-net, iroh-docs
           baseline-rev: ${{ env.HEAD_COMMIT_SHA }}
           use-cache: false
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 7e57179506..badd64f42d 100644
--- 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-bytes,iroh-gossip,iroh-metrics,iroh-net,iroh-sync,iroh-test,iroh-cli,iroh-dns-server"
+  CRATES_LIST: "iroh,iroh-blobs,iroh-gossip,iroh-metrics,iroh-net,iroh-docs,iroh-test,iroh-cli,iroh-dns-server"
 
 jobs:
   build_and_test_nix:
@@ -66,7 +66,7 @@ jobs:
       uses: taiki-e/install-action@v2
       with:
         tool: nextest
-    
+
     - name: Install sccache
       uses: mozilla-actions/sccache-action@v0.0.4
 
diff --git a/Cargo.lock b/Cargo.lock
index 8fb2f0ec7a..d767585b3a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2314,12 +2314,12 @@ dependencies = [
  "indicatif",
  "iroh",
  "iroh-base",
- "iroh-bytes",
+ "iroh-blobs",
+ "iroh-docs",
  "iroh-gossip",
  "iroh-io",
  "iroh-metrics",
  "iroh-net",
- "iroh-sync",
  "iroh-test",
  "num_cpus",
  "parking_lot",
@@ -2389,7 +2389,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "iroh-bytes"
+name = "iroh-blobs"
 version = "0.15.0"
 dependencies = [
  "anyhow",
@@ -2406,7 +2406,7 @@ dependencies = [
  "hex",
  "http-body 0.4.6",
  "iroh-base",
- "iroh-bytes",
+ "iroh-blobs",
  "iroh-io",
  "iroh-metrics",
  "iroh-net",
@@ -2536,6 +2536,44 @@ dependencies = [
  "z32",
 ]
 
+[[package]]
+name = "iroh-docs"
+version = "0.15.0"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "derive_more",
+ "ed25519-dalek",
+ "flume",
+ "futures-util",
+ "hex",
+ "iroh-base",
+ "iroh-blake3",
+ "iroh-metrics",
+ "iroh-net",
+ "iroh-test",
+ "lru",
+ "num_enum",
+ "postcard",
+ "proptest",
+ "quinn",
+ "rand",
+ "rand_chacha",
+ "rand_core",
+ "redb 1.5.1",
+ "redb 2.1.0",
+ "self_cell",
+ "serde",
+ "strum 0.25.0",
+ "tempfile",
+ "test-strategy",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "iroh-gossip"
 version = "0.15.0"
@@ -2700,44 +2738,6 @@ dependencies = [
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "iroh-sync"
-version = "0.15.0"
-dependencies = [
- "anyhow",
- "bytes",
- "derive_more",
- "ed25519-dalek",
- "flume",
- "futures-util",
- "hex",
- "iroh-base",
- "iroh-blake3",
- "iroh-metrics",
- "iroh-net",
- "iroh-test",
- "lru",
- "num_enum",
- "postcard",
- "proptest",
- "quinn",
- "rand",
- "rand_chacha",
- "rand_core",
- "redb 1.5.1",
- "redb 2.1.0",
- "self_cell",
- "serde",
- "strum 0.25.0",
- "tempfile",
- "test-strategy",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "iroh-test"
 version = "0.15.0"
diff --git a/Cargo.toml b/Cargo.toml
index 24dc3874d3..a6099c70fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,13 @@
 [workspace]
 members = [
   "iroh",
-  "iroh-bytes",
+  "iroh-blobs",
   "iroh-base",
   "iroh-dns-server",
   "iroh-gossip",
   "iroh-metrics",
   "iroh-net",
-  "iroh-sync",
+  "iroh-docs",
   "iroh-test",
   "iroh-net/bench",
   "iroh-cli"