Skip to content

chore: pin saorsa-core and saorsa-transport to always-masque-relay branches#76

Merged
jacderida merged 4 commits intomainfrom
mick/always-masque-relay-rebased
Apr 22, 2026
Merged

chore: pin saorsa-core and saorsa-transport to always-masque-relay branches#76
jacderida merged 4 commits intomainfrom
mick/always-masque-relay-rebased

Conversation

@mickvandijke
Copy link
Copy Markdown
Collaborator

Summary

  • Switch saorsa-core (0.23.1 → git, branch mick/always-masque-relay-rebased) and saorsa-transport (registry → git, same branch) to consume the always-on MASQUE relay work ahead of a published release.
  • Picks up enum_dispatch as a new transitive dependency via saorsa-transport.

Test plan

  • cargo build --release
  • cargo test
  • cargo clippy --all-features -- -D clippy::panic -D clippy::unwrap_used -D clippy::expect_used

🤖 Generated with Claude Code

Copilot AI review requested due to automatic review settings April 21, 2026 12:22
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR switches the project to consume the “always-on MASQUE relay” work by moving Saorsa dependencies off crates.io and onto a specific git branch, updating the lockfile accordingly.

Changes:

  • Pin saorsa-core to https://github.com/saorsa-labs/saorsa-core.git on branch mick/always-masque-relay-rebased.
  • Update Cargo.lock to resolve saorsa-core and saorsa-transport from git (and pull in enum_dispatch transitively).

Reviewed changes

Copilot reviewed 1 out of 2 changed files in this pull request and generated 2 comments.

File Description
Cargo.toml Switches saorsa-core dependency from crates.io to a git branch.
Cargo.lock Updates resolved dependency graph for the git-sourced Saorsa crates and adds enum_dispatch.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread Cargo.toml
Comment on lines 25 to 28
[dependencies]
# Core (provides EVERYTHING: networking, DHT, security, trust, storage)
saorsa-core = "0.23.1"
saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core.git", branch = "mick/always-masque-relay-rebased" }
saorsa-pqc = "0.5"
Copy link

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR title/description says both saorsa-core and saorsa-transport are pinned to the mick/always-masque-relay-rebased branch, but this Cargo.toml change only pins saorsa-core. If the intent is to force saorsa-transport to that branch even if it later stops being a git transitive dep of saorsa-core, add an explicit override (e.g. a [patch.crates-io] entry for saorsa-transport or a direct dependency) rather than relying on the current lockfile resolution.

Copilot uses AI. Check for mistakes.
Comment thread Cargo.toml
[dependencies]
# Core (provides EVERYTHING: networking, DHT, security, trust, storage)
saorsa-core = "0.23.1"
saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core.git", branch = "mick/always-masque-relay-rebased" }
Copy link

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using a moving git branch for saorsa-core means dependency resolution can change whenever the branch tip changes (e.g., when regenerating Cargo.lock or building in environments that don't respect the existing lockfile). If you want deterministic builds, prefer pinning to a specific rev (and optionally keep the branch name in a comment) and/or include a version = "..." constraint so Cargo can verify the expected crate version.

Suggested change
saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core.git", branch = "mick/always-masque-relay-rebased" }
# Pin to the exact vetted commit from the former `mick/always-masque-relay-rebased` branch.
saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core.git", rev = "REPLACE_WITH_CURRENT_VETTED_COMMIT_SHA" }

Copilot uses AI. Check for mistakes.
@mickvandijke mickvandijke marked this pull request as draft April 21, 2026 12:26
@mickvandijke mickvandijke marked this pull request as ready for review April 22, 2026 19:02
Copilot AI review requested due to automatic review settings April 22, 2026 19:02
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 1 out of 2 changed files in this pull request and generated no new comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@jacderida jacderida merged commit ae9386c into main Apr 22, 2026
12 checks passed
@jacderida jacderida deleted the mick/always-masque-relay-rebased branch April 22, 2026 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants