Skip to content

Commit 9322406

Browse files
committed
Merge #1883: SI-16 #1881: Migrate contrib/bencode to torrust/torrust-bittorrent as torrust-bencode
a817386 fix: address Copilot review comments on PR #1883 (Jose Celano) 11b7172 chore(container): remove contrib/bencode from Containerfile (T8) (Jose Celano) 7863546 docs(packages): update EPIC #1669 and ISSUE spec after SI-16 completion (T13) (Jose Celano) a55c27f chore(packages): remove contrib/bencode and update references (T8-T10) (Jose Celano) 880333e chore: update Cargo.lock after switching to torrust-bencode 3.0.0 (Jose Celano) a0e0e8e refactor(http-protocol): replace path dep with published torrust-bencode 3.0.0 (Jose Celano) aaaadc8 docs(packages): open SI-16 #1881 migrate contrib/bencode to torrust-bittorrent (Jose Celano) Pull request description: ## Summary Closes #1881 (subissue of EPIC #1669 — Overhaul: Packages) Migrates the `contrib/bencode` crate (`torrust-tracker-contrib-bencode`) out of this workspace into `torrust/torrust-bittorrent` as the published `torrust-bencode 3.0.0` crate, and removes all traces of it from the tracker workspace. ## Changes ### `torrust/torrust-bittorrent` (already merged — separate repo) - Renamed crate to `torrust-bencode`, updated metadata and repository URL - Applied clippy fixes (`ok_or_else`, `map_or`) in `access/convert.rs` and `reference/decode.rs` - Published `torrust-bencode 3.0.0` to crates.io ### This PR (`torrust/torrust-tracker`) - **`packages/http-protocol`**: replace path dep `torrust-tracker-contrib-bencode` with published `torrust-bencode = "3.0.0"`; update imports in `announce.rs` and `scrape.rs` - **`Cargo.lock`**: remove `torrust-tracker-contrib-bencode`, add `torrust-bencode 3.0.0` - **`contrib/bencode/`**: delete directory (20 files) - **`AGENTS.md`**: remove bencode from `contrib/` description and Community contributions table - **`docs/packages.md`**: update `contrib/` tree noting migration - **`docs/release_process.md`**: remove old crate from publish checklist - **`src/console/ci/qbittorrent_e2e/bencode.rs`**: update crate name in doc comment - **`.github/skills/release-new-version/SKILL.md`**: remove `contrib/bencode` version bump step - **`docs/issues/open/1669-overhaul-packages/EPIC.md`**: mark SI-16 done, update tables - **`docs/issues/open/1881-.../ISSUE.md`**: mark all tasks done (T1–T11, T13) ## Pending (not in this PR) - **T12**: Yank `torrust-tracker-contrib-bencode` on crates.io — deferred until no downstream consumers confirmed ## Verification - `cargo build -p torrust-tracker-http-tracker-protocol` ✅ - `cargo build --workspace` ✅ (verified locally) - CI will run full suite on this PR ACKs for top commit: josecelano: ACK a817386 Tree-SHA512: e7f3b33c8a2f2ac06a0a9089d3cb6f9b479a5420ddff7dca4ab5f0f7e17b80c9d2a855c7c2c728b0972018ab250ae9db6005d3eae1438bacff9653df4325aab4
2 parents 2c5d032 + a817386 commit 9322406

33 files changed

Lines changed: 67 additions & 1887 deletions

File tree

.github/skills/dev/git-workflow/release-new-version/SKILL.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ Edit `version` in:
6767
- `Cargo.toml` (workspace)
6868
- All packages under `packages/` that publish crates
6969
- `console/tracker-client/Cargo.toml`
70-
- `contrib/bencode/Cargo.toml`
7170

7271
Also update any internal path dependency `version` constraints.
7372

@@ -100,7 +99,6 @@ Check the
10099
[deployment workflow](https://github.com/torrust/torrust-tracker/actions/workflows/deployment.yaml)
101100
ran successfully and the following crates were published:
102101

103-
- `torrust-tracker-contrib-bencode`
104102
- `torrust-located-error`
105103
- `torrust-tracker-primitives`
106104
- `torrust-clock`

.github/workflows/deployment.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ jobs:
7373
cargo publish -p torrust-tracker-client
7474
cargo publish -p torrust-clock
7575
cargo publish -p torrust-tracker-configuration
76-
cargo publish -p torrust-tracker-contrib-bencode
7776
cargo publish -p torrust-tracker-events
7877
cargo publish -p torrust-metrics
7978
cargo publish -p torrust-tracker-primitives

AGENTS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ native IPv4/IPv6 support, private/whitelisted mode, and a management REST API.
4141
- `src/console/` — Console entry points
4242
- `packages/` — Cargo workspace packages (all domain logic lives here; see package catalog below)
4343
- `console/` — Console tools (e.g., `tracker-client`)
44-
- `contrib/`Community-contributed utilities (`bencode`) and developer tooling
44+
- `contrib/`Developer tooling
4545
- `contrib/dev-tools/` — Developer tools: git hooks (`pre-commit.sh`, `pre-push.sh`, `install-git-hooks.sh`),
4646
container scripts, and init scripts
4747
- `tests/` — Integration tests (`integration.rs`, `servers/`)
@@ -94,9 +94,9 @@ All packages live under `packages/`. The workspace version is `3.0.0-develop`.
9494

9595
**Community contributions** (under `contrib/`):
9696

97-
| Crate | Description |
98-
| --------- | ------------------------------- |
99-
| `bencode` | Bencode encode/decode utilities |
97+
| Crate | Description |
98+
| ----- | ------------------------------------------------------------------------------------------------------ |
99+
| | None (bencode migrated to [torrust/torrust-bittorrent](https://github.com/torrust/torrust-bittorrent)) |
100100

101101
## 🏷️ Package Naming Conventions
102102

Cargo.lock

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

Containerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,12 @@ WORKDIR /build/src
5151
# or moved crate must have its line updated or removed accordingly.
5252
COPY Cargo.toml Cargo.lock ./
5353
COPY console/tracker-client/Cargo.toml console/tracker-client/
54-
COPY contrib/bencode/Cargo.toml contrib/bencode/
5554
# The following packages are excluded from cargo nextest archive (see Cook and
5655
# Build stages below) because they are not part of the production tracker service
5756
# and do not need to be tested inside the container image:
5857
# - workspace-coupling (analysis/coupling tool, no production value)
5958
# - torrust-tracker-torrent-repository-benchmarking (benchmarking only)
6059
# - torrust-tracker-client (CLI dev tools: tracker_client, tracker_checker, etc.)
61-
# - torrust-tracker-contrib-bencode (contrib utility; its own tests/bins are not needed in the container)
6260
# - torrust-tracker-e2e-tools (E2E runners + profiling tool, GHA host-only)
6361
# - torrust-tracker-persistence-benchmark (persistence layer dev benchmarking tool)
6462
# Their Cargo.toml manifests and stub source files must still be present here
@@ -114,8 +112,6 @@ RUN mkdir -p \
114112
src/bin \
115113
packages/e2e-tools/src/bin \
116114
packages/persistence-benchmark/src/bin \
117-
contrib/bencode/src \
118-
contrib/bencode/benches \
119115
contrib/dev-tools/analysis/workspace-coupling/src \
120116
console/tracker-client/src/bin \
121117
packages/axum-health-check-api-server/src \
@@ -155,8 +151,6 @@ RUN mkdir -p \
155151
packages/e2e-tools/src/bin/profiling.rs \
156152
packages/e2e-tools/src/bin/qbittorrent_e2e_runner.rs \
157153
packages/persistence-benchmark/src/bin/persistence_benchmark_runner.rs \
158-
contrib/bencode/src/lib.rs \
159-
contrib/bencode/benches/bencode_benchmark.rs \
160154
contrib/dev-tools/analysis/workspace-coupling/src/main.rs \
161155
console/tracker-client/src/lib.rs \
162156
console/tracker-client/src/bin/http_tracker_client.rs \

contrib/bencode/Cargo.toml

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

contrib/bencode/README.md

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

contrib/bencode/benches/bencode_benchmark.rs

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

contrib/bencode/benches/multi_kb.bencode

Lines changed: 0 additions & 1 deletion
This file was deleted.

contrib/bencode/src/access/bencode.rs

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

0 commit comments

Comments
 (0)