rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwoodc2d5aee96496d802e12dceaf522dd4e54592155a
{
"request": "trigger",
"version": 1,
"event_type": "patch",
"repository": {
"id": "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5",
"name": "heartwood",
"description": "Radicle Heartwood Protocol & Stack",
"private": false,
"default_branch": "master",
"delegates": [
"did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT",
"did:key:z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW",
"did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"did:key:z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz",
"did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz"
]
},
"action": "Created",
"patch": {
"id": "bfc001610b31e1f83c43d377ca2e2aedf7ab7f7e",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": "lorenz"
},
"title": "radicle: Refactor COB Storage Access",
"state": {
"status": "open",
"conflicts": []
},
"before": "8bac24d6ab961dec6308fdf64b31c41201e9e8d1",
"after": "c2d5aee96496d802e12dceaf522dd4e54592155a",
"commits": [
"c2d5aee96496d802e12dceaf522dd4e54592155a"
],
"target": "8bac24d6ab961dec6308fdf64b31c41201e9e8d1",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "bfc001610b31e1f83c43d377ca2e2aedf7ab7f7e",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": "lorenz"
},
"description": "Instead of passing the signer as an argument to many methods on `Store`,\nscope the `Store` itself to a signer.\n\nThis further allows to differentiate two different access modes on the\nstore in `radicle::cob::store::access`: `WriteAs` (which requires signer)\nand `ReadOnly` (which does not require a signer).\n\nThe caches for issues and patches in `radicle::cob::{issue,patch}::Cache`\nare concretised by removing the first type parameter, since it was\nspecific to issues and patches anyway. This was done in this commit as\nit touches very similar usage sites.\n\nMake `Device` less prominent, and instead lean more heavily towards\ntraits from the `signature` crate, such as `Keypair` and `Verifier`\nin addition to `Signer`. Trait bounds regarding `Signer` could be\nsimplified, but this is left for the future.\n\nIn `radicle-cli`, the function `term::cob::patches_mut`, which generates\nerrors with a hint is used instead of the lower-level `Profile::patches_mut`.\n\nCommands `rad issue cache` and `rad patch cache` now construct a\nwriteable cache on top of a read-only store.\n\nMany knock-on changes are handled as well, to arrive at a clean state.",
"base": "8bac24d6ab961dec6308fdf64b31c41201e9e8d1",
"oid": "c2d5aee96496d802e12dceaf522dd4e54592155a",
"timestamp": 1774961755
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "3e1032cf-5e98-48bc-acf4-99193d66ae06"
},
"info_url": "https://cci.rad.levitte.org//3e1032cf-5e98-48bc-acf4-99193d66ae06.html"
}
Started at: 2026-03-31 14:56:31.824442+02:00
Commands:
$ rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 .
✓ Creating checkout in ./...
✓ Remote cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT added
✓ Remote-tracking branch cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/master created for z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT
✓ Remote cloudhead@z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW added
✓ Remote-tracking branch cloudhead@z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW/master created for z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW
✓ Remote fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM added
✓ Remote-tracking branch fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/master created for z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM
✓ Remote erikli@z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz added
✓ Remote-tracking branch erikli@z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz/master created for z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz
✓ Remote lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz added
✓ Remote-tracking branch lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz/master created for z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz
✓ Repository successfully cloned under /opt/radcis/ci.rad.levitte.org/cci/state/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 154 issues · 43 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout bfc001610b31e1f83c43d377ca2e2aedf7ab7f7e
✓ Switched to branch patch/bfc0016 at revision bfc0016
✓ Branch patch/bfc0016 setup to track rad/patches/bfc001610b31e1f83c43d377ca2e2aedf7ab7f7e
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout c2d5aee96496d802e12dceaf522dd4e54592155a
HEAD is now at c2d5aee9 radicle: Refactor COB Storage Access
Exit code: 0
$ rad patch show bfc001610b31e1f83c43d377ca2e2aedf7ab7f7e -p
╭───────────────────────────────────────────────────────────────────────────────╮
│ Title radicle: Refactor COB Storage Access │
│ Patch bfc001610b31e1f83c43d377ca2e2aedf7ab7f7e │
│ Author lorenz z6MkkPv…WX5sTEz │
│ Head c2d5aee96496d802e12dceaf522dd4e54592155a │
│ Base 8bac24d6ab961dec6308fdf64b31c41201e9e8d1 │
│ Branches patch/bfc0016 │
│ Commits ahead 1, behind 0 │
│ Status open │
│ │
│ Instead of passing the signer as an argument to many methods on `Store`, │
│ scope the `Store` itself to a signer. │
│ │
│ This further allows to differentiate two different access modes on the │
│ store in `radicle::cob::store::access`: `WriteAs` (which requires signer) │
│ and `ReadOnly` (which does not require a signer). │
│ │
│ The caches for issues and patches in `radicle::cob::{issue,patch}::Cache` │
│ are concretised by removing the first type parameter, since it was │
│ specific to issues and patches anyway. This was done in this commit as │
│ it touches very similar usage sites. │
│ │
│ Make `Device` less prominent, and instead lean more heavily towards │
│ traits from the `signature` crate, such as `Keypair` and `Verifier` │
│ in addition to `Signer`. Trait bounds regarding `Signer` could be │
│ simplified, but this is left for the future. │
│ │
│ In `radicle-cli`, the function `term::cob::patches_mut`, which generates │
│ errors with a hint is used instead of the lower-level `Profile::patches_mut`. │
│ │
│ Commands `rad issue cache` and `rad patch cache` now construct a │
│ writeable cache on top of a read-only store. │
│ │
│ Many knock-on changes are handled as well, to arrive at a clean state. │
├───────────────────────────────────────────────────────────────────────────────┤
│ c2d5aee radicle: Refactor COB Storage Access │
├───────────────────────────────────────────────────────────────────────────────┤
│ ● Revision bfc0016 @ c2d5aee by lorenz z6MkkPv…WX5sTEz 38 seconds ago │
╰───────────────────────────────────────────────────────────────────────────────╯
commit c2d5aee96496d802e12dceaf522dd4e54592155a
Author: Lorenz Leutgeb <lorenz.leutgeb@radicle.xyz>
Date: Sun Mar 8 09:49:32 2026 +0100
radicle: Refactor COB Storage Access
Instead of passing the signer as an argument to many methods on `Store`,
scope the `Store` itself to a signer.
This further allows to differentiate two different access modes on the
store in `radicle::cob::store::access`: `WriteAs` (which requires signer)
and `ReadOnly` (which does not require a signer).
The caches for issues and patches in `radicle::cob::{issue,patch}::Cache`
are concretised by removing the first type parameter, since it was
specific to issues and patches anyway. This was done in this commit as
it touches very similar usage sites.
Make `Device` less prominent, and instead lean more heavily towards
traits from the `signature` crate, such as `Keypair` and `Verifier`
in addition to `Signer`. Trait bounds regarding `Signer` could be
simplified, but this is left for the future.
In `radicle-cli`, the function `term::cob::patches_mut`, which generates
errors with a hint is used instead of the lower-level `Profile::patches_mut`.
Commands `rad issue cache` and `rad patch cache` now construct a
writeable cache on top of a read-only store.
Many knock-on changes are handled as well, to arrive at a clean state.
diff --git a/crates/radicle-cli/src/commands/cob.rs b/crates/radicle-cli/src/commands/cob.rs
index 12b92364d..3a7a818a1 100644
--- a/crates/radicle-cli/src/commands/cob.rs
+++ b/crates/radicle-cli/src/commands/cob.rs
@@ -11,6 +11,8 @@ use nonempty::NonEmpty;
use radicle::cob;
use radicle::cob::store::CobAction;
+use radicle::cob::store::access::ReadOnly;
+use radicle::cob::store::access::WriteAs;
use radicle::cob::stream::CobStream as _;
use radicle::git;
use radicle::prelude::*;
@@ -48,21 +50,22 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
type_name,
operation,
}) => {
- let signer = &profile.signer()?;
+ let signer = profile.signer()?;
+ let access = WriteAs::new(&signer);
let repo = storage.repository_mut(repo)?;
let embeds = embeds(&repo, operation.embed_files, operation.embed_hashes)?;
let oid = match type_name {
Patch => {
- let store: Store<cob::patch::Patch, _> = Store::open(&repo)?;
+ let mut store: Store<cob::patch::Patch, _, _> = Store::open(&repo, access)?;
let actions = read_jsonl_actions(&operation.actions)?;
- let (oid, _) = store.create(&operation.message, actions, embeds, signer)?;
+ let (oid, _) = store.create(&operation.message, actions, embeds)?;
oid
}
Issue => {
- let store: Store<cob::issue::Issue, _> = Store::open(&repo)?;
+ let mut store: Store<cob::issue::Issue, _, _> = Store::open(&repo, access)?;
let actions = read_jsonl_actions(&operation.actions)?;
- let (oid, _) = store.create(&operation.message, actions, embeds, signer)?;
+ let (oid, _) = store.create(&operation.message, actions, embeds)?;
oid
}
Identity => anyhow::bail!(
@@ -70,10 +73,10 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
&type_name
),
Other(type_name) => {
- let store: Store<cob::external::External, _> =
- Store::open_for(&type_name, &repo)?;
+ let mut store: Store<cob::external::External, _, _> =
+ Store::open_for(&type_name, &repo, access)?;
let actions = read_jsonl_actions(&operation.actions)?;
- let (oid, _) = store.create(&operation.message, actions, embeds, signer)?;
+ let (oid, _) = store.create(&operation.message, actions, embeds)?;
oid
}
};
@@ -178,9 +181,9 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
Patch => {
let actions: Vec<cob::patch::Action> =
read_jsonl_actions(&operation.actions)?.into();
- let mut patches = profile.patches_mut(&repo)?;
+ let mut patches = crate::terminal::cob::patches_mut(&profile, &repo, signer)?;
let mut patch = patches.get_mut(&oid)?;
- patch.transaction(&operation.message, &*profile.signer()?, |tx| {
+ patch.transaction(&operation.message, |tx| {
tx.extend(actions)?;
tx.embed(embeds)?;
Ok(())
@@ -189,9 +192,9 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
Issue => {
let actions: Vec<cob::issue::Action> =
read_jsonl_actions(&operation.actions)?.into();
- let mut issues = profile.issues_mut(&repo)?;
+ let mut issues = crate::terminal::cob::issues_mut(&profile, &repo, signer)?;
let mut issue = issues.get_mut(&oid)?;
- issue.transaction(&operation.message, &*profile.signer()?, |tx| {
+ issue.transaction(&operation.message, |tx| {
tx.extend(actions)?;
tx.embed(embeds)?;
Ok(())
@@ -204,9 +207,10 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
Other(type_name) => {
use cob::external::{Action, External};
let actions: Vec<Action> = read_jsonl_actions(&operation.actions)?.into();
- let mut store: Store<External, _> = Store::open_for(&type_name, &repo)?;
+ let mut store: Store<External, _, _> =
+ Store::open_for(&type_name, &repo, WriteAs::new(signer))?;
let tx = cob::store::Transaction::new(type_name.clone(), actions, embeds);
- let (_, oid) = tx.commit(&operation.message, oid, &mut store, signer)?;
+ let (_, oid) = tx.commit(&operation.message, oid, &mut store)?;
oid
}
};
@@ -244,6 +248,7 @@ fn show(
}
FilteredTypeName::Issue => {
use radicle::issue::cache::Issues as _;
+
let issues = term::cob::issues(profile, repo)?;
for oid in oids {
let oid = &oid.resolve(&repo.backend)?;
@@ -259,6 +264,7 @@ fn show(
}
FilteredTypeName::Patch => {
use radicle::patch::cache::Patches as _;
+
let patches = term::cob::patches(profile, repo)?;
for oid in oids {
let oid = &oid.resolve(&repo.backend)?;
@@ -273,8 +279,9 @@ fn show(
}
}
FilteredTypeName::Other(type_name) => {
- let store =
- cob::store::Store::<cob::external::External, _>::open_for(&type_name, repo)?;
+ let store = cob::store::Store::<cob::external::External, _, _>::open_for(
+ &type_name, repo, ReadOnly,
+ )?;
for oid in oids {
let oid = &oid.resolve(&repo.backend)?;
let cob = store
diff --git a/crates/radicle-cli/src/commands/id.rs b/crates/radicle-cli/src/commands/id.rs
index f4018f53b..c2e8c994d 100644
--- a/crates/radicle-cli/src/commands/id.rs
+++ b/crates/radicle-cli/src/commands/id.rs
@@ -9,7 +9,6 @@ use radicle::cob::identity::{self, IdentityMut, Revision, RevisionId};
use radicle::identity::doc::update;
use radicle::identity::{Doc, Identity, RawDoc, doc};
use radicle::node::NodeId;
-use radicle::node::device::Device;
use radicle::storage::{ReadStorage as _, WriteRepository};
use radicle::{Profile, cob, crypto};
use radicle_surf::diff::Diff;
@@ -37,7 +36,9 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
let repo = storage
.repository(rid)
.context(anyhow!("repository `{rid}` not found in local storage"))?;
- let mut identity = Identity::load_mut(&repo)?;
+
+ let device = profile.signer()?;
+ let mut identity = Identity::load_mut(&repo, &device)?;
let current = identity.current().clone();
let interactive = args.interactive();
@@ -47,14 +48,13 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
Command::Accept { revision } => {
let revision = get(revision, &identity, &repo)?.clone();
let id = revision.id;
- let signer = term::signer(&profile)?;
if !revision.is_active() {
anyhow::bail!("cannot vote on revision that is {}", revision.state);
}
if interactive.confirm(format!("Accept revision {}?", term::format::tertiary(id))) {
- identity.accept(&revision.id, &signer)?;
+ identity.accept(&revision.id)?;
if let Some(revision) = identity.revision(&id) {
// Update the canonical head to point to the latest accepted revision.
@@ -72,7 +72,6 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
}
Command::Reject { revision } => {
let revision = get(revision, &identity, &repo)?.clone();
- let signer = term::signer(&profile)?;
if !revision.is_active() {
anyhow::bail!("cannot vote on revision that is {}", revision.state);
@@ -82,7 +81,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
"Reject revision {}?",
term::format::tertiary(revision.id)
)) {
- identity.reject(revision.id, &signer)?;
+ identity.reject(revision.id)?;
if !args.quiet {
term::success!("Revision {} rejected", revision.id);
@@ -96,7 +95,6 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
description,
} => {
let revision = get(revision, &identity, &repo)?.clone();
- let signer = term::signer(&profile)?;
if !revision.is_active() {
anyhow::bail!("revision can no longer be edited");
@@ -104,7 +102,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
let Some((title, description)) = edit_title_description(title, description)? else {
anyhow::bail!("revision title or description missing");
};
- identity.edit(revision.id, title, description, &signer)?;
+ identity.edit(revision.id, title, description)?;
if !args.quiet {
term::success!("Revision {} edited", revision.id);
@@ -193,15 +191,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
}
return Ok(());
}
- let signer = term::signer(&profile)?;
- let revision = update(
- title,
- description,
- proposal,
- &mut identity,
- &signer,
- &profile,
- )?;
+ let revision = update(title, description, proposal, &mut identity, &profile)?;
if revision.is_accepted() && revision.parent == Some(current.id) {
// Update the canonical head to point to the latest accepted revision.
@@ -253,7 +243,6 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
}
Command::Redact { revision } => {
let revision = get(revision, &identity, &repo)?.clone();
- let signer = term::signer(&profile)?;
if revision.is_accepted() {
anyhow::bail!("cannot redact accepted revision");
@@ -262,7 +251,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
"Redact revision {}?",
term::format::tertiary(revision.id)
)) {
- identity.redact(revision.id, &signer)?;
+ identity.redact(revision.id)?;
if !args.quiet {
term::success!("Revision {} redacted", revision.id);
@@ -422,21 +411,23 @@ and description.
Ok(result)
}
-fn update<R, G>(
+fn update<Repo, Signer>(
title: Option<Title>,
description: Option<String>,
doc: Doc,
- current: &mut IdentityMut<R>,
- signer: &Device<G>,
+ current: &mut IdentityMut<Repo, Signer>,
profile: &Profile,
) -> anyhow::Result<Revision>
where
- R: WriteRepository + cob::Store<Namespace = NodeId>,
- G: crypto::signature::Signer<crypto::Signature>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
if let Some((title, description)) = edit_title_description(title, description)? {
let id = current
- .update(title, description, &doc, signer)
+ .update(title, description, &doc)
.map_err(|e| on_identity_err(e, profile))?;
let revision = current
.revision(&id)
diff --git a/crates/radicle-cli/src/commands/issue.rs b/crates/radicle-cli/src/commands/issue.rs
index 2efc4d212..d18dd484d 100644
--- a/crates/radicle-cli/src/commands/issue.rs
+++ b/crates/radicle-cli/src/commands/issue.rs
@@ -6,13 +6,13 @@ use anyhow::Context as _;
use radicle::cob::common::Label;
use radicle::cob::issue::{CloseReason, State};
+use radicle::cob::store::access::WriteAs;
use radicle::cob::{Title, issue};
use radicle::Profile;
use radicle::crypto;
use radicle::issue::cache::Issues as _;
use radicle::node::NodeId;
-use radicle::node::device::Device;
use radicle::prelude::Did;
use radicle::profile;
use radicle::storage;
@@ -48,7 +48,8 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
.unwrap_or_else(|| Command::List(args.empty.into()));
let announce = !args.no_announce && command.should_announce_for();
- let mut issues = term::cob::issues_mut(&profile, &repo)?;
+ let signer = profile.signer()?;
+ let mut issues = term::cob::issues_mut(&profile, &repo, &signer)?;
match command {
Command::Edit {
@@ -56,8 +57,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
title,
description,
} => {
- let signer = term::signer(&profile)?;
- let issue = edit(&mut issues, &repo, id, title, description, &signer)?;
+ let issue = edit(&mut issues, &repo, id, title, description)?;
if !args.quiet {
term::issue::show(&issue, issue.id(), Format::Header, args.verbose, &profile)?;
}
@@ -68,7 +68,6 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
labels,
assignees,
} => {
- let signer = term::signer(&profile)?;
open(
title,
description,
@@ -77,7 +76,6 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
args.verbose,
args.quiet,
&mut issues,
- &signer,
&profile,
)?;
}
@@ -131,10 +129,9 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
Command::State { id, target_state } => {
let to: StateArg = target_state.into();
let id = id.resolve(&repo.backend)?;
- let signer = term::signer(&profile)?;
let mut issue = issues.get_mut(&id)?;
let state = to.into();
- issue.lifecycle(state, &signer)?;
+ issue.lifecycle(state)?;
if !args.quiet {
let success =
@@ -155,7 +152,6 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
} => {
let id = id.resolve(&repo.backend)?;
if let Ok(mut issue) = issues.get_mut(&id) {
- let signer = term::signer(&profile)?;
let comment_id = match comment_id {
Some(cid) => cid.resolve(&repo.backend)?,
None => *term::io::comment_select(&issue).map(|(cid, _)| cid)?,
@@ -164,11 +160,10 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
Some(reaction) => reaction,
None => term::io::reaction_select()?,
};
- issue.react(comment_id, reaction, true, &signer)?;
+ issue.react(comment_id, reaction, true)?;
}
}
Command::Assign { id, add, delete } => {
- let signer = term::signer(&profile)?;
let id = id.resolve(&repo.backend)?;
let Ok(mut issue) = issues.get_mut(&id) else {
anyhow::bail!("Issue `{id}` not found");
@@ -179,7 +174,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
.chain(add.iter())
.cloned()
.collect::<Vec<_>>();
- issue.assign(assignees, &signer)?;
+ issue.assign(assignees)?;
}
Command::Label { id, add, delete } => {
let id = id.resolve(&repo.backend)?;
@@ -192,8 +187,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
.chain(add.iter())
.cloned()
.collect::<Vec<_>>();
- let signer = term::signer(&profile)?;
- issue.label(labels, &signer)?;
+ issue.label(labels)?;
}
Command::List(list_args) => {
list(
@@ -206,8 +200,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
}
Command::Delete { id } => {
let id = id.resolve(&repo.backend)?;
- let signer = term::signer(&profile)?;
- issues.remove(&id, &signer)?;
+ issues.remove(&id)?;
}
Command::Cache { id, storage } => {
let mode = if storage {
@@ -365,20 +358,22 @@ fn mk_issue_row(
]
}
-fn open<R, G>(
+fn open<Repo, Signer>(
title: Option<Title>,
description: Option<String>,
labels: Vec<Label>,
assignees: Vec<Did>,
verbose: bool,
quiet: bool,
- cache: &mut issue::Cache<issue::Issues<'_, R>, cob::cache::StoreWriter>,
- signer: &Device<G>,
+ cache: &mut issue::Cache<'_, Repo, WriteAs<'_, Signer>, cob::cache::StoreWriter>,
profile: &Profile,
) -> anyhow::Result<()>
where
- R: WriteRepository + cob::Store<Namespace = NodeId>,
- G: crypto::signature::Signer<crypto::Signature>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
let (title, description) = if let (Some(t), Some(d)) = (title.as_ref(), description.as_ref()) {
(t.to_owned(), d.to_owned())
@@ -393,7 +388,6 @@ where
labels.as_slice(),
assignees.as_slice(),
[],
- signer,
)?;
if !quiet {
@@ -402,17 +396,19 @@ where
Ok(())
}
-fn edit<'a, 'g, R, G>(
- issues: &'g mut issue::Cache<issue::Issues<'a, R>, cob::cache::StoreWriter>,
+fn edit<'a, 'b, 'g, Repo, Signer>(
+ issues: &'g mut issue::Cache<'a, Repo, WriteAs<'b, Signer>, cob::cache::StoreWriter>,
repo: &storage::git::Repository,
id: Rev,
title: Option<Title>,
description: Option<String>,
- signer: &Device<G>,
-) -> anyhow::Result<issue::IssueMut<'a, 'g, R, cob::cache::StoreWriter>>
+) -> anyhow::Result<issue::IssueMut<'a, 'b, 'g, Repo, Signer, cob::cache::StoreWriter>>
where
- R: WriteRepository + cob::Store<Namespace = NodeId>,
- G: crypto::signature::Signer<crypto::Signature>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: radicle::crypto::signature::Signer<radicle::crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
let id = id.resolve(&repo.backend)?;
let mut issue = issues.get_mut(&id)?;
@@ -421,7 +417,7 @@ where
if title.is_some() || description.is_some() {
// Editing by command line arguments.
- issue.transaction("Edit", signer, |tx| {
+ issue.transaction("Edit", |tx| {
if let Some(t) = title {
tx.edit(t)?;
}
@@ -442,7 +438,7 @@ where
return Ok(issue);
};
- issue.transaction("Edit", signer, |tx| {
+ issue.transaction("Edit", |tx| {
tx.edit(title)?;
tx.edit_comment(comment_id, description, vec![])?;
diff --git a/crates/radicle-cli/src/commands/issue/cache.rs b/crates/radicle-cli/src/commands/issue/cache.rs
index e2fb606c2..4685c5801 100644
--- a/crates/radicle-cli/src/commands/issue/cache.rs
+++ b/crates/radicle-cli/src/commands/issue/cache.rs
@@ -1,6 +1,7 @@
use std::ops::ControlFlow;
use radicle::Profile;
+use radicle::cob::store::access::ReadOnly;
use radicle::issue::IssueId;
use radicle::storage::ReadStorage as _;
use radicle::storage::git::Repository;
@@ -37,7 +38,18 @@ pub fn run(mode: CacheMode, profile: &Profile) -> anyhow::Result<()> {
}
fn cache(id: Option<IssueId>, repository: &Repository, profile: &Profile) -> anyhow::Result<()> {
- let mut issues = term::cob::issues_mut(profile, repository)?;
+ let mut issues = {
+ // NOTE: Since we require a cache that is writeable, on top of a store that
+ // is read-only, we can neither use [`term::cob::issues_mut`] nor [`term::cob::issues`]
+ // since these convenience functions pair a writeable cache with a writeable
+ // store, and respectively a read-only cache with a read-only store.
+
+ let db = profile.cobs_db_mut()?;
+ db.check_version()?;
+ let store = radicle::cob::issue::Issues::open(repository, ReadOnly)?;
+
+ radicle::cob::issue::Cache::open(store, db)
+ };
match id {
Some(id) => {
diff --git a/crates/radicle-cli/src/commands/issue/comment.rs b/crates/radicle-cli/src/commands/issue/comment.rs
index d072716fb..e78803bf3 100644
--- a/crates/radicle-cli/src/commands/issue/comment.rs
+++ b/crates/radicle-cli/src/commands/issue/comment.rs
@@ -1,4 +1,5 @@
use radicle::Profile;
+use radicle::cob::store::access::WriteAs;
use radicle::cob::thread;
use radicle::storage::WriteRepository;
use radicle::{cob, git, issue, storage};
@@ -8,27 +9,35 @@ use crate::terminal as term;
use crate::terminal::Element as _;
use crate::terminal::patch::Message;
-pub(super) fn comment(
+pub(super) fn comment<Signer>(
profile: &Profile,
repo: &storage::git::Repository,
issues: &mut issue::Cache<
- issue::Issues<'_, storage::git::Repository>,
+ '_,
+ storage::git::Repository,
+ WriteAs<'_, Signer>,
cob::cache::Store<cob::cache::Write>,
>,
id: Rev,
message: Message,
reply_to: Option<Rev>,
quiet: bool,
-) -> Result<(), anyhow::Error> {
+) -> Result<(), anyhow::Error>
+where
+ Signer: radicle::crypto::signature::Keypair<VerifyingKey = radicle::crypto::PublicKey>,
+ Signer: radicle::crypto::signature::Signer<radicle::crypto::Signature>,
+ Signer: radicle::crypto::signature::Signer<radicle::crypto::ssh::ExtendedSignature>,
+ Signer: radicle::crypto::signature::Verifier<radicle::crypto::Signature>,
+{
let reply_to = reply_to
.map(|rev| rev.resolve::<git::Oid>(repo.raw()))
.transpose()?;
- let signer = term::signer(profile)?;
let issue_id = id.resolve::<cob::ObjectId>(&repo.backend)?;
let mut issue = issues.get_mut(&issue_id)?;
let (root_comment_id, _) = issue.root();
let body = prompt_comment(message, issue.thread(), reply_to, None)?;
- let comment_id = issue.comment(body, reply_to.unwrap_or(*root_comment_id), vec![], &signer)?;
+
+ let comment_id = issue.comment(body, reply_to.unwrap_or(*root_comment_id), vec![])?;
if quiet {
term::print(comment_id);
} else {
@@ -38,19 +47,26 @@ pub(super) fn comment(
Ok(())
}
-pub(super) fn edit(
+pub(super) fn edit<Signer>(
profile: &Profile,
repo: &storage::git::Repository,
issues: &mut issue::Cache<
- issue::Issues<'_, storage::git::Repository>,
+ '_,
+ storage::git::Repository,
+ WriteAs<'_, Signer>,
cob::cache::Store<cob::cache::Write>,
>,
id: Rev,
message: Message,
comment_id: Rev,
quiet: bool,
-) -> Result<(), anyhow::Error> {
- let signer = term::signer(profile)?;
+) -> Result<(), anyhow::Error>
+where
+ Signer: radicle::crypto::signature::Keypair<VerifyingKey = radicle::crypto::PublicKey>,
+ Signer: radicle::crypto::signature::Signer<radicle::crypto::Signature>,
+ Signer: radicle::crypto::signature::Signer<radicle::crypto::ssh::ExtendedSignature>,
+ Signer: radicle::crypto::signature::Verifier<radicle::crypto::Signature>,
+{
let issue_id = id.resolve::<cob::ObjectId>(&repo.backend)?;
let comment_id = comment_id.resolve(&repo.backend)?;
let mut issue = issues.get_mut(&issue_id)?;
@@ -64,7 +80,7 @@ pub(super) fn edit(
comment.reply_to(),
Some(comment.body()),
)?;
- issue.edit_comment(comment_id, body, vec![], &signer)?;
+ issue.edit_comment(comment_id, body, vec![])?;
if quiet {
term::print(comment_id);
} else {
diff --git a/crates/radicle-cli/src/commands/patch/archive.rs b/crates/radicle-cli/src/commands/patch/archive.rs
index 6e256e63c..6d634c237 100644
--- a/crates/radicle-cli/src/commands/patch/archive.rs
+++ b/crates/radicle-cli/src/commands/patch/archive.rs
@@ -10,15 +10,15 @@ pub fn run(
repository: &Repository,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repository)?;
+ let mut patches = term::cob::patches_mut(profile, repository, &signer)?;
let Ok(mut patch) = patches.get_mut(patch_id) else {
anyhow::bail!("Patch `{patch_id}` not found");
};
if undo {
- patch.unarchive(&signer)?;
+ patch.unarchive()?;
} else {
- patch.archive(&signer)?;
+ patch.archive()?;
}
Ok(())
diff --git a/crates/radicle-cli/src/commands/patch/assign.rs b/crates/radicle-cli/src/commands/patch/assign.rs
index af8d3bccc..28445d10f 100644
--- a/crates/radicle-cli/src/commands/patch/assign.rs
+++ b/crates/radicle-cli/src/commands/patch/assign.rs
@@ -15,7 +15,7 @@ pub fn run(
repository: &Repository,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repository)?;
+ let mut patches = term::cob::patches_mut(profile, repository, &signer)?;
let Ok(mut patch) = patches.get_mut(patch_id) else {
anyhow::bail!("Patch `{patch_id}` not found");
};
@@ -24,6 +24,6 @@ pub fn run(
.filter(|did| !delete.contains(did))
.chain(add)
.collect::<BTreeSet<_>>();
- patch.assign(assignees, &signer)?;
+ patch.assign(assignees)?;
Ok(())
}
diff --git a/crates/radicle-cli/src/commands/patch/cache.rs b/crates/radicle-cli/src/commands/patch/cache.rs
index f04e1c45c..da979f221 100644
--- a/crates/radicle-cli/src/commands/patch/cache.rs
+++ b/crates/radicle-cli/src/commands/patch/cache.rs
@@ -1,6 +1,7 @@
use std::ops::ControlFlow;
use radicle::Profile;
+use radicle::cob::store::access::ReadOnly;
use radicle::patch::PatchId;
use radicle::storage::ReadStorage as _;
use radicle::storage::git::Repository;
@@ -37,7 +38,18 @@ pub fn run(mode: CacheMode, profile: &Profile) -> anyhow::Result<()> {
}
fn cache(id: Option<PatchId>, repository: &Repository, profile: &Profile) -> anyhow::Result<()> {
- let mut patches = term::cob::patches_mut(profile, repository)?;
+ let mut patches = {
+ // NOTE: Since we require a cache that is writeable, on top of a store that
+ // is read-only, we can neither use [`term::cob::patches_mut`] nor [`term::cob::patches`]
+ // since these convenience functions pair a writeable cache with a writeable
+ // store, and respectively a read-only cache with a read-only store.
+
+ let db = profile.cobs_db_mut()?;
+ db.check_version()?;
+ let store = radicle::cob::patch::Patches::open(repository, ReadOnly)?;
+
+ radicle::cob::patch::Cache::open(store, db)
+ };
match id {
Some(id) => {
diff --git a/crates/radicle-cli/src/commands/patch/comment.rs b/crates/radicle-cli/src/commands/patch/comment.rs
index 564b403d9..b910db2d3 100644
--- a/crates/radicle-cli/src/commands/patch/comment.rs
+++ b/crates/radicle-cli/src/commands/patch/comment.rs
@@ -24,7 +24,7 @@ pub fn run(
profile: &Profile,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repo)?;
+ let mut patches = term::cob::patches_mut(profile, repo, &signer)?;
let revision_id = revision_id.resolve::<cob::EntryId>(&repo.backend)?;
let ByRevision {
@@ -37,7 +37,7 @@ pub fn run(
.ok_or_else(|| anyhow!("Patch revision `{revision_id}` not found"))?;
let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
let (body, reply_to) = prompt(message, reply_to, &revision, repo)?;
- let comment_id = patch.comment(revision_id, body, reply_to, None, vec![], &signer)?;
+ let comment_id = patch.comment(revision_id, body, reply_to, None, vec![])?;
let comment = patch
.revision(&revision_id)
.ok_or(anyhow!("error retrieving revision `{revision_id}`"))?
diff --git a/crates/radicle-cli/src/commands/patch/comment/edit.rs b/crates/radicle-cli/src/commands/patch/comment/edit.rs
index b8d428462..2aad3f793 100644
--- a/crates/radicle-cli/src/commands/patch/comment/edit.rs
+++ b/crates/radicle-cli/src/commands/patch/comment/edit.rs
@@ -21,7 +21,7 @@ pub fn run(
profile: &Profile,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = profile.patches_mut(repo)?;
+ let mut patches = term::cob::patches_mut(profile, repo, &signer)?;
let revision_id = revision_id.resolve::<cob::EntryId>(&repo.backend)?;
let ByRevision {
id: patch_id,
@@ -33,7 +33,7 @@ pub fn run(
.ok_or_else(|| anyhow!("Patch revision `{revision_id}` not found"))?;
let (body, _) = super::prompt(message, None, &revision, repo)?;
let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
- patch.comment_edit(revision_id, comment_id, body, vec![], &signer)?;
+ patch.comment_edit(revision_id, comment_id, body, vec![])?;
if !quiet {
let comment = patch
diff --git a/crates/radicle-cli/src/commands/patch/comment/react.rs b/crates/radicle-cli/src/commands/patch/comment/react.rs
index 3f5f667b4..2d5e54e8a 100644
--- a/crates/radicle-cli/src/commands/patch/comment/react.rs
+++ b/crates/radicle-cli/src/commands/patch/comment/react.rs
@@ -21,7 +21,7 @@ pub fn run(
profile: &Profile,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = profile.patches_mut(repo)?;
+ let mut patches = term::cob::patches_mut(profile, repo, &signer)?;
let revision_id = revision_id.resolve::<cob::EntryId>(&repo.backend)?;
let ByRevision {
id: patch_id,
@@ -32,7 +32,7 @@ pub fn run(
.find_by_revision(&patch::RevisionId::from(revision_id))?
.ok_or_else(|| anyhow!("Patch revision `{revision_id}` not found"))?;
let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
- patch.comment_react(revision_id, comment, reaction, active, &signer)?;
+ patch.comment_react(revision_id, comment, reaction, active)?;
Ok(())
}
diff --git a/crates/radicle-cli/src/commands/patch/comment/redact.rs b/crates/radicle-cli/src/commands/patch/comment/redact.rs
index d6de9c3cf..71164286c 100644
--- a/crates/radicle-cli/src/commands/patch/comment/redact.rs
+++ b/crates/radicle-cli/src/commands/patch/comment/redact.rs
@@ -18,7 +18,7 @@ pub fn run(
profile: &Profile,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = profile.patches_mut(repo)?;
+ let mut patches = term::cob::patches_mut(profile, repo, &signer)?;
let revision_id = revision_id.resolve::<cob::EntryId>(&repo.backend)?;
let ByRevision {
id: patch_id,
@@ -29,7 +29,7 @@ pub fn run(
.find_by_revision(&patch::RevisionId::from(revision_id))?
.ok_or_else(|| anyhow!("Patch revision `{revision_id}` not found"))?;
let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
- patch.comment_redact(revision_id, comment, &signer)?;
+ patch.comment_redact(revision_id, comment)?;
term::success!("Redacted comment {comment}");
Ok(())
diff --git a/crates/radicle-cli/src/commands/patch/delete.rs b/crates/radicle-cli/src/commands/patch/delete.rs
index c1044065a..38074ea03 100644
--- a/crates/radicle-cli/src/commands/patch/delete.rs
+++ b/crates/radicle-cli/src/commands/patch/delete.rs
@@ -4,9 +4,9 @@ use radicle::storage::git::Repository;
use super::*;
pub fn run(patch_id: &PatchId, profile: &Profile, repository: &Repository) -> anyhow::Result<()> {
- let signer = &term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repository)?;
- patches.remove(patch_id, signer)?;
+ let signer = term::signer(profile)?;
+ let mut patches = term::cob::patches_mut(profile, repository, &signer)?;
+ patches.remove(patch_id)?;
Ok(())
}
diff --git a/crates/radicle-cli/src/commands/patch/edit.rs b/crates/radicle-cli/src/commands/patch/edit.rs
index 4e0c7b585..ccaa32ed7 100644
--- a/crates/radicle-cli/src/commands/patch/edit.rs
+++ b/crates/radicle-cli/src/commands/patch/edit.rs
@@ -4,7 +4,6 @@ use radicle::cob;
use radicle::cob::Title;
use radicle::cob::patch;
use radicle::crypto;
-use radicle::node::device::Device;
use radicle::prelude::*;
use radicle::storage::git::Repository;
@@ -18,26 +17,28 @@ pub fn run(
repository: &Repository,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repository)?;
+ let mut patches = term::cob::patches_mut(profile, repository, &signer)?;
let Ok(patch) = patches.get_mut(patch_id) else {
anyhow::bail!("Patch `{patch_id}` not found");
};
let (title, description) = term::patch::get_edit_message(message, &patch)?;
match revision_id {
- Some(id) => edit_revision(patch, id, title, description, &signer),
- None => edit_root(patch, title, description, &signer),
+ Some(id) => edit_revision(patch, id, title, description),
+ None => edit_root(patch, title, description),
}
}
-fn edit_root<G>(
- mut patch: patch::PatchMut<'_, '_, Repository, cob::cache::StoreWriter>,
+fn edit_root<Signer>(
+ mut patch: patch::PatchMut<'_, '_, '_, Repository, Signer, cob::cache::StoreWriter>,
title: Title,
description: String,
- signer: &Device<G>,
) -> anyhow::Result<()>
where
- G: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
let title = if title.as_ref() != patch.title() {
Some(title)
@@ -59,7 +60,7 @@ where
let target = patch.target();
let embeds = patch.embeds().to_owned();
- patch.transaction("Edit root", signer, |tx| {
+ patch.transaction("Edit root", |tx| {
if let Some(t) = title {
tx.edit(t, target)?;
}
@@ -72,15 +73,17 @@ where
Ok(())
}
-fn edit_revision<G>(
- mut patch: patch::PatchMut<'_, '_, Repository, cob::cache::StoreWriter>,
+fn edit_revision<Signer>(
+ mut patch: patch::PatchMut<'_, '_, '_, Repository, Signer, cob::cache::StoreWriter>,
revision: patch::RevisionId,
title: Title,
description: String,
- signer: &Device<G>,
) -> anyhow::Result<()>
where
- G: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<radicle::crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
let embeds = patch.embeds().to_owned();
let mut message = title.to_string();
@@ -91,7 +94,7 @@ where
message.push_str(&description);
message
};
- patch.transaction("Edit revision", signer, |tx| {
+ patch.transaction("Edit revision", |tx| {
tx.edit_revision(revision, message, embeds)?;
Ok(())
})?;
diff --git a/crates/radicle-cli/src/commands/patch/label.rs b/crates/radicle-cli/src/commands/patch/label.rs
index d2aa7bb1a..84fa4bf36 100644
--- a/crates/radicle-cli/src/commands/patch/label.rs
+++ b/crates/radicle-cli/src/commands/patch/label.rs
@@ -12,7 +12,7 @@ pub fn run(
repository: &Repository,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repository)?;
+ let mut patches = term::cob::patches_mut(profile, repository, &signer)?;
let Ok(mut patch) = patches.get_mut(patch_id) else {
anyhow::bail!("Patch `{patch_id}` not found");
};
@@ -22,6 +22,6 @@ pub fn run(
.chain(add.iter())
.cloned()
.collect::<Vec<_>>();
- patch.label(labels, &signer)?;
+ patch.label(labels)?;
Ok(())
}
diff --git a/crates/radicle-cli/src/commands/patch/react.rs b/crates/radicle-cli/src/commands/patch/react.rs
index 400ea7bc6..f0bc93faa 100644
--- a/crates/radicle-cli/src/commands/patch/react.rs
+++ b/crates/radicle-cli/src/commands/patch/react.rs
@@ -18,7 +18,7 @@ pub fn run(
profile: &Profile,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = profile.patches_mut(repo)?;
+ let mut patches = crate::terminal::cob::patches_mut(profile, repo, &signer)?;
let revision_id = revision_id.resolve::<cob::EntryId>(&repo.backend)?;
let ByRevision {
id: patch_id,
@@ -29,7 +29,7 @@ pub fn run(
.find_by_revision(&patch::RevisionId::from(revision_id))?
.ok_or_else(|| anyhow!("Patch revision `{revision_id}` not found"))?;
let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
- patch.react(revision_id, reaction, None, active, &signer)?;
+ patch.react(revision_id, reaction, None, active)?;
Ok(())
}
diff --git a/crates/radicle-cli/src/commands/patch/ready.rs b/crates/radicle-cli/src/commands/patch/ready.rs
index d40d74f2d..6ebe884a3 100644
--- a/crates/radicle-cli/src/commands/patch/ready.rs
+++ b/crates/radicle-cli/src/commands/patch/ready.rs
@@ -10,15 +10,10 @@ pub fn run(
repository: &Repository,
) -> anyhow::Result<bool> {
let signer = term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repository)?;
+ let mut patches = term::cob::patches_mut(profile, repository, &signer)?;
let Ok(mut patch) = patches.get_mut(patch_id) else {
anyhow::bail!("Patch `{patch_id}` not found");
};
- if undo {
- patch.unready(&signer)
- } else {
- patch.ready(&signer)
- }
- .map_err(anyhow::Error::from)
+ if undo { patch.unready() } else { patch.ready() }.map_err(anyhow::Error::from)
}
diff --git a/crates/radicle-cli/src/commands/patch/redact.rs b/crates/radicle-cli/src/commands/patch/redact.rs
index f66ff18d7..ab21bb67d 100644
--- a/crates/radicle-cli/src/commands/patch/redact.rs
+++ b/crates/radicle-cli/src/commands/patch/redact.rs
@@ -13,7 +13,7 @@ pub fn run(
repository: &Repository,
) -> anyhow::Result<()> {
let signer = &term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repository)?;
+ let mut patches = term::cob::patches_mut(profile, repository, signer)?;
let revision_id = revision_id.resolve::<Oid>(&repository.backend)?;
let patch::ByRevision {
@@ -27,7 +27,7 @@ pub fn run(
anyhow::bail!("Patch `{patch_id}` not found");
};
- patch.redact(revision_id, signer)?;
+ patch.redact(revision_id)?;
Ok(())
}
diff --git a/crates/radicle-cli/src/commands/patch/resolve.rs b/crates/radicle-cli/src/commands/patch/resolve.rs
index 08f341670..c982518b7 100644
--- a/crates/radicle-cli/src/commands/patch/resolve.rs
+++ b/crates/radicle-cli/src/commands/patch/resolve.rs
@@ -15,12 +15,12 @@ pub fn resolve(
profile: &Profile,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repo)?;
+ let mut patches = term::cob::patches_mut(profile, repo, &signer)?;
let patch = patches
.get(&patch_id)?
.ok_or_else(|| anyhow!("Patch `{patch_id}` not found"))?;
let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
- patch.resolve_review_comment(review, comment, &signer)?;
+ patch.resolve_review_comment(review, comment)?;
Ok(())
}
@@ -32,11 +32,11 @@ pub fn unresolve(
profile: &Profile,
) -> anyhow::Result<()> {
let signer = term::signer(profile)?;
- let mut patches = term::cob::patches_mut(profile, repo)?;
+ let mut patches = term::cob::patches_mut(profile, repo, &signer)?;
let patch = patches
.get(&patch_id)?
.ok_or_else(|| anyhow!("Patch `{patch_id}` not found"))?;
let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
- patch.unresolve_review_comment(review, comment, &signer)?;
+ patch.unresolve_review_comment(review, comment)?;
Ok(())
}
diff --git a/crates/radicle-cli/src/commands/patch/review.rs b/crates/radicle-cli/src/commands/patch/review.rs
index 07e594bd4..9142d0371 100644
--- a/crates/radicle-cli/src/commands/patch/review.rs
+++ b/crates/radicle-cli/src/commands/patch/review.rs
@@ -69,7 +69,7 @@ pub fn run(
"couldn't load repository {} from local state",
repository.id
))?;
- let mut patches = term::cob::patches_mut(profile, repository)?;
+ let mut patches = term::cob::patches_mut(profile, repository, &signer)?;
let mut patch = patches
.get_mut(&patch_id)
.context(format!("couldn't find patch {patch_id} locally"))?;
@@ -111,7 +111,7 @@ pub fn run(
} else {
Some(message)
};
- patch.review(revision_id, verdict, message, vec![], &signer)?;
+ patch.review(revision_id, verdict, message, vec![])?;
match verdict {
Some(Verdict::Accept) => {
diff --git a/crates/radicle-cli/src/commands/patch/review/builder.rs b/crates/radicle-cli/src/commands/patch/review/builder.rs
index 1962326c8..7aaa8adb9 100644
--- a/crates/radicle-cli/src/commands/patch/review/builder.rs
+++ b/crates/radicle-cli/src/commands/patch/review/builder.rs
@@ -648,7 +648,7 @@ impl<'a> ReviewBuilder<'a> {
};
let diff = self.diff(&brain.accepted, &tree, repo, opts)?;
let drafts = DraftStore::new(self.repo, *signer.public_key());
- let mut patches = cob::patch::Cache::no_cache(&drafts)?;
+ let mut patches = cob::patch::Cache::no_cache(&drafts, signer)?;
let mut patch = patches.get_mut(&patch_id)?;
let mut queue = ReviewQueue::from(diff);
@@ -668,7 +668,6 @@ impl<'a> ReviewBuilder<'a> {
Some(Verdict::Reject),
None,
vec![],
- signer,
)?
};
@@ -719,7 +718,7 @@ impl<'a> ReviewBuilder<'a> {
let builder = CommentBuilder::new(revision.head(), path.to_path_buf());
let comments = builder.edit(hunk)?;
- patch.transaction("Review comments", signer, |tx| {
+ patch.transaction("Review comments", |tx| {
for comment in comments {
tx.review_comment(
review,
diff --git a/crates/radicle-cli/src/commands/patch/update.rs b/crates/radicle-cli/src/commands/patch/update.rs
index 52cac82a4..44ea967a3 100644
--- a/crates/radicle-cli/src/commands/patch/update.rs
+++ b/crates/radicle-cli/src/commands/patch/update.rs
@@ -20,7 +20,8 @@ pub fn run(
let head_branch = try_branch(workdir.head()?)?;
let (_, target_oid) = get_merge_target(repository, &head_branch)?;
- let mut patches = term::cob::patches_mut(profile, repository)?;
+ let signer = term::signer(profile)?;
+ let mut patches = term::cob::patches_mut(profile, repository, &signer)?;
let Ok(mut patch) = patches.get_mut(&patch_id) else {
anyhow::bail!("Patch `{patch_id}` not found");
};
@@ -45,8 +46,7 @@ pub fn run(
let (_, revision) = patch.latest();
let message = term::patch::get_update_message(message, workdir, revision, &head_oid.into())?;
- let signer = term::signer(profile)?;
- let revision = patch.update(message, base_oid, head_oid, &signer)?;
+ let revision = patch.update(message, base_oid, head_oid)?;
term::print(revision);
diff --git a/crates/radicle-cli/src/commands/publish.rs b/crates/radicle-cli/src/commands/publish.rs
index 0cf3f3cf2..39e9e3faa 100644
--- a/crates/radicle-cli/src/commands/publish.rs
+++ b/crates/radicle-cli/src/commands/publish.rs
@@ -21,7 +21,8 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
};
let repo = profile.storage.repository_mut(rid)?;
- let mut identity = Identity::load_mut(&repo)?;
+ let signer = profile.signer()?;
+ let mut identity = Identity::load_mut(&repo, &signer)?;
let doc = identity.doc();
if doc.is_public() {
@@ -51,12 +52,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
// SAFETY: the `Title` here is guaranteed to be nonempty and does not
// contain `\n` or `\r`.
#[allow(clippy::unwrap_used)]
- identity.update(
- cob::Title::new("Publish repository").unwrap(),
- "",
- &doc,
- &signer,
- )?;
+ identity.update(cob::Title::new("Publish repository").unwrap(), "", &doc)?;
repo.sign_refs(&signer)?;
repo.set_identity_head()?;
let validations = repo.validate()?;
diff --git a/crates/radicle-cli/src/terminal/cob.rs b/crates/radicle-cli/src/terminal/cob.rs
index 81c4b20ac..5267f03d3 100644
--- a/crates/radicle-cli/src/terminal/cob.rs
+++ b/crates/radicle-cli/src/terminal/cob.rs
@@ -3,6 +3,7 @@ use radicle::{
cob::{
self,
cache::{MigrateCallback, MigrateProgress},
+ store::access::{ReadOnly, WriteAs},
},
prelude::NodeId,
profile,
@@ -58,47 +59,53 @@ pub mod migrate {
}
/// Return a read-only handle for the patches cache.
-pub fn patches<'a, R>(
+pub fn patches<'a, Repo>(
profile: &Profile,
- repository: &'a R,
-) -> Result<cob::patch::Cache<cob::patch::Patches<'a, R>, cob::cache::StoreReader>, anyhow::Error>
+ repository: &'a Repo,
+) -> Result<cob::patch::Cache<'a, Repo, ReadOnly, cob::cache::StoreReader>, anyhow::Error>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
profile.patches(repository).map_err(with_hint)
}
/// Return a read-write handle for the patches cache.
-pub fn patches_mut<'a, R>(
+/// Prefer this over [`radicle::profile::Home::patches_mut`],
+/// to obtain an error hint in case migrations must be run.
+pub fn patches_mut<'a, 'b, Repo, Signer>(
profile: &Profile,
- repository: &'a R,
-) -> Result<cob::patch::Cache<cob::patch::Patches<'a, R>, cob::cache::StoreWriter>, anyhow::Error>
+ repository: &'a Repo,
+ signer: &'b Signer,
+) -> Result<cob::patch::Cache<'a, Repo, WriteAs<'b, Signer>, cob::cache::StoreWriter>, anyhow::Error>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
- profile.patches_mut(repository).map_err(with_hint)
+ profile.patches_mut(repository, signer).map_err(with_hint)
}
/// Return a read-only handle for the issues cache.
-pub fn issues<'a, R>(
+pub fn issues<'a, Repo>(
profile: &Profile,
- repository: &'a R,
-) -> Result<cob::issue::Cache<cob::issue::Issues<'a, R>, cob::cache::StoreReader>, anyhow::Error>
+ repository: &'a Repo,
+) -> Result<cob::issue::Cache<'a, Repo, ReadOnly, cob::cache::StoreReader>, anyhow::Error>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
profile.issues(repository).map_err(with_hint)
}
/// Return a read-write handle for the issues cache.
-pub fn issues_mut<'a, R>(
+/// Prefer this over [`radicle::profile::Home::issues_mut`],
+/// to obtain an error hint in case migrations must be run.
+pub fn issues_mut<'a, 'b, Repo, Signer>(
profile: &Profile,
- repository: &'a R,
-) -> Result<cob::issue::Cache<cob::issue::Issues<'a, R>, cob::cache::StoreWriter>, anyhow::Error>
+ repository: &'a Repo,
+ signer: &'b Signer,
+) -> Result<cob::issue::Cache<'a, Repo, WriteAs<'b, Signer>, cob::cache::StoreWriter>, anyhow::Error>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
- profile.issues_mut(repository).map_err(with_hint)
+ profile.issues_mut(repository, signer).map_err(with_hint)
}
/// Adds a hint to the COB out-of-date database error.
diff --git a/crates/radicle-cli/tests/commands/cob.rs b/crates/radicle-cli/tests/commands/cob.rs
index 77c93e89e..df1998927 100644
--- a/crates/radicle-cli/tests/commands/cob.rs
+++ b/crates/radicle-cli/tests/commands/cob.rs
@@ -2,6 +2,7 @@ use std::path::Path;
use crate::util::environment::Environment;
use crate::{program_reports_version, test};
+use radicle::cob::store::access::{ReadOnly, WriteAs};
use radicle::node::Handle;
use radicle::test::fixtures;
@@ -135,7 +136,8 @@ fn test_cob_replication() {
.unwrap();
let bob_repo = radicle::storage::ReadStorage::repository(&bob.storage, rid).unwrap();
- let mut bob_issues = radicle::cob::issue::Issues::open(&bob_repo).unwrap();
+ let mut bob_issues =
+ radicle::cob::issue::Issues::open(&bob_repo, WriteAs::new(&bob.signer)).unwrap();
let mut bob_cache = radicle::cob::cache::InMemory::default();
let issue = bob_issues
.create(
@@ -145,7 +147,6 @@ fn test_cob_replication() {
&[],
[],
&mut bob_cache,
- &bob.signer,
)
.unwrap();
log::debug!(target: "test", "Issue {} created", issue.id());
@@ -163,7 +164,7 @@ fn test_cob_replication() {
.unwrap();
let alice_repo = radicle::storage::ReadStorage::repository(&alice.storage, rid).unwrap();
- let alice_issues = radicle::cob::issue::Issues::open(&alice_repo).unwrap();
+ let alice_issues = radicle::cob::issue::Issues::open(&alice_repo, ReadOnly).unwrap();
let alice_issue = alice_issues.get(issue.id()).unwrap().unwrap();
assert_eq!(alice_issue.title(), "Something's fishy");
@@ -192,7 +193,8 @@ fn test_cob_deletion() {
bob.routes_to(&[(rid, alice.id)]);
let alice_repo = radicle::storage::ReadStorage::repository(&alice.storage, rid).unwrap();
- let mut alice_issues = radicle::cob::issue::Cache::no_cache(&alice_repo).unwrap();
+ let mut alice_issues =
+ radicle::cob::issue::Cache::no_cache(&alice_repo, &alice.signer).unwrap();
let issue = alice_issues
.create(
radicle::cob::Title::new("Something's fishy").unwrap(),
@@ -200,7 +202,6 @@ fn test_cob_deletion() {
&[],
&[],
[],
- &alice.signer,
)
.unwrap();
let issue_id = issue.id();
@@ -210,11 +211,12 @@ fn test_cob_deletion() {
.unwrap();
let bob_repo = radicle::storage::ReadStorage::repository(&bob.storage, rid).unwrap();
- let bob_issues = radicle::cob::issue::Issues::open(&bob_repo).unwrap();
+ let bob_issues = radicle::cob::issue::Issues::open(&bob_repo, ReadOnly).unwrap();
assert!(bob_issues.get(issue_id).unwrap().is_some());
- let mut alice_issues = radicle::cob::issue::Cache::no_cache(&alice_repo).unwrap();
- alice_issues.remove(issue_id, &alice.signer).unwrap();
+ let mut alice_issues =
+ radicle::cob::issue::Cache::no_cache(&alice_repo, &alice.signer).unwrap();
+ alice_issues.remove(issue_id).unwrap();
log::debug!(target: "test", "Removing issue..");
@@ -225,6 +227,6 @@ fn test_cob_deletion() {
radicle::node::FetchResult::Success { .. }
);
let bob_repo = radicle::storage::ReadStorage::repository(&bob.storage, rid).unwrap();
- let bob_issues = radicle::cob::issue::Issues::open(&bob_repo).unwrap();
+ let bob_issues = radicle::cob::issue::Issues::open(&bob_repo, ReadOnly).unwrap();
assert!(bob_issues.get(issue_id).unwrap().is_none());
}
diff --git a/crates/radicle-node/src/test/node.rs b/crates/radicle-node/src/test/node.rs
index a7eb96088..52d7f3f7b 100644
--- a/crates/radicle-node/src/test/node.rs
+++ b/crates/radicle-node/src/test/node.rs
@@ -11,6 +11,10 @@ use std::{
use crossbeam_channel as chan;
+use crate::node::NodeId;
+use crate::node::device::Device;
+use crate::storage::git::transport;
+use crate::{Runtime, runtime, runtime::Handle, service};
use radicle::Storage;
use radicle::cob;
use radicle::cob::issue;
@@ -34,11 +38,6 @@ use radicle::rad;
use radicle::storage::{ReadStorage as _, RemoteRepository as _, SignRepository as _};
use radicle::test::fixtures;
-use crate::node::NodeId;
-use crate::node::device::Device;
-use crate::storage::git::transport;
-use crate::{Runtime, runtime, runtime::Handle, service};
-
/// A node that can be run.
pub struct Node<G> {
pub id: NodeId,
@@ -360,13 +359,10 @@ impl<G: Signer<Signature> + cyphernet::Ecdh> NodeHandle<G> {
}
/// Create an [`issue::Issue`] in the `NodeHandle`'s storage.
- pub fn issue(&self, rid: RepoId, title: cob::Title, desc: &str) -> cob::ObjectId {
+ pub fn issue(&mut self, rid: RepoId, title: cob::Title, desc: &str) -> cob::ObjectId {
let repo = self.storage.repository(rid).unwrap();
- let mut issues = issue::Cache::no_cache(&repo).unwrap();
- *issues
- .create(title, desc, &[], &[], [], &self.signer)
- .unwrap()
- .id()
+ let mut issues = issue::Cache::no_cache(&repo, &self.signer).unwrap();
+ *issues.create(title, desc, &[], &[], []).unwrap().id()
}
/// Perform a commit to `refname` by generating a blob of random data to a
diff --git a/crates/radicle-node/src/test/peer.rs b/crates/radicle-node/src/test/peer.rs
index e5ec740c8..80378b378 100644
--- a/crates/radicle-node/src/test/peer.rs
+++ b/crates/radicle-node/src/test/peer.rs
@@ -134,7 +134,6 @@ impl Default for Config<MockSigner> {
impl<G: crypto::signature::Signer<crypto::Signature>> Peer<Storage, G> {
pub fn project(&mut self, name: &str, description: &str) -> RepoId {
radicle::storage::git::transport::local::register(self.storage().clone());
-
let (repo, _) = fixtures::repository(self.tempdir.path().join(name));
let (rid, _, _) = rad::init(
&repo,
diff --git a/crates/radicle-node/src/tests.rs b/crates/radicle-node/src/tests.rs
index 9dc855c61..789ad4fdb 100644
--- a/crates/radicle-node/src/tests.rs
+++ b/crates/radicle-node/src/tests.rs
@@ -1021,7 +1021,7 @@ fn test_refs_announcement_offline() {
// Create an issue without telling the node.
let repo = alice.storage().repository(rid).unwrap();
let old_refs = RefsAt::new(&repo, alice.id).unwrap();
- let mut issues = radicle::issue::Cache::no_cache(&repo).unwrap();
+ let mut issues = radicle::issue::Cache::no_cache(&repo, alice.signer()).unwrap();
issues
.create(
cob::Title::new("Issue while offline!").unwrap(),
@@ -1029,7 +1029,6 @@ fn test_refs_announcement_offline() {
&[],
&[],
[],
- alice.signer(),
)
.unwrap();
let new_refs = RefsAt::new(&repo, alice.id).unwrap();
diff --git a/crates/radicle-node/src/tests/e2e.rs b/crates/radicle-node/src/tests/e2e.rs
index c2b4484a3..c53fa0154 100644
--- a/crates/radicle-node/src/tests/e2e.rs
+++ b/crates/radicle-node/src/tests/e2e.rs
@@ -2,6 +2,7 @@ use std::{collections::HashSet, thread, time};
use radicle::cob;
use radicle::cob::Title;
+use radicle::cob::store::access::{ReadOnly, WriteAs};
use radicle_crypto::test::signer::MockSigner;
use test_log::test;
@@ -514,6 +515,7 @@ fn test_missing_remote() {
.unwrap();
assert!(result.is_success());
log::debug!(target: "test", "Fetch complete with {}", bob.id);
+
rad::fork_remote(acme, &alice.id, &carol, &bob.storage).unwrap();
alice.issue(
@@ -935,7 +937,7 @@ fn test_non_fastforward_sigrefs() {
let rid = bob.project("acme", "");
let mut alice = alice.spawn();
- let bob = bob.spawn();
+ let mut bob = bob.spawn();
let mut eve = eve.spawn();
alice.handle.seed(rid, Scope::All).unwrap();
@@ -1114,7 +1116,7 @@ fn test_outdated_sigrefs() {
FetchResult::Success { .. }
);
let repo = alice.storage.repository(rid).unwrap();
- let issues = issue::Issues::open(&repo).unwrap();
+ let issues = issue::Issues::open(&repo, WriteAs::new(&alice.signer)).unwrap();
assert!(
issues.get(&issue_id).unwrap().is_some(),
"Alice did not fetch issue {issue_id}"
@@ -1348,12 +1350,14 @@ fn missing_delegate_default_branch() {
.unwrap();
assert!(bob.storage.contains(&rid).unwrap());
+ let bob_key = *bob.signer.public_key();
+
// Helper to assert that Bob's default branch is not in storage
let assert_bobs_default_is_missing = |repo: &Repository| {
let doc = repo.identity_doc().unwrap();
let project = doc.project().unwrap();
let default_branch = repo.reference(
- bob.signer.public_key(),
+ &bob_key,
&radicle::git::refs::branch(project.default_branch()),
);
assert!(matches!(
@@ -1365,7 +1369,7 @@ fn missing_delegate_default_branch() {
// Add Bob as a delegate to the identity document
{
let repo = alice.storage.repository(rid).unwrap();
- let mut identity = Identity::load_mut(&repo).unwrap();
+ let mut identity = Identity::load_mut(&repo, &alice.signer).unwrap();
let doc = repo
.identity_doc()
.unwrap()
@@ -1375,7 +1379,7 @@ fn missing_delegate_default_branch() {
})
.unwrap();
let rev = identity
- .update(Title::new("Add Bob").unwrap(), "", &doc, &alice.signer)
+ .update(Title::new("Add Bob").unwrap(), "", &doc)
.unwrap();
repo.set_identity_head_to(rev).unwrap();
@@ -1735,6 +1739,7 @@ fn test_non_fastforward_identity_doc() {
.handle
.fetch(rid, alice.id, DEFAULT_TIMEOUT, None)
.unwrap();
+
// Alice pushes new references to her laptop
let issue = alice_laptop.issue(
rid,
@@ -1752,7 +1757,7 @@ fn test_non_fastforward_identity_doc() {
// Alice updates the identity of the document to include her laptop
let (prev, next) = {
let repo = alice.storage.repository(rid).unwrap();
- let mut identity = Identity::load_mut(&repo).unwrap();
+ let mut identity = Identity::load_mut(&repo, &alice.signer).unwrap();
let prev = identity.current;
let doc = repo
.identity_doc()
@@ -1761,7 +1766,7 @@ fn test_non_fastforward_identity_doc() {
.with_edits(|raw| raw.delegate(alice_laptop.id.into()))
.unwrap();
let rev = identity
- .update(Title::new("Add Laptop").unwrap(), "", &doc, &alice.signer)
+ .update(Title::new("Add Laptop").unwrap(), "", &doc)
.unwrap();
repo.set_identity_head_to(rev).unwrap();
(prev, rev)
@@ -1780,7 +1785,7 @@ fn test_non_fastforward_identity_doc() {
assert!(matches!(result, FetchResult::Success { .. }));
assert!(!has_issue(&bob, &issue));
let repo = bob.storage.repository(rid).unwrap();
- let identity = Identity::load_mut(&repo).unwrap();
+ let identity = Identity::load_mut(&repo, &bob.signer).unwrap();
assert_eq!(identity.current, next);
assert_eq!(identity.parent, Some(prev));
@@ -1793,7 +1798,7 @@ fn test_non_fastforward_identity_doc() {
assert!(matches!(result, FetchResult::Success { .. }));
assert!(has_issue(&bob, &issue));
let repo = bob.storage.repository(rid).unwrap();
- let identity = Identity::load_mut(&repo).unwrap();
+ let identity = Identity::load_mut(&repo, &bob.signer).unwrap();
assert_eq!(identity.current, next);
assert_eq!(identity.parent, Some(prev));
}
@@ -1917,7 +1922,7 @@ fn fetch_does_not_contain_rad_sigrefs_parent() {
FetchResult::Success { .. }
);
let repo = bob.storage.repository(rid).unwrap();
- let issues = issue::Issues::open(&repo).unwrap();
+ let issues = issue::Issues::open(&repo, ReadOnly).unwrap();
assert!(
issues.get(&issue_id).unwrap().is_some(),
"Bob did not fetch issue {issue_id}"
diff --git a/crates/radicle-node/src/worker/fetch.rs b/crates/radicle-node/src/worker/fetch.rs
index e500f5d1c..be0758b06 100644
--- a/crates/radicle-node/src/worker/fetch.rs
+++ b/crates/radicle-node/src/worker/fetch.rs
@@ -1,3 +1,4 @@
+use radicle::cob::store::access::ReadOnly;
use radicle::identity::CanonicalRefs;
use radicle::identity::doc::CanonicalRefsError;
use radicle::storage::git::TempRepository;
@@ -272,8 +273,8 @@ where
C: cob::cache::Update<cob::issue::Issue> + cob::cache::Update<cob::patch::Patch>,
C: cob::cache::Remove<cob::issue::Issue> + cob::cache::Remove<cob::patch::Patch>,
{
- let mut issues = cob::store::Store::<cob::issue::Issue, _>::open(storage)?;
- let mut patches = cob::store::Store::<cob::patch::Patch, _>::open(storage)?;
+ let mut issues = cob::store::Store::<cob::issue::Issue, _, _>::open(storage, ReadOnly)?;
+ let mut patches = cob::store::Store::<cob::patch::Patch, _, _>::open(storage, ReadOnly)?;
for update in refs {
match update {
@@ -303,15 +304,15 @@ where
}
/// Update or remove a cache entry.
-fn update_or_remove<R, C, T>(
- store: &mut cob::store::Store<T, R>,
+fn update_or_remove<T, Repo, C>(
+ store: &mut cob::store::Store<T, Repo, ReadOnly>,
cache: &mut C,
rid: &RepoId,
tid: TypedId,
) -> Result<(), error::Cache>
where
- R: cob::Store + ReadRepository,
- T: cob::Evaluate<R> + cob::store::Cob + cob::store::CobWithType,
+ T: cob::Evaluate<Repo> + cob::store::Cob + cob::store::CobWithType,
+ Repo: cob::Store<Namespace = NodeId> + ReadRepository,
C: cob::cache::Update<T> + cob::cache::Remove<T>,
{
match store.get(&tid.id) {
diff --git a/crates/radicle-remote-helper/src/main.rs b/crates/radicle-remote-helper/src/main.rs
index aca172289..1883459fc 100644
--- a/crates/radicle-remote-helper/src/main.rs
+++ b/crates/radicle-remote-helper/src/main.rs
@@ -28,6 +28,7 @@ use std::process;
use std::str::FromStr;
use std::{env, fmt};
+use radicle::cob::store::access::{ReadOnly, WriteAs};
use thiserror::Error;
use radicle::prelude::NodeId;
@@ -458,10 +459,10 @@ pub(crate) fn warn(s: impl fmt::Display) {
}
/// Get the patch store.
-pub(crate) fn patches<'a, R: ReadRepository + cob::Store<Namespace = NodeId>>(
+pub(crate) fn patches<'a, Repo: ReadRepository + cob::Store<Namespace = NodeId>>(
profile: &Profile,
- repo: &'a R,
-) -> Result<cob::patch::Cache<cob::patch::Patches<'a, R>, cob::cache::StoreReader>, list::Error> {
+ repo: &'a Repo,
+) -> Result<cob::patch::Cache<'a, Repo, ReadOnly, cob::cache::StoreReader>, list::Error> {
match profile.patches(repo) {
Ok(patches) => Ok(patches),
Err(err @ profile::Error::CobsCache(cob::cache::Error::OutOfDate)) => {
@@ -473,14 +474,17 @@ pub(crate) fn patches<'a, R: ReadRepository + cob::Store<Namespace = NodeId>>(
}
/// Get the mutable patch store.
-pub(crate) fn patches_mut<'a>(
+pub(crate) fn patches_mut<'a, 'b, Signer>(
profile: &Profile,
repo: &'a storage::git::Repository,
+ signer: &'b Signer,
) -> Result<
- cob::patch::Cache<cob::patch::Patches<'a, storage::git::Repository>, cob::cache::StoreWriter>,
+ cob::patch::Cache<'a, storage::git::Repository, WriteAs<'b, Signer>, cob::cache::StoreWriter>,
push::Error,
-> {
- match profile.patches_mut(repo) {
+>
+where
+{
+ match profile.patches_mut(repo, signer) {
Ok(patches) => Ok(patches),
Err(err @ profile::Error::CobsCache(cob::cache::Error::OutOfDate)) => {
hint(cli::cob::MIGRATION_HINT);
diff --git a/crates/radicle-remote-helper/src/push.rs b/crates/radicle-remote-helper/src/push.rs
index 56d5f1b9e..972b062a1 100644
--- a/crates/radicle-remote-helper/src/push.rs
+++ b/crates/radicle-remote-helper/src/push.rs
@@ -8,9 +8,9 @@ use std::process::ExitStatus;
use std::str::FromStr;
use std::{assert_eq, io};
+use radicle::cob::store::access::WriteAs;
use radicle::identity::crefs::GetCanonicalRefs as _;
use radicle::identity::doc::CanonicalRefsError;
-use radicle::node::device::Device;
use thiserror::Error;
use radicle::Profile;
@@ -321,7 +321,8 @@ pub(super) fn run(
.map_err(Error::from)
}
Command::Push(git::fmt::refspec::Refspec { src, dst, force }) => {
- let patches = crate::patches_mut(profile, stored)?;
+ let signer = profile.signer()?;
+ let patches = crate::patches_mut(profile, stored, &signer)?;
let action = PushAction::new(dst)?;
match action {
@@ -332,7 +333,6 @@ pub(super) fn run(
&working,
stored,
patches,
- &signer,
profile,
opts.clone(),
git,
@@ -560,24 +560,28 @@ impl<'a, G> Drop for TempPatchRef<'a, G> {
}
/// Open a new patch.
-fn patch_open<G, S>(
+fn patch_open<S, Signer>(
head: &git::Oid,
upstream: &Option<git::fmt::RefString>,
nid: &NodeId,
working: &git::raw::Repository,
stored: &storage::git::Repository,
mut patches: patch::Cache<
- patch::Patches<'_, storage::git::Repository>,
+ '_,
+ storage::git::Repository,
+ WriteAs<'_, Signer>,
cob::cache::StoreWriter,
>,
- signer: &Device<G>,
profile: &Profile,
opts: Options,
git: &S,
) -> Result<Option<ExplorerResource>, Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
S: GitService,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
let temp = TempPatchRef::new(stored, head, nid, git);
temp.push(head, opts.verbosity)?;
@@ -601,7 +605,6 @@ where
base,
*head,
&[],
- signer,
)
} else {
patches.create(
@@ -611,7 +614,6 @@ where
base,
*head,
&[],
- signer,
)
}?;
@@ -698,7 +700,7 @@ where
/// Update an existing patch.
#[allow(clippy::too_many_arguments)]
-fn patch_update<G, S>(
+fn patch_update<S, Signer>(
head: &git::Oid,
dst: &git::fmt::Qualified,
force: bool,
@@ -707,17 +709,22 @@ fn patch_update<G, S>(
working: &git::raw::Repository,
stored: &storage::git::Repository,
mut patches: patch::Cache<
- patch::Patches<'_, storage::git::Repository>,
+ '_,
+ storage::git::Repository,
+ WriteAs<'_, Signer>,
cob::cache::StoreWriter,
>,
- signer: &Device<G>,
+ signer: &Signer,
opts: Options,
expected_refs: &[String],
git: &S,
) -> Result<Option<ExplorerResource>, Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
S: GitService,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
let Ok(Some(patch)) = patches.get(&patch_id) else {
return Err(Error::NotFound(patch_id));
@@ -754,7 +761,7 @@ where
)?;
let mut patch_mut = patch::PatchMut::new(patch_id, patch, &mut patches);
- let revision = patch_mut.update(message, base, *head, signer)?;
+ let revision = patch_mut.update(message, base, *head)?;
let Some(revision) = patch_mut.revision(&revision).cloned() else {
return Err(Error::RevisionNotFound(revision));
};
@@ -787,7 +794,7 @@ where
Ok(Some(ExplorerResource::Patch { id: patch_id }))
}
-fn push<G, S>(
+fn push<S, Signer>(
src: &git::Oid,
dst: &git::fmt::Qualified,
force: bool,
@@ -795,17 +802,22 @@ fn push<G, S>(
working: &git::raw::Repository,
stored: &storage::git::Repository,
mut patches: patch::Cache<
- patch::Patches<'_, storage::git::Repository>,
+ '_,
+ storage::git::Repository,
+ WriteAs<'_, Signer>,
cob::cache::StoreWriter,
>,
- signer: &Device<G>,
+ signer: &Signer,
verbosity: Verbosity,
expected_refs: &[String],
git: &S,
) -> Result<Option<ExplorerResource>, Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
S: GitService,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
let head = *src;
let dst = dst.with_namespace(nid.into());
@@ -832,7 +844,7 @@ where
let old = old.peel_to_commit()?.id();
// Only delegates affect the merge state of the COB.
if stored.delegates()?.contains(&nid.into()) {
- patch_revert_all(old.into(), head, &stored.backend, &mut patches, signer)?;
+ patch_revert_all(old.into(), head, &stored.backend, &mut patches)?;
patch_merge_all(old.into(), head, working, &mut patches, signer)?;
}
}
@@ -841,18 +853,20 @@ where
}
/// Revert all patches that are no longer included in the base branch.
-fn patch_revert_all<G>(
+fn patch_revert_all<Signer>(
old: git::Oid,
new: git::Oid,
stored: &git::raw::Repository,
patches: &mut patch::Cache<
- patch::Patches<'_, storage::git::Repository>,
+ '_,
+ storage::git::Repository,
+ WriteAs<'_, Signer>,
cob::cache::StoreWriter,
>,
- _signer: &Device<G>,
) -> Result<(), Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
{
// Find all commits reachable from the old OID but not from the new OID.
let mut revwalk = stored.revwalk()?;
@@ -906,18 +920,23 @@ where
}
/// Merge all patches that have been included in the base branch.
-fn patch_merge_all<G>(
+fn patch_merge_all<Signer>(
old: git::Oid,
new: git::Oid,
working: &git::raw::Repository,
patches: &mut patch::Cache<
- patch::Patches<'_, storage::git::Repository>,
+ '_,
+ storage::git::Repository,
+ WriteAs<'_, Signer>,
cob::cache::StoreWriter,
>,
- signer: &Device<G>,
+ signer: &Signer,
) -> Result<(), Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
let mut revwalk = working.revwalk()?;
revwalk.push_range(&format!("{old}..{new}"))?;
@@ -959,19 +978,22 @@ where
Ok(())
}
-fn patch_merge<C, G>(
- mut patch: patch::PatchMut<storage::git::Repository, C>,
+fn patch_merge<Signer, C>(
+ mut patch: patch::PatchMut<'_, '_, '_, storage::git::Repository, Signer, C>,
revision: patch::RevisionId,
commit: git::Oid,
working: &git::raw::Repository,
- signer: &Device<G>,
+ signer: &Signer,
) -> Result<(), Error>
where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
C: cob::cache::Update<patch::Patch>,
- G: crypto::signature::Signer<crypto::Signature>,
{
let (latest, _) = patch.latest();
- let merged = patch.merge(revision, commit, signer)?;
+ let merged = patch.merge(revision, commit)?;
if revision == latest {
eprintln!(
diff --git a/crates/radicle/src/cob/cache.rs b/crates/radicle/src/cob/cache.rs
index 708356cac..81aa68340 100644
--- a/crates/radicle/src/cob/cache.rs
+++ b/crates/radicle/src/cob/cache.rs
@@ -112,9 +112,10 @@ pub enum Error {
OutOfDate,
}
-/// Read and write to the store.
+/// Read from and write to the store.
pub type StoreWriter = Store<Write>;
-/// Write to the store.
+
+/// Read from the store.
pub type StoreReader = Store<Read>;
/// Read-only type witness.
diff --git a/crates/radicle/src/cob/identity.rs b/crates/radicle/src/cob/identity.rs
index e8bbadf93..31d8aab28 100644
--- a/crates/radicle/src/cob/identity.rs
+++ b/crates/radicle/src/cob/identity.rs
@@ -3,15 +3,16 @@ use std::sync::LazyLock;
use std::{fmt, ops::Deref, str::FromStr};
use crypto::{PublicKey, Signature};
+use nonempty::NonEmpty;
use radicle_cob::{Embed, ObjectId, TypeName};
use serde::{Deserialize, Serialize};
use thiserror::Error;
+use crate::cob::store::access::WriteAs;
use crate::git;
use crate::git::Oid;
use crate::identity::doc::Doc;
use crate::node::NodeId;
-use crate::node::device::Device;
use crate::storage;
use crate::{
cob,
@@ -219,33 +220,34 @@ impl Identity {
}
}
- pub fn initialize<'a, R, G>(
+ pub fn initialize<'a, 'b, Repo, Signer>(
doc: &Doc,
- store: &'a R,
- signer: &Device<G>,
- ) -> Result<IdentityMut<'a, R>, cob::store::Error>
+ store: &'a Repo,
+ signer: &'b Signer,
+ ) -> Result<IdentityMut<'a, 'b, Repo, Signer>, cob::store::Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
- R: WriteRepository + cob::Store<Namespace = NodeId>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
- let mut store = cob::store::Store::open(store)?;
- let (id, identity) = Transaction::<Identity, _>::initial(
- "Initialize identity",
- &mut store,
- signer,
- |tx, repo| {
- tx.revision(
- // SAFETY: "Initial revision" is a valid title
- #[allow(clippy::unwrap_used)]
- cob::Title::new("Initial revision").unwrap(),
- "",
- doc,
- None,
- repo,
- signer,
- )
- },
- )?;
+ let mut store = cob::store::Store::open(store, WriteAs::new(signer))?;
+
+ #[allow(clippy::unwrap_used)]
+ let title = cob::Title::new("Initial revision").unwrap();
+
+ #[allow(deprecated)]
+ let (actions, embeds) = {
+ let repo = store.repo();
+ let signer = store.signer();
+ Transaction::new_revision(title, "", doc, None, repo, signer)?.into_inner()
+ };
+
+ let actions = NonEmpty::from_vec(actions)
+ .expect("Transaction::initial: transaction must contain at least one action");
+
+ let (id, identity) = store.create("Initialize identity", actions, embeds)?;
Ok(IdentityMut {
id,
@@ -254,10 +256,10 @@ impl Identity {
})
}
- pub fn get<R: ReadRepository + cob::Store>(
- object: &ObjectId,
- repo: &R,
- ) -> Result<Identity, store::Error> {
+ pub fn get<Repo>(object: &ObjectId, repo: &Repo) -> Result<Identity, store::Error>
+ where
+ Repo: ReadRepository + cob::Store,
+ {
use cob::store::CobWithType;
cob::get::<Self, _>(repo, Self::type_name(), object)
@@ -266,12 +268,17 @@ impl Identity {
}
/// Get a proposal mutably.
- pub fn get_mut<'a, R: WriteRepository + cob::Store<Namespace = NodeId>>(
+ pub fn get_mut<'a, 'b, Repo, Signer>(
id: &ObjectId,
- repo: &'a R,
- ) -> Result<IdentityMut<'a, R>, store::Error> {
+ repo: &'a Repo,
+ signer: &'b Signer,
+ ) -> Result<IdentityMut<'a, 'b, Repo, Signer>, store::Error>
+ where
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ {
let obj = Self::get(id, repo)?;
- let store = cob::store::Store::open(repo)?;
+ let store = cob::store::Store::open(repo, WriteAs::new(signer))?;
Ok(IdentityMut {
id: *id,
@@ -287,13 +294,18 @@ impl Identity {
Self::get(&oid, repo).map_err(RepositoryError::from)
}
- pub fn load_mut<R: WriteRepository + cob::Store<Namespace = NodeId>>(
- repo: &R,
- ) -> Result<IdentityMut<'_, R>, RepositoryError> {
+ pub fn load_mut<'a, 'b, Repo, Signer>(
+ repo: &'a Repo,
+ signer: &'b Signer,
+ ) -> Result<IdentityMut<'a, 'b, Repo, Signer>, RepositoryError>
+ where
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ {
let oid = repo.identity_root()?;
let oid = ObjectId::from(oid);
- Self::get_mut(&oid, repo).map_err(RepositoryError::from)
+ Self::get_mut(&oid, repo, signer).map_err(RepositoryError::from)
}
}
@@ -885,43 +897,47 @@ impl<R: ReadRepository> store::Transaction<Identity, R> {
}
impl<R: WriteRepository> store::Transaction<Identity, R> {
- pub fn revision<G: crypto::signature::Signer<crypto::Signature>>(
- &mut self,
+ pub fn new_revision<G: crypto::signature::Signer<crypto::Signature>>(
title: cob::Title,
description: impl ToString,
doc: &Doc,
parent: Option<RevisionId>,
repo: &R,
- signer: &Device<G>,
- ) -> Result<(), store::Error> {
+ signer: &G,
+ ) -> Result<Self, store::Error> {
+ let mut tx = Transaction::default();
+
let (blob, bytes, signature) = doc.sign(signer).map_err(store::Error::Identity)?;
// Store document blob in repository.
let embed =
Embed::<Uri>::store("radicle.json", &bytes, repo.raw()).map_err(store::Error::Git)?;
+
debug_assert_eq!(embed.content, Uri::from(blob)); // Make sure we pre-computed the correct OID for the blob.
// Identity document.
- self.embed([embed])?;
+ tx.embed([embed])?;
// Revision metadata.
- self.push(Action::Revision {
+ tx.push(Action::Revision {
title,
description: description.to_string(),
blob,
parent,
signature,
- })
+ })?;
+
+ Ok(tx)
}
}
-pub struct IdentityMut<'a, R> {
+pub struct IdentityMut<'a, 'b, Repo, Signer> {
pub id: ObjectId,
identity: Identity,
- store: store::Store<'a, Identity, R>,
+ store: store::Store<'a, Identity, Repo, WriteAs<'b, Signer>>,
}
-impl<R> fmt::Debug for IdentityMut<'_, R> {
+impl<Repo, Signer> fmt::Debug for IdentityMut<'_, '_, Repo, Signer> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("IdentityMut")
.field("id", &self.id)
@@ -930,11 +946,16 @@ impl<R> fmt::Debug for IdentityMut<'_, R> {
}
}
-impl<R> IdentityMut<'_, R>
+impl<Repo, Signer> IdentityMut<'_, '_, Repo, Signer>
where
- R: WriteRepository + cob::Store<Namespace = NodeId>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
/// Reload the identity data from storage.
+ #[cfg(test)]
pub fn reload(&mut self) -> Result<(), store::Error> {
self.identity = self
.store
@@ -944,20 +965,14 @@ where
Ok(())
}
- pub fn transaction<G, F>(
- &mut self,
- message: &str,
- signer: &Device<G>,
- operations: F,
- ) -> Result<EntryId, Error>
+ pub fn transaction<F>(&mut self, message: &str, operations: F) -> Result<EntryId, Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
- F: FnOnce(&mut Transaction<Identity, R>, &R) -> Result<(), store::Error>,
+ F: FnOnce(&mut Transaction<Identity, Repo>, &Repo) -> Result<(), store::Error>,
{
let mut tx = Transaction::default();
operations(&mut tx, self.store.as_ref())?;
- let (doc, commit) = tx.commit(message, self.id, &mut self.store, signer)?;
+ let (doc, commit) = tx.commit(message, self.id, &mut self.store)?;
self.identity = doc;
Ok(commit)
@@ -965,70 +980,61 @@ where
/// Update the identity by proposing a new revision.
/// If the signer is the only delegate, the revision is accepted automatically.
- pub fn update<G>(
+ pub fn update(
&mut self,
title: cob::Title,
description: impl ToString,
doc: &Doc,
- signer: &Device<G>,
- ) -> Result<RevisionId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- let parent = self.current;
- let id = self.transaction("Propose revision", signer, |tx, repo| {
- tx.revision(title, description, doc, Some(parent), repo, signer)
- })?;
+ ) -> Result<RevisionId, Error> {
+ let parent = Some(self.current);
+
+ #[allow(deprecated)]
+ let tx = {
+ let signer = self.store.signer();
+ let repo = self.store.repo();
+ Transaction::new_revision(title, description, doc, parent, repo, signer)?
+ };
+ let (doc, commit) = tx.commit("Propose revision", self.id, &mut self.store)?;
+ self.identity = doc;
- Ok(id)
+ Ok(commit)
}
/// Accept an active revision.
- pub fn accept<G>(&mut self, revision: &RevisionId, signer: &Device<G>) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
+ pub fn accept(&mut self, revision: &RevisionId) -> Result<EntryId, Error> {
let id = *revision;
let revision = self.revision(revision).ok_or(Error::NotFound(id))?;
- let signature = revision.sign(signer)?;
- self.transaction("Accept revision", signer, |tx, _| tx.accept(id, signature))
+ #[allow(deprecated)]
+ let signature = revision.sign(self.store.signer())?;
+
+ self.transaction("Accept revision", |tx, _| tx.accept(id, signature))
}
/// Reject an active revision.
- pub fn reject<G>(&mut self, revision: RevisionId, signer: &Device<G>) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Reject revision", signer, |tx, _| tx.reject(revision))
+ pub fn reject(&mut self, revision: RevisionId) -> Result<EntryId, Error> {
+ self.transaction("Reject revision", |tx, _| tx.reject(revision))
}
/// Redact a revision.
- pub fn redact<G>(&mut self, revision: RevisionId, signer: &Device<G>) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Redact revision", signer, |tx, _| tx.redact(revision))
+ pub fn redact(&mut self, revision: RevisionId) -> Result<EntryId, Error> {
+ self.transaction("Redact revision", |tx, _| tx.redact(revision))
}
/// Edit an active revision's title or description.
- pub fn edit<G>(
+ pub fn edit(
&mut self,
revision: RevisionId,
title: cob::Title,
description: String,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Edit revision", signer, |tx, _| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Edit revision", |tx, _| {
tx.edit(revision, title, description)
})
}
}
-impl<R> Deref for IdentityMut<'_, R> {
+impl<Repo, Signer> Deref for IdentityMut<'_, '_, Repo, Signer> {
type Target = Identity;
fn deref(&self) -> &Self::Target {
@@ -1076,6 +1082,7 @@ mod test {
use crate::identity::Visibility;
use crate::identity::did::Did;
use crate::identity::doc::PayloadId;
+ use crate::node::device::Device;
use crate::rad;
use crate::storage::ReadStorage;
use crate::storage::git::Storage;
@@ -1101,7 +1108,7 @@ mod test {
let NodeWithRepo { node, repo } = NodeWithRepo::default();
let bob = Device::mock();
let signer = &node.signer;
- let mut identity = Identity::load_mut(&*repo).unwrap();
+ let mut identity = Identity::load_mut(&*repo, signer).unwrap();
let mut doc = identity.doc().clone().edit();
let title = Title::new("Identity update").unwrap();
let description = "";
@@ -1111,12 +1118,7 @@ mod test {
assert!(identity.current().is_accepted());
// Using an identical document to the current one fails.
identity
- .update(
- title.clone(),
- description,
- &doc.clone().verified().unwrap(),
- signer,
- )
+ .update(title.clone(), description, &doc.clone().verified().unwrap())
.unwrap_err();
assert_eq!(identity.current, r0);
@@ -1129,12 +1131,7 @@ mod test {
doc.delegate(bob.public_key().into());
// The update should go through now.
let r1 = identity
- .update(
- title.clone(),
- description,
- &doc.clone().verified().unwrap(),
- signer,
- )
+ .update(title.clone(), description, &doc.clone().verified().unwrap())
.unwrap();
assert!(identity.revision(&r1).unwrap().is_accepted());
assert_eq!(identity.current, r1);
@@ -1143,12 +1140,7 @@ mod test {
// signs it.
doc.visibility = Visibility::private([]);
let r2 = identity
- .update(
- title.clone(),
- description,
- &doc.clone().verified().unwrap(),
- signer,
- )
+ .update(title.clone(), description, &doc.clone().verified().unwrap())
.unwrap();
// R1 is still the head.
assert_eq!(identity.current, r1);
@@ -1159,7 +1151,10 @@ mod test {
&Visibility::Public
);
// Now let's add a signature on R2 from Bob.
- identity.accept(&r2, &bob).unwrap();
+ let mut bob_identity = Identity::load_mut(&*repo, &bob).unwrap();
+ bob_identity.accept(&r2).unwrap();
+
+ identity.reload().unwrap();
// R2 is now the head.
assert_eq!(identity.current, r2);
@@ -1177,7 +1172,8 @@ mod test {
let bob = Device::mock();
let eve = Device::mock();
let signer = &node.signer;
- let mut identity = Identity::load_mut(&*repo).unwrap();
+
+ let mut identity = Identity::load_mut(&*repo, signer).unwrap();
let mut doc = identity.doc().clone().edit();
let description = "";
@@ -1188,7 +1184,6 @@ mod test {
cob::Title::new("Identity update").unwrap(),
description,
&doc.clone().verified().unwrap(),
- signer,
)
.unwrap();
assert_eq!(identity.current, r1);
@@ -1199,13 +1194,14 @@ mod test {
cob::Title::new("Make private").unwrap(),
description,
&doc.clone().verified().unwrap(),
- &node.signer,
)
.unwrap();
+ let mut bob_identity = Identity::load_mut(&*repo, &bob).unwrap();
+
// 1/2 rejected means that we can never reach the required 2/2 votes.
- identity.reject(r2, &bob).unwrap();
- let r2 = identity.revision(&r2).unwrap();
+ bob_identity.reject(r2).unwrap();
+ let r2 = bob_identity.revision(&r2).unwrap();
assert_eq!(r2.state, State::Rejected);
// Now let's add another delegate.
@@ -1215,10 +1211,13 @@ mod test {
cob::Title::new("Add Eve").unwrap(),
description,
&doc.clone().verified().unwrap(),
- &node.signer,
)
.unwrap();
- let _ = identity.accept(&r3, &bob).unwrap();
+
+ bob_identity.reload().unwrap();
+ let _ = bob_identity.accept(&r3).unwrap();
+
+ identity.reload().unwrap();
assert_eq!(identity.current, r3);
doc.visibility = Visibility::Public;
@@ -1227,18 +1226,19 @@ mod test {
cob::Title::new("Make public").unwrap(),
description,
&doc.verified().unwrap(),
- &node.signer,
)
.unwrap();
// 1/3 rejected means that we can still reach the 2/3 required votes.
- identity.reject(r3, &bob).unwrap();
+ bob_identity.reject(r3).unwrap();
let r3 = identity.revision(&r3).unwrap().clone();
assert_eq!(r3.state, State::Active); // Still active.
+ let mut eve_identity = Identity::load_mut(&*repo, &eve).unwrap();
+
// 2/3 rejected means that we can no longer reach the 2/3 required votes.
- identity.reject(r3.id, &eve).unwrap();
- let r3 = identity.revision(&r3.id).unwrap();
+ eve_identity.reject(r3.id).unwrap();
+ let r3 = eve_identity.revision(&r3.id).unwrap();
assert_eq!(r3.state, State::Rejected);
}
@@ -1248,7 +1248,7 @@ mod test {
let alice = &network.alice;
let bob = &network.bob;
- let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
+ let mut alice_identity = Identity::load_mut(&*alice.repo, &alice.signer).unwrap();
let mut alice_doc = alice_identity.doc().clone().edit();
alice_doc.delegate(bob.signer.public_key().into());
@@ -1257,13 +1257,12 @@ mod test {
cob::Title::new("Add Bob").unwrap(),
"",
&alice_doc.clone().verified().unwrap(),
- &alice.signer,
)
.unwrap();
bob.repo.fetch(alice);
- let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
+ let bob_identity = Identity::load(&*bob.repo).unwrap();
let bob_doc = bob_identity.doc().clone();
assert!(bob_doc.is_delegate(&bob.signer.public_key().into()));
@@ -1274,16 +1273,19 @@ mod test {
cob::Title::new("Change visibility").unwrap(),
"",
&alice_doc.clone().clone().verified().unwrap(),
- &alice.signer,
)
.unwrap();
+
+ let bob_identity_mut = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
+ assert_eq!(*bob_identity_mut, bob_identity);
+ let mut bob_identity = bob_identity_mut;
+
// Bob makes the same change without knowing Alice already did.
let b1 = bob_identity
.update(
cob::Title::new("Make private").unwrap(),
"",
&alice_doc.verified().unwrap(),
- &bob.signer,
)
.unwrap();
@@ -1301,7 +1303,7 @@ mod test {
assert_eq!(bob_identity.revision(&b1).unwrap().state, State::Active);
// Now Bob accepts Alice's proposal. This voids his own.
- bob_identity.accept(&a2, &bob.signer).unwrap();
+ bob_identity.accept(&a2).unwrap();
assert_eq!(bob_identity.current, a2);
assert_eq!(bob_identity.revision(&a1).unwrap().state, State::Accepted);
assert_eq!(bob_identity.revision(&a2).unwrap().state, State::Accepted);
@@ -1315,7 +1317,7 @@ mod test {
let bob = &network.bob;
let eve = &network.eve;
- let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
+ let mut alice_identity = Identity::load_mut(&*alice.repo, &alice.signer).unwrap();
let mut alice_doc = alice_identity.doc().clone().edit();
alice_doc.delegate(bob.signer.public_key().into());
@@ -1325,7 +1327,6 @@ mod test {
cob::Title::new("Add Bob").unwrap(),
"Eh.",
&alice_doc.clone().clone().verified().unwrap(),
- &alice.signer,
)
.unwrap();
@@ -1335,20 +1336,16 @@ mod test {
cob::Title::new("Change visibility").unwrap(),
"Eh.",
&alice_doc.verified().unwrap(),
- &alice.signer,
)
.unwrap();
bob.repo.fetch(alice);
- let a3 = cob::stable::with_advanced_timestamp(|| {
- alice_identity.redact(a2, &alice.signer).unwrap()
- });
+ let a3 = cob::stable::with_advanced_timestamp(|| alice_identity.redact(a2).unwrap());
assert!(alice_identity.revision(&a1).is_some());
assert_eq!(alice_identity.timeline, vec![a0, a1, a2, a3]);
- let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
- let b1 =
- cob::stable::with_advanced_timestamp(|| bob_identity.accept(&a2, &bob.signer).unwrap());
+ let mut bob_identity = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
+ let b1 = cob::stable::with_advanced_timestamp(|| bob_identity.accept(&a2).unwrap());
assert_eq!(bob_identity.timeline, vec![a0, a1, a2, b1]);
assert_eq!(bob_identity.revision(&a2).unwrap().state, State::Accepted);
@@ -1367,7 +1364,7 @@ mod test {
let bob = &network.bob;
let eve = &network.eve;
- let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
+ let mut alice_identity = Identity::load_mut(&*alice.repo, &alice.signer).unwrap();
let mut alice_doc = alice_identity.doc().clone().edit();
alice_doc.delegate(bob.signer.public_key().into());
@@ -1378,7 +1375,6 @@ mod test {
cob::Title::new("Add Bob and Eve").unwrap(),
"Eh#!",
&alice_doc.clone().verified().unwrap(),
- &alice.signer,
)
.unwrap();
@@ -1388,7 +1384,6 @@ mod test {
cob::Title::new("Remove Eve").unwrap(),
"",
&alice_doc.verified().unwrap(),
- &alice.signer,
)
.unwrap();
@@ -1396,12 +1391,11 @@ mod test {
bob.repo.fetch(alice);
eve.repo.fetch(bob);
- let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
- let b1 =
- cob::stable::with_advanced_timestamp(|| bob_identity.accept(&a2, &bob.signer).unwrap());
+ let mut bob_identity = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
+ let b1 = cob::stable::with_advanced_timestamp(|| bob_identity.accept(&a2).unwrap());
assert_eq!(bob_identity.current, a2);
- let mut eve_identity = Identity::load_mut(&*eve.repo).unwrap();
+ let mut eve_identity = Identity::load_mut(&*eve.repo, &eve.signer).unwrap();
let mut eve_doc = eve_identity.doc().clone().edit();
eve_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
let e1 = cob::stable::with_advanced_timestamp(|| {
@@ -1410,7 +1404,6 @@ mod test {
cob::Title::new("Change visibility").unwrap(),
"",
&eve_doc.verified().unwrap(),
- &eve.signer,
)
.unwrap()
});
@@ -1443,7 +1436,7 @@ mod test {
let bob = &network.bob;
let eve = &network.eve;
- let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
+ let mut alice_identity = Identity::load_mut(&*alice.repo, &alice.signer).unwrap();
let mut alice_doc = alice_identity.doc().clone().edit();
alice_doc.delegate(bob.signer.public_key().into());
@@ -1454,7 +1447,6 @@ mod test {
cob::Title::new("Add Bob and Eve").unwrap(),
"Eh!#",
&alice_doc.clone().verified().unwrap(),
- &alice.signer,
)
.unwrap();
@@ -1464,7 +1456,6 @@ mod test {
cob::Title::new("Change visibility").unwrap(),
"",
&alice_doc.verified().unwrap(),
- &alice.signer,
)
.unwrap();
@@ -1473,14 +1464,12 @@ mod test {
eve.repo.fetch(bob);
// Bob accepts alice's revision.
- let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
- let b1 =
- cob::stable::with_advanced_timestamp(|| bob_identity.accept(&a2, &bob.signer).unwrap());
+ let mut bob_identity = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
+ let b1 = cob::stable::with_advanced_timestamp(|| bob_identity.accept(&a2).unwrap());
// Eve rejects the revision, not knowing.
- let mut eve_identity = Identity::load_mut(&*eve.repo).unwrap();
- let e1 =
- cob::stable::with_advanced_timestamp(|| eve_identity.reject(a2, &eve.signer).unwrap());
+ let mut eve_identity = Identity::load_mut(&*eve.repo, &eve.signer).unwrap();
+ let e1 = cob::stable::with_advanced_timestamp(|| eve_identity.reject(a2).unwrap());
assert!(eve_identity.revision(&a2).unwrap().is_active());
// Then she submits a new revision.
@@ -1491,7 +1480,6 @@ mod test {
cob::Title::new("Change visibility").unwrap(),
"",
&eve_doc.verified().unwrap(),
- &eve.signer,
)
.unwrap();
assert!(eve_identity.revision(&e2).unwrap().is_active());
@@ -1529,7 +1517,7 @@ mod test {
let bob = &network.bob;
let eve = &network.eve;
- let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
+ let mut alice_identity = Identity::load_mut(&*alice.repo, &alice.signer).unwrap();
let mut alice_doc = alice_identity.doc().clone().edit();
alice.repo.fetch(bob);
@@ -1542,14 +1530,13 @@ mod test {
cob::Title::new("Add Bob and Eve").unwrap(),
"",
&alice_doc.verified().unwrap(),
- &alice.signer,
)
.unwrap();
bob.repo.fetch(alice);
eve.repo.fetch(alice);
- let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
+ let mut bob_identity = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
let mut bob_doc = bob_identity.doc().clone().edit();
assert!(bob_doc.is_delegate(&bob.signer.public_key().into()));
@@ -1568,14 +1555,14 @@ mod test {
cob::Title::new("Change visibility #1").unwrap(),
"",
&bob_doc.verified().unwrap(),
- &bob.signer,
)
.unwrap();
+
alice.repo.fetch(bob);
eve.repo.fetch(bob);
// In the meantime, Eve does the same thing on her side.
- let mut eve_identity = Identity::load_mut(&*eve.repo).unwrap();
+ let mut eve_identity = Identity::load_mut(&*eve.repo, &eve.signer).unwrap();
let mut eve_doc = eve_identity.doc().clone().edit();
eve_doc.visibility = Visibility::private([]);
let e1 = eve_identity
@@ -1583,18 +1570,16 @@ mod test {
cob::Title::new("Change visibility #2").unwrap(),
"Woops",
&eve_doc.verified().unwrap(),
- &eve.signer,
)
.unwrap();
assert_eq!(eve_identity.revisions().count(), 4);
assert_eq!(eve_identity.revision(&e1).unwrap().state, State::Active);
alice_identity.reload().unwrap();
- let a2 = cob::stable::with_advanced_timestamp(|| {
- alice_identity.accept(&b1, &alice.signer).unwrap()
- });
+ let a2 = cob::stable::with_advanced_timestamp(|| alice_identity.accept(&b1).unwrap());
eve.repo.fetch(alice);
+
eve_identity.reload().unwrap();
assert_eq!(eve_identity.timeline, vec![a0, a1, b1, e1, a2]);
@@ -1619,7 +1604,7 @@ mod test {
rad::fork_remote(id, alice.public_key(), &eve, &storage).unwrap();
let repo = storage.repository(id).unwrap();
- let mut identity = Identity::load_mut(&repo).unwrap();
+ let mut identity = Identity::load_mut(&repo, &alice).unwrap();
let doc = identity.doc().clone();
let prj = doc.project().unwrap();
let mut doc = doc.edit();
@@ -1633,7 +1618,6 @@ mod test {
cob::Title::new("Update description").unwrap(),
"",
&doc.clone().verified().unwrap(),
- &alice,
)
.unwrap();
@@ -1645,7 +1629,6 @@ mod test {
cob::Title::new("Add bob").unwrap(),
"",
&doc.clone().verified().unwrap(),
- &alice,
)
.unwrap();
@@ -1658,25 +1641,26 @@ mod test {
cob::Title::new("Add eve").unwrap(),
"",
&doc.clone().verified().unwrap(),
- &alice,
)
.unwrap();
- identity.accept(&revision, &bob).unwrap();
+
+ let mut bob_identity = Identity::load_mut(&repo, &bob).unwrap();
+ bob_identity.accept(&revision).unwrap();
// Update description again with signatures by Eve and Bob.
let desc = prj.description().to_owned() + "?";
let prj = prj.update(None, desc, None).unwrap();
doc.payload.insert(PayloadId::project(), prj.into());
-
- let revision = identity
+ let revision = bob_identity
.update(
cob::Title::new("Update description again").unwrap(),
"Bob's repository",
&doc.verified().unwrap(),
- &bob,
)
.unwrap();
- identity.accept(&revision, &eve).unwrap();
+
+ let mut eve_identity = Identity::load_mut(&repo, &eve).unwrap();
+ eve_identity.accept(&revision).unwrap();
let identity: Identity = Identity::load(&repo).unwrap();
let root = repo.identity_root().unwrap();
diff --git a/crates/radicle/src/cob/issue.rs b/crates/radicle/src/cob/issue.rs
index ee438c6e4..5237bcbbe 100644
--- a/crates/radicle/src/cob/issue.rs
+++ b/crates/radicle/src/cob/issue.rs
@@ -11,13 +11,13 @@ use thiserror::Error;
use crate::cob;
use crate::cob::common::{Author, Authorization, Label, Reaction, Timestamp, Uri};
use crate::cob::store::Transaction;
+use crate::cob::store::access::WriteAs;
use crate::cob::store::{Cob, CobAction};
use crate::cob::thread::{Comment, CommentId, Thread};
use crate::cob::{ActorId, Embed, EntryId, ObjectId, TypeName, op, store};
use crate::cob::{TitleError, thread};
use crate::identity::doc::DocError;
use crate::node::NodeId;
-use crate::node::device::Device;
use crate::prelude::{Did, Doc, ReadRepository, RepoId};
use crate::storage;
use crate::storage::{HasRepoId, RepositoryError, WriteRepository};
@@ -472,8 +472,10 @@ impl Issue {
}
}
-impl<'a, 'g, R, C> From<IssueMut<'a, 'g, R, C>> for (IssueId, Issue) {
- fn from(value: IssueMut<'a, 'g, R, C>) -> Self {
+impl<'a, 'b, 'g, Repo, Signer, Cache> From<IssueMut<'a, 'b, 'g, Repo, Signer, Cache>>
+ for (IssueId, Issue)
+{
+ fn from(value: IssueMut<'a, 'b, 'g, Repo, Signer, Cache>) -> Self {
(value.id, value.issue)
}
}
@@ -579,14 +581,14 @@ impl<R: ReadRepository> store::Transaction<Issue, R> {
}
}
-pub struct IssueMut<'a, 'g, R, C> {
+pub struct IssueMut<'a, 'b, 'g, Repo, Signer, Cache> {
id: ObjectId,
issue: Issue,
- store: &'g mut Issues<'a, R>,
- cache: &'g mut C,
+ store: &'g mut Issues<'a, Repo, WriteAs<'b, Signer>>,
+ cache: &'g mut Cache,
}
-impl<R, C> std::fmt::Debug for IssueMut<'_, '_, R, C> {
+impl<Repo, Signer, Cache> std::fmt::Debug for IssueMut<'_, '_, '_, Repo, Signer, Cache> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
f.debug_struct("IssueMut")
.field("id", &self.id)
@@ -595,10 +597,14 @@ impl<R, C> std::fmt::Debug for IssueMut<'_, '_, R, C> {
}
}
-impl<R, C> IssueMut<'_, '_, R, C>
+impl<Repo, Signer, Cache> IssueMut<'_, '_, '_, Repo, Signer, Cache>
where
- R: WriteRepository + cob::Store<Namespace = NodeId>,
- C: cob::cache::Update<Issue>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+ Cache: cob::cache::Update<Issue>,
{
/// Reload the issue data from storage.
pub fn reload(&mut self) -> Result<(), store::Error> {
@@ -606,7 +612,6 @@ where
.store
.get(&self.id)?
.ok_or_else(|| store::Error::NotFound(TYPENAME.clone(), self.id))?;
-
Ok(())
}
@@ -616,132 +621,89 @@ where
}
/// Assign one or more actors to an issue.
- pub fn assign<G>(
- &mut self,
- assignees: impl IntoIterator<Item = Did>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Assign", signer, |tx| tx.assign(assignees))
+ pub fn assign(&mut self, assignees: impl IntoIterator<Item = Did>) -> Result<EntryId, Error> {
+ self.transaction("Assign", |tx| tx.assign(assignees))
}
/// Set the issue title.
- pub fn edit<G>(&mut self, title: cob::Title, signer: &Device<G>) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Edit", signer, |tx| tx.edit(title))
+ pub fn edit(&mut self, title: cob::Title) -> Result<EntryId, Error> {
+ self.transaction("Edit", |tx| tx.edit(title))
}
/// Set the issue description.
- pub fn edit_description<G>(
+ pub fn edit_description(
&mut self,
description: impl ToString,
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- let (id, _) = self.root();
+ ) -> Result<EntryId, Error> {
+ let (id, _) = self.issue.root();
let id = *id;
- self.transaction("Edit description", signer, |tx| {
+ self.transaction("Edit description", |tx| {
tx.edit_comment(id, description, embeds.into_iter().collect())
})
}
/// Lifecycle an issue.
- pub fn lifecycle<G>(&mut self, state: State, signer: &Device<G>) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Lifecycle", signer, |tx| tx.lifecycle(state))
+ pub fn lifecycle(&mut self, state: State) -> Result<EntryId, Error> {
+ self.transaction("Lifecycle", |tx| tx.lifecycle(state))
}
/// Comment on an issue.
- pub fn comment<G, S>(
+ pub fn comment(
&mut self,
- body: S,
+ body: impl ToString,
reply_to: CommentId,
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- S: ToString,
- {
- self.transaction("Comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Comment", |tx| {
tx.comment(body, reply_to, embeds.into_iter().collect())
})
}
/// Edit a comment.
- pub fn edit_comment<G, S>(
+ pub fn edit_comment(
&mut self,
id: CommentId,
- body: S,
+ body: impl ToString,
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- S: ToString,
- {
- self.transaction("Edit comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Edit comment", |tx| {
tx.edit_comment(id, body, embeds.into_iter().collect())
})
}
/// Redact a comment.
- pub fn redact_comment<G>(&mut self, id: CommentId, signer: &Device<G>) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Redact comment", signer, |tx| tx.redact_comment(id))
+ pub fn redact_comment(&mut self, id: CommentId) -> Result<EntryId, Error> {
+ self.transaction("Redact comment", |tx| tx.redact_comment(id))
}
/// Label an issue.
- pub fn label<G>(
- &mut self,
- labels: impl IntoIterator<Item = Label>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Label", signer, |tx| tx.label(labels))
+ pub fn label(&mut self, labels: impl IntoIterator<Item = Label>) -> Result<EntryId, Error> {
+ self.transaction("Label", |tx| tx.label(labels))
}
/// React to an issue comment.
- pub fn react<G>(
+ pub fn react(
&mut self,
to: CommentId,
reaction: Reaction,
active: bool,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("React", signer, |tx| tx.react(to, reaction, active))
+ ) -> Result<EntryId, Error> {
+ self.transaction("React", |tx| tx.react(to, reaction, active))
}
- pub fn transaction<G, F>(
- &mut self,
- message: &str,
- signer: &Device<G>,
- operations: F,
- ) -> Result<EntryId, Error>
+ pub fn transaction<F>(&mut self, message: &str, operations: F) -> Result<EntryId, Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
- F: FnOnce(&mut Transaction<Issue, R>) -> Result<(), store::Error>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+ F: FnOnce(&mut Transaction<Issue, Repo>) -> Result<(), store::Error>,
{
let mut tx = Transaction::default();
operations(&mut tx)?;
- let (issue, commit) = tx.commit(message, self.id, &mut self.store.raw, signer)?;
+ let (issue, commit) = tx.commit(message, self.id, &mut self.store.raw)?;
self.cache
.update(&self.store.as_ref().id(), &self.id, &issue)
.map_err(|e| Error::CacheUpdate {
@@ -754,7 +716,7 @@ where
}
}
-impl<R, C> Deref for IssueMut<'_, '_, R, C> {
+impl<Repo, Signer, Cache> Deref for IssueMut<'_, '_, '_, Repo, Signer, Cache> {
type Target = Issue;
fn deref(&self) -> &Self::Target {
@@ -762,24 +724,24 @@ impl<R, C> Deref for IssueMut<'_, '_, R, C> {
}
}
-pub struct Issues<'a, R> {
- raw: store::Store<'a, Issue, R>,
+pub struct Issues<'a, Repo, Access> {
+ raw: store::Store<'a, Issue, Repo, Access>,
}
-impl<'a, R> Deref for Issues<'a, R> {
- type Target = store::Store<'a, Issue, R>;
+impl<'a, Repo, Access> Deref for Issues<'a, Repo, Access> {
+ type Target = store::Store<'a, Issue, Repo, Access>;
fn deref(&self) -> &Self::Target {
&self.raw
}
}
-impl<R> HasRepoId for Issues<'_, R>
+impl<Repo, Access> HasRepoId for Issues<'_, Repo, Access>
where
- R: ReadRepository,
+ Repo: HasRepoId,
{
fn rid(&self) -> RepoId {
- self.raw.as_ref().id()
+ self.raw.rid()
}
}
@@ -798,39 +760,61 @@ impl IssueCounts {
}
}
-impl<'a, R> Issues<'a, R>
+impl<'a, Repo, Access> Issues<'a, Repo, Access>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: store::access::Access,
{
/// Open an issues store.
- pub fn open(repository: &'a R) -> Result<Self, RepositoryError> {
+ pub fn open(repository: &'a Repo, access: Access) -> Result<Self, RepositoryError> {
let identity = repository.identity_head()?;
- let raw = store::Store::open(repository)?.identity(identity);
+ let raw = store::Store::open(repository, access)?.identity(identity);
Ok(Self { raw })
}
}
-impl<'a, R> Issues<'a, R>
+impl<'a, 'b, Repo, Signer> Issues<'a, Repo, WriteAs<'b, Signer>>
where
- R: WriteRepository + cob::Store<Namespace = NodeId>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
+ /// Get an issue mutably.
+ pub fn get_mut<'g, Cache>(
+ &'g mut self,
+ id: &ObjectId,
+ cache: &'g mut Cache,
+ ) -> Result<IssueMut<'a, 'b, 'g, Repo, Signer, Cache>, Error> {
+ let issue = self
+ .raw
+ .get(id)?
+ .ok_or_else(move || store::Error::NotFound(TYPENAME.clone(), *id))?;
+
+ Ok(IssueMut {
+ id: *id,
+ issue,
+ store: self,
+ cache,
+ })
+ }
+
/// Create a new issue.
- pub fn create<'g, G, C>(
+ pub fn create<'g, Cache>(
&'g mut self,
title: cob::Title,
description: impl ToString,
labels: &[Label],
assignees: &[Did],
embeds: impl IntoIterator<Item = Embed<Uri>>,
- cache: &'g mut C,
- signer: &Device<G>,
- ) -> Result<IssueMut<'a, 'g, R, C>, Error>
+ cache: &'g mut Cache,
+ ) -> Result<IssueMut<'a, 'b, 'g, Repo, Signer, Cache>, Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
- C: cob::cache::Update<Issue>,
+ Cache: cob::cache::Update<Issue>,
{
- let (id, issue) = Transaction::initial("Create issue", &mut self.raw, signer, |tx, _| {
+ let (id, issue) = Transaction::initial("Create issue", &mut self.raw, |tx, _| {
tx.thread(description, embeds)?;
tx.edit(title)?;
@@ -855,43 +839,24 @@ where
}
/// Remove an issue.
- pub fn remove<C, G>(&self, id: &ObjectId, signer: &Device<G>) -> Result<(), store::Error>
+ pub fn remove<C, G>(&mut self, id: &ObjectId) -> Result<(), store::Error>
where
C: cob::cache::Remove<Issue>,
- G: crypto::signature::Signer<crypto::Signature>,
{
- self.raw.remove(id, signer)
+ self.raw.remove(id)
}
}
-impl<'a, R> Issues<'a, R>
+impl<'a, Repo, Access> Issues<'a, Repo, Access>
where
- R: ReadRepository + cob::Store,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: store::access::Access,
{
/// Get an issue.
pub fn get(&self, id: &ObjectId) -> Result<Option<Issue>, store::Error> {
self.raw.get(id)
}
- /// Get an issue mutably.
- pub fn get_mut<'g, C>(
- &'g mut self,
- id: &ObjectId,
- cache: &'g mut C,
- ) -> Result<IssueMut<'a, 'g, R, C>, store::Error> {
- let issue = self
- .raw
- .get(id)?
- .ok_or_else(move || store::Error::NotFound(TYPENAME.clone(), *id))?;
-
- Ok(IssueMut {
- id: *id,
- issue,
- store: self,
- cache,
- })
- }
-
/// Issues count by state.
pub fn counts(&self) -> Result<IssueCounts, Error> {
let all = self.all()?;
@@ -984,23 +949,24 @@ mod test {
use crate::cob::{ActorId, Reaction, store::CobWithType};
use crate::git::Oid;
use crate::issue::cache::Issues as _;
+ use crate::node::device::Device;
use crate::test::arbitrary;
use crate::{assert_matches, test};
#[test]
fn test_concurrency() {
let t = test::setup::Network::default();
- let mut issues_alice = Cache::no_cache(&*t.alice.repo).unwrap();
- let mut bob_issues = Cache::no_cache(&*t.bob.repo).unwrap();
- let mut eve_issues = Cache::no_cache(&*t.eve.repo).unwrap();
- let mut issue_alice = issues_alice
+
+ let mut alice_issues = Cache::no_cache(&*t.alice.repo, &t.alice.signer).unwrap();
+ let mut bob_issues = Cache::no_cache(&*t.bob.repo, &t.bob.signer).unwrap();
+ let mut eve_issues = Cache::no_cache(&*t.eve.repo, &t.eve.signer).unwrap();
+ let mut issue_alice = alice_issues
.create(
cob::Title::new("Alice Issue").unwrap(),
"Alice's comment",
&[],
&[],
[],
- &t.alice.signer,
)
.unwrap();
let id = *issue_alice.id();
@@ -1011,12 +977,8 @@ mod test {
let mut issue_eve = eve_issues.get_mut(&id).unwrap();
let mut issue_bob = bob_issues.get_mut(&id).unwrap();
- issue_bob
- .comment("Bob's reply", *id, vec![], &t.bob.signer)
- .unwrap();
- issue_alice
- .comment("Alice's reply", *id, vec![], &t.alice.signer)
- .unwrap();
+ issue_bob.comment("Bob's reply", *id, vec![]).unwrap();
+ issue_alice.comment("Alice's reply", *id, vec![]).unwrap();
assert_eq!(issue_bob.comments().count(), 2);
assert_eq!(issue_alice.comments().count(), 2);
@@ -1042,9 +1004,7 @@ mod test {
t.eve.repo.fetch(&t.alice);
- let eve_reply = issue_eve
- .comment("Eve's reply", *id, vec![], &t.eve.signer)
- .unwrap();
+ let eve_reply = issue_eve.comment("Eve's reply", *id, vec![]).unwrap();
t.bob.repo.fetch(&t.eve);
t.alice.repo.fetch(&t.eve);
@@ -1078,7 +1038,7 @@ mod test {
#[test]
fn test_issue_create_and_assign() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let assignee = Did::from(arbitrary::r#gen::<ActorId>(1));
let assignee_two = Did::from(arbitrary::r#gen::<ActorId>(1));
@@ -1089,7 +1049,6 @@ mod test {
&[],
&[assignee],
[],
- &node.signer,
)
.unwrap();
@@ -1101,9 +1060,7 @@ mod test {
assert!(assignees.contains(&assignee));
let mut issue = issues.get_mut(&id).unwrap();
- issue
- .assign([assignee, assignee_two], &node.signer)
- .unwrap();
+ issue.assign([assignee, assignee_two]).unwrap();
let id = issue.id;
let issue = issues.get(&id).unwrap().unwrap();
@@ -1117,7 +1074,7 @@ mod test {
#[test]
fn test_issue_create_and_reassign() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let assignee = Did::from(arbitrary::r#gen::<ActorId>(1));
let assignee_two = Did::from(arbitrary::r#gen::<ActorId>(1));
@@ -1128,12 +1085,11 @@ mod test {
&[],
&[assignee, assignee_two],
[],
- &node.signer,
)
.unwrap();
- issue.assign([assignee_two], &node.signer).unwrap();
- issue.assign([assignee_two], &node.signer).unwrap();
+ issue.assign([assignee_two]).unwrap();
+ issue.assign([assignee_two]).unwrap();
issue.reload().unwrap();
let assignees: Vec<_> = issue.assignees().cloned().collect::<Vec<_>>();
@@ -1141,7 +1097,7 @@ mod test {
assert_eq!(1, assignees.len());
assert!(assignees.contains(&assignee_two));
- issue.assign([], &node.signer).unwrap();
+ issue.assign([]).unwrap();
issue.reload().unwrap();
assert_eq!(0, issue.assignees().count());
@@ -1150,7 +1106,7 @@ mod test {
#[test]
fn test_issue_create_and_get() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let created = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1158,7 +1114,6 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
@@ -1176,7 +1131,7 @@ mod test {
#[test]
fn test_issue_create_and_change_state() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1184,17 +1139,13 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
issue
- .lifecycle(
- State::Closed {
- reason: CloseReason::Other,
- },
- &node.signer,
- )
+ .lifecycle(State::Closed {
+ reason: CloseReason::Other,
+ })
.unwrap();
let id = issue.id;
@@ -1207,7 +1158,7 @@ mod test {
}
);
- issue.lifecycle(State::Open, &node.signer).unwrap();
+ issue.lifecycle(State::Open).unwrap();
let issue = issues.get(&id).unwrap().unwrap();
assert_eq!(*issue.state(), State::Open);
@@ -1216,7 +1167,7 @@ mod test {
#[test]
fn test_issue_create_and_unassign() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let assignee = Did::from(arbitrary::r#gen::<ActorId>(1));
let assignee_two = Did::from(arbitrary::r#gen::<ActorId>(1));
@@ -1227,12 +1178,11 @@ mod test {
&[],
&[assignee, assignee_two],
[],
- &node.signer,
)
.unwrap();
assert_eq!(2, issue.assignees().count());
- issue.assign([assignee_two], &node.signer).unwrap();
+ issue.assign([assignee_two]).unwrap();
issue.reload().unwrap();
let assignees: Vec<_> = issue.assignees().cloned().collect::<Vec<_>>();
@@ -1244,7 +1194,7 @@ mod test {
#[test]
fn test_issue_edit() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
@@ -1253,13 +1203,10 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
- issue
- .edit(cob::Title::new("Sorry typo").unwrap(), &node.signer)
- .unwrap();
+ issue.edit(cob::Title::new("Sorry typo").unwrap()).unwrap();
let id = issue.id;
let issue = issues.get(&id).unwrap().unwrap();
@@ -1271,7 +1218,7 @@ mod test {
#[test]
fn test_issue_edit_description() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1279,12 +1226,11 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
issue
- .edit_description("Bob Loblaw law blog", vec![], &node.signer)
+ .edit_description("Bob Loblaw law blog", vec![])
.unwrap();
let id = issue.id;
@@ -1297,7 +1243,7 @@ mod test {
#[test]
fn test_issue_react() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1305,14 +1251,13 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
let (comment, _) = issue.root();
let comment = *comment;
let reaction = Reaction::new('🥳').unwrap();
- issue.react(comment, reaction, true, &node.signer).unwrap();
+ issue.react(comment, reaction, true).unwrap();
let id = issue.id;
let issue = issues.get(&id).unwrap().unwrap();
@@ -1327,7 +1272,7 @@ mod test {
#[test]
fn test_issue_reply() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1335,18 +1280,13 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
let (root, _) = issue.root();
let root = *root;
- let c1 = issue
- .comment("Hi hi hi.", root, vec![], &node.signer)
- .unwrap();
- let c2 = issue
- .comment("Ha ha ha.", root, vec![], &node.signer)
- .unwrap();
+ let c1 = issue.comment("Hi hi hi.", root, vec![]).unwrap();
+ let c2 = issue.comment("Ha ha ha.", root, vec![]).unwrap();
let id = issue.id;
let mut issue = issues.get_mut(&id).unwrap();
@@ -1356,14 +1296,10 @@ mod test {
assert_eq!(reply1.body(), "Hi hi hi.");
assert_eq!(reply2.body(), "Ha ha ha.");
- issue.comment("Re: Hi.", c1, vec![], &node.signer).unwrap();
- issue.comment("Re: Ha.", c2, vec![], &node.signer).unwrap();
- issue
- .comment("Re: Ha. Ha.", c2, vec![], &node.signer)
- .unwrap();
- issue
- .comment("Re: Ha. Ha. Ha.", c2, vec![], &node.signer)
- .unwrap();
+ issue.comment("Re: Hi.", c1, vec![]).unwrap();
+ issue.comment("Re: Ha.", c2, vec![]).unwrap();
+ issue.comment("Re: Ha. Ha.", c2, vec![]).unwrap();
+ issue.comment("Re: Ha. Ha. Ha.", c2, vec![]).unwrap();
let issue = issues.get(&id).unwrap().unwrap();
@@ -1382,7 +1318,7 @@ mod test {
#[test]
fn test_issue_label() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let bug_label = Label::new("bug").unwrap();
let ux_label = Label::new("ux").unwrap();
let wontfix_label = Label::new("wontfix").unwrap();
@@ -1393,18 +1329,12 @@ mod test {
std::slice::from_ref(&ux_label),
&[],
[],
- &node.signer,
)
.unwrap();
+ issue.label([ux_label.clone(), bug_label.clone()]).unwrap();
issue
- .label([ux_label.clone(), bug_label.clone()], &node.signer)
- .unwrap();
- issue
- .label(
- [ux_label.clone(), bug_label.clone(), wontfix_label.clone()],
- &node.signer,
- )
+ .label([ux_label.clone(), bug_label.clone(), wontfix_label.clone()])
.unwrap();
let id = issue.id;
@@ -1420,7 +1350,7 @@ mod test {
fn test_issue_comment() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
let author = *node.signer.public_key();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1428,7 +1358,6 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
@@ -1436,12 +1365,8 @@ mod test {
let (c0, _) = issue.root();
let c0 = *c0;
- issue
- .comment("Ho ho ho.", c0, vec![], &node.signer)
- .unwrap();
- issue
- .comment("Ha ha ha.", c0, vec![], &node.signer)
- .unwrap();
+ issue.comment("Ho ho ho.", c0, vec![]).unwrap();
+ issue.comment("Ha ha ha.", c0, vec![]).unwrap();
let id = issue.id;
let issue = issues.get(&id).unwrap().unwrap();
@@ -1460,7 +1385,7 @@ mod test {
#[test]
fn test_issue_comment_redact() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1468,7 +1393,6 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
@@ -1476,17 +1400,15 @@ mod test {
let (c0, _) = issue.root();
let c0 = *c0;
- let comment = issue
- .comment("Ho ho ho.", c0, vec![], &node.signer)
- .unwrap();
+ let comment = issue.comment("Ho ho ho.", c0, vec![]).unwrap();
issue.reload().unwrap();
assert_eq!(issue.comments().count(), 2);
- issue.redact_comment(comment, &node.signer).unwrap();
+ issue.redact_comment(comment).unwrap();
assert_eq!(issue.comments().count(), 1);
// Can't redact root comment.
- issue.redact_comment(*issue.id, &node.signer).unwrap_err();
+ issue.redact_comment(*issue.id).unwrap_err();
}
#[test]
@@ -1508,36 +1430,15 @@ mod test {
#[test]
fn test_issue_all() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
issues
- .create(
- cob::Title::new("First").unwrap(),
- "Blah",
- &[],
- &[],
- [],
- &node.signer,
- )
+ .create(cob::Title::new("First").unwrap(), "Blah", &[], &[], [])
.unwrap();
issues
- .create(
- cob::Title::new("Second").unwrap(),
- "Blah",
- &[],
- &[],
- [],
- &node.signer,
- )
+ .create(cob::Title::new("Second").unwrap(), "Blah", &[], &[], [])
.unwrap();
issues
- .create(
- cob::Title::new("Third").unwrap(),
- "Blah",
- &[],
- &[],
- [],
- &node.signer,
- )
+ .create(cob::Title::new("Third").unwrap(), "Blah", &[], &[], [])
.unwrap();
let issues = issues
@@ -1557,7 +1458,7 @@ mod test {
#[test]
fn test_issue_multilines() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let created = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1565,7 +1466,6 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
@@ -1583,7 +1483,7 @@ mod test {
#[test]
fn test_embeds() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let content1 = repo.backend.blob(b"<html>Hello World!</html>").unwrap();
let content2 = repo.backend.blob(b"<html>Hello Radicle!</html>").unwrap();
@@ -1608,17 +1508,11 @@ mod test {
&[],
&[],
[embed1.clone(), embed2.clone()],
- &node.signer,
)
.unwrap();
issue
- .comment(
- "Here's a binary file",
- *issue.id,
- [embed3.clone()],
- &node.signer,
- )
+ .comment("Here's a binary file", *issue.id, [embed3.clone()])
.unwrap();
issue.reload().unwrap();
@@ -1642,7 +1536,7 @@ mod test {
#[test]
fn test_embeds_edit() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let content1 = repo.backend.blob(b"<html>Hello World!</html>").unwrap();
let content1_edited = repo.backend.blob(b"<html>Hello Radicle!</html>").unwrap();
@@ -1667,13 +1561,12 @@ mod test {
&[],
&[],
[embed1, embed2],
- &node.signer,
)
.unwrap();
issue.reload().unwrap();
issue
- .edit_description("My first issue", [embed1_edited.clone()], &node.signer)
+ .edit_description("My first issue", [embed1_edited.clone()])
.unwrap();
issue.reload().unwrap();
@@ -1691,7 +1584,7 @@ mod test {
#[test]
fn test_invalid_actions() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1699,14 +1592,11 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
let missing = arbitrary::oid();
- issue
- .comment("Invalid", missing, [], &node.signer)
- .unwrap_err();
+ issue.comment("Invalid", missing, []).unwrap_err();
assert_eq!(issue.comments().count(), 1);
issue.reload().unwrap();
assert_eq!(issue.comments().count(), 1);
@@ -1725,7 +1615,7 @@ mod test {
#[test]
fn test_invalid_tx() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1733,7 +1623,6 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
let missing = arbitrary::oid();
@@ -1742,7 +1631,7 @@ mod test {
// Even creating it via a transaction will trigger an error.
let mut tx = Transaction::<Issue, _>::default();
tx.comment("Invalid comment", missing, vec![]).unwrap();
- tx.commit("Add comment", issue.id, &mut issue.store.raw, &node.signer)
+ tx.commit("Add comment", issue.id, &mut issue.store.raw)
.unwrap_err();
issue.reload().unwrap();
@@ -1752,7 +1641,7 @@ mod test {
#[test]
fn test_invalid_tx_reference() {
let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1760,7 +1649,6 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
@@ -1783,7 +1671,7 @@ mod test {
let identity = repo.identity().unwrap().head();
let missing = arbitrary::oid();
let type_name = Issue::type_name().clone();
- let mut issues = Cache::no_cache(&*repo).unwrap();
+ let mut issues = Cache::no_cache(&*repo, &node.signer).unwrap();
let mut issue = issues
.create(
cob::Title::new("My first issue").unwrap(),
@@ -1791,7 +1679,6 @@ mod test {
&[],
&[],
[],
- &node.signer,
)
.unwrap();
@@ -1848,9 +1735,7 @@ mod test {
// Additionally, when adding a *valid* comment, it does not build upon the bad operation.
issue.reload().unwrap();
- issue
- .comment("Valid comment", *issue.id, vec![], &node.signer)
- .unwrap();
+ issue.comment("Valid comment", *issue.id, vec![]).unwrap();
issue.reload().unwrap();
assert_eq!(issue.comments().count(), 2);
assert_eq!(issue.thread.timeline().count(), 2);
@@ -1864,10 +1749,13 @@ mod test {
assert_eq!(cob.history.len(), 3);
assert_eq!(cob.object.len(), 3);
- // If Eve now writes a valid comment via the `Issue` type, it will overwrite her invalid
+ let mut eve_issues = Cache::no_cache(&*repo, &eve).unwrap();
+ let mut eve_issue = eve_issues.get_mut(issue.id()).unwrap();
+
+ // If Eve now writes a valid comment via the `IssueMut` type, it will overwrite her invalid
// one, since it won't be loaded as a tip.
- issue
- .comment("Eve's comment", *issue.id, vec![], &eve)
+ eve_issue
+ .comment("Eve's comment", *issue.id, vec![])
.unwrap();
let cob = cob::get::<NonEmpty<cob::Entry>, _>(&*repo, &type_name, issue.id())
@@ -1876,7 +1764,7 @@ mod test {
// There are three nodes still, but they are all valid comments.
// The invalid comment of Eve was replaced with a valid one.
- assert_eq!(issue.comments().count(), 3);
+ assert_eq!(eve_issue.comments().count(), 3);
assert_eq!(cob.history.len(), 3);
assert_eq!(cob.object.len(), 3);
}
diff --git a/crates/radicle/src/cob/issue/cache.rs b/crates/radicle/src/cob/issue/cache.rs
index 08cef436c..858a7e243 100644
--- a/crates/radicle/src/cob/issue/cache.rs
+++ b/crates/radicle/src/cob/issue/cache.rs
@@ -8,9 +8,9 @@ use crate::cob;
use crate::cob::cache;
use crate::cob::cache::{Remove, StoreReader, StoreWriter, Update};
use crate::cob::store;
+use crate::cob::store::access::{ReadOnly, WriteAs};
use crate::cob::{Embed, Label, ObjectId, TypeName, Uri};
use crate::node::NodeId;
-use crate::node::device::Device;
use crate::prelude::{Did, RepoId};
use crate::storage::{HasRepoId, ReadRepository, RepositoryError, SignRepository, WriteRepository};
@@ -77,39 +77,45 @@ impl<T> IssuesMut for T where T: Issues + Update<Issue> + Remove<Issue> {}
/// The `store` is used for the main storage when performing a
/// write-through. It is also used for identifying which `RepoId` is
/// being used for the `cache`.
-pub struct Cache<R, C> {
- store: R,
+pub struct Cache<'a, Repo, Access, C> {
+ store: super::Issues<'a, Repo, Access>,
cache: C,
}
-impl<R, C> Cache<R, C> {
- pub fn new(store: R, cache: C) -> Self {
+impl<'a, Repo, Access, C> Cache<'a, Repo, Access, C> {
+ pub fn new(store: super::Issues<'a, Repo, Access>, cache: C) -> Self {
Self { store, cache }
}
+}
- pub fn rid(&self) -> RepoId
- where
- R: HasRepoId,
- {
+impl<'a, Repo, Access, C> HasRepoId for Cache<'a, Repo, Access, C>
+where
+ Repo: HasRepoId,
+{
+ fn rid(&self) -> RepoId {
self.store.rid()
}
}
-impl<'a, R, C> Cache<super::Issues<'a, R>, C> {
+impl<'a, 'b, Repo, Signer, C> Cache<'a, Repo, WriteAs<'b, Signer>, C>
+where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+{
/// Create a new [`Issue`] using the [`super::Issues`] as the
/// main storage, and writing the update to the `cache`.
- pub fn create<'g, G>(
+ pub fn create<'g>(
&'g mut self,
title: cob::Title,
description: impl ToString,
labels: &[Label],
assignees: &[Did],
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<IssueMut<'a, 'g, R, C>, super::Error>
+ ) -> Result<IssueMut<'a, 'b, 'g, Repo, Signer, C>, super::Error>
where
- R: ReadRepository + WriteRepository + cob::Store<Namespace = NodeId>,
- G: crypto::signature::Signer<crypto::Signature>,
+ Repo: ReadRepository + WriteRepository + cob::Store<Namespace = NodeId>,
C: Update<Issue>,
{
self.store.create(
@@ -119,19 +125,17 @@ impl<'a, R, C> Cache<super::Issues<'a, R>, C> {
assignees,
embeds,
&mut self.cache,
- signer,
)
}
/// Remove the given `id` from the [`super::Issues`] storage, and
/// removing the entry from the `cache`.
- pub fn remove<G>(&mut self, id: &IssueId, signer: &Device<G>) -> Result<(), super::Error>
+ pub fn remove(&mut self, id: &IssueId) -> Result<(), super::Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
- R: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
C: Remove<Issue>,
{
- self.store.remove(id, signer)?;
+ self.store.raw.remove(id)?;
self.cache
.remove(id)
.map_err(|e| super::Error::CacheRemove {
@@ -140,12 +144,17 @@ impl<'a, R, C> Cache<super::Issues<'a, R>, C> {
})?;
Ok(())
}
+}
+impl<'a, Repo, Access, C> Cache<'a, Repo, Access, C>
+where
+ Access: cob::store::access::Access,
+{
/// Read the given `id` from the [`super::Issues`] store and
/// writing it to the `cache`.
pub fn write(&mut self, id: &IssueId) -> Result<(), super::Error>
where
- R: ReadRepository + cob::Store,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
C: Update<Issue>,
{
let issue = self
@@ -171,7 +180,7 @@ impl<'a, R, C> Cache<super::Issues<'a, R>, C> {
on_issue: impl Fn(&Result<(IssueId, Issue), store::Error>, &cache::Progress) -> ControlFlow<()>,
) -> Result<(), super::Error>
where
- R: ReadRepository + cob::Store,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
C: Update<Issue> + Remove<Issue>,
{
// Start by clearing the cache. This will get rid of issues that are cached but
@@ -198,14 +207,15 @@ impl<'a, R, C> Cache<super::Issues<'a, R>, C> {
}
}
-impl<'a, R> Cache<super::Issues<'a, R>, cache::NoCache>
+impl<'a, 'b, Repo, Signer> Cache<'a, Repo, WriteAs<'b, Signer>, cache::NoCache>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
{
/// Get a `Cache` that does no write-through modifications and
/// uses the [`super::Issues`] store for all reads and writes.
- pub fn no_cache(repository: &'a R) -> Result<Self, RepositoryError> {
- let store = super::Issues::open(repository)?;
+ pub fn no_cache(repository: &'a Repo, signer: &'b Signer) -> Result<Self, RepositoryError> {
+ let store = super::Issues::open(repository, WriteAs::new(signer))?;
Ok(Self {
store,
cache: cache::NoCache,
@@ -216,7 +226,7 @@ where
pub fn get_mut<'g>(
&'g mut self,
id: &ObjectId,
- ) -> Result<IssueMut<'a, 'g, R, cache::NoCache>, super::Error> {
+ ) -> Result<IssueMut<'a, 'b, 'g, Repo, Signer, cache::NoCache>, super::Error> {
let issue = self
.store
.get(id)?
@@ -231,28 +241,28 @@ where
}
}
-impl<R> Cache<R, StoreReader> {
- pub fn reader(store: R, cache: StoreReader) -> Self {
+impl<'a, Repo> Cache<'a, Repo, ReadOnly, StoreReader> {
+ pub fn reader(store: super::Issues<'a, Repo, ReadOnly>, cache: StoreReader) -> Self {
Self { store, cache }
}
}
-impl<R> Cache<R, StoreWriter> {
- pub fn open(store: R, cache: StoreWriter) -> Self {
+impl<'a, Repo, Access> Cache<'a, Repo, Access, StoreWriter> {
+ pub fn open(store: super::Issues<'a, Repo, Access>, cache: StoreWriter) -> Self {
Self { store, cache }
}
}
-impl<'a, R> Cache<super::Issues<'a, R>, StoreWriter>
+impl<'a, 'b, Repo, Signer> Cache<'a, Repo, WriteAs<'b, Signer>, StoreWriter>
where
- R: ReadRepository + cob::Store,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
/// Get the [`IssueMut`], identified by `id`, using the
/// `StoreWriter` for retrieving the `Issue`.
pub fn get_mut<'g>(
&'g mut self,
id: &ObjectId,
- ) -> Result<IssueMut<'a, 'g, R, StoreWriter>, Error> {
+ ) -> Result<IssueMut<'a, 'b, 'g, Repo, Signer, StoreWriter>, Error> {
let issue = Issues::get(self, id)?
.ok_or_else(move || Error::NotFound(super::TYPENAME.clone(), *id))?;
@@ -265,7 +275,7 @@ where
}
}
-impl<R, C> cache::Update<Issue> for Cache<R, C>
+impl<'a, Repo, Access, C> cache::Update<Issue> for Cache<'a, Repo, Access, C>
where
C: cache::Update<Issue>,
{
@@ -282,7 +292,7 @@ where
}
}
-impl<R, C> cache::Remove<Issue> for Cache<R, C>
+impl<'a, Repo, Access, C> cache::Remove<Issue> for Cache<'a, Repo, Access, C>
where
C: cache::Remove<Issue>,
{
@@ -377,9 +387,10 @@ impl Iterator for NoCacheIter<'_> {
}
}
-impl<R> Issues for Cache<super::Issues<'_, R>, cache::NoCache>
+impl<'a, Repo, Access> Issues for Cache<'a, Repo, Access, cache::NoCache>
where
- R: ReadRepository + cob::Store,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: store::access::Access,
{
type Error = super::Error;
type Iter<'b>
@@ -459,9 +470,9 @@ impl Iterator for IssuesIter<'_> {
}
}
-impl<R> Issues for Cache<R, StoreWriter>
+impl<'a, Repo, Access> Issues for Cache<'a, Repo, Access, StoreWriter>
where
- R: HasRepoId,
+ Repo: HasRepoId,
{
type Error = Error;
type Iter<'b>
@@ -486,9 +497,9 @@ where
}
}
-impl<R> Issues for Cache<R, StoreReader>
+impl<'a, Repo, Access> Issues for Cache<'a, Repo, Access, StoreReader>
where
- R: HasRepoId,
+ Repo: HasRepoId,
{
type Error = Error;
type Iter<'b>
@@ -618,14 +629,17 @@ mod tests {
use crate::cob::cache::{Store, Update, Write};
use crate::cob::migrate;
+ use crate::cob::store::access::ReadOnly;
use crate::cob::thread::Thread;
use crate::issue::{CloseReason, Issue, IssueCounts, IssueId, State};
+ use crate::storage::HasRepoId as _;
use crate::test::arbitrary;
use crate::test::storage::MockRepository;
use super::{Cache, Issues};
- fn memory(store: MockRepository) -> Cache<MockRepository, Store<Write>> {
+ fn memory<'a>(store: &'a MockRepository) -> Cache<'a, MockRepository, ReadOnly, Store<Write>> {
+ let store = super::super::Issues::open(store, ReadOnly).unwrap();
let cache = Store::<Write>::memory()
.unwrap()
.with_migrations(migrate::ignore)
@@ -636,7 +650,7 @@ mod tests {
#[test]
fn test_is_empty() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
assert!(cache.is_empty().unwrap());
let issue = Issue::new(Thread::default());
@@ -658,7 +672,7 @@ mod tests {
#[test]
fn test_counts() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let n_open = arbitrary::r#gen::<u8>(0);
let n_closed = arbitrary::r#gen::<u8>(1);
let open_ids = (0..n_open)
@@ -699,7 +713,7 @@ mod tests {
#[test]
fn test_get() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let ids = (0..arbitrary::r#gen::<u8>(1))
.map(|_| IssueId::from(arbitrary::oid()))
.collect::<BTreeSet<IssueId>>();
@@ -734,7 +748,7 @@ mod tests {
#[test]
fn test_list() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let ids = (0..arbitrary::r#gen::<u8>(1))
.map(|_| IssueId::from(arbitrary::oid()))
.collect::<BTreeSet<IssueId>>();
@@ -764,7 +778,7 @@ mod tests {
#[test]
fn test_list_by_status() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let ids = (0..arbitrary::r#gen::<u8>(1))
.map(|_| IssueId::from(arbitrary::oid()))
.collect::<BTreeSet<IssueId>>();
@@ -794,7 +808,7 @@ mod tests {
#[test]
fn test_remove() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let ids = (0..arbitrary::r#gen::<u8>(1))
.map(|_| IssueId::from(arbitrary::oid()))
.collect::<BTreeSet<IssueId>>();
diff --git a/crates/radicle/src/cob/patch.rs b/crates/radicle/src/cob/patch.rs
index bb5ae28cf..21e800812 100644
--- a/crates/radicle/src/cob/patch.rs
+++ b/crates/radicle/src/cob/patch.rs
@@ -21,6 +21,7 @@ use thiserror::Error;
use crate::cob;
use crate::cob::common::{Author, Authorization, CodeLocation, Label, Reaction, Timestamp};
use crate::cob::store::Transaction;
+use crate::cob::store::access::WriteAs;
use crate::cob::store::{Cob, CobAction};
use crate::cob::thread;
use crate::cob::thread::Thread;
@@ -30,7 +31,6 @@ use crate::crypto::PublicKey;
use crate::git;
use crate::identity::PayloadError;
use crate::identity::doc::{DocAt, DocError};
-use crate::node::device::Device;
use crate::prelude::*;
use crate::storage;
@@ -368,15 +368,17 @@ impl<R: WriteRepository> Merged<'_, R> {
///
/// This removes Git refs relating to the patch, both in the working copy,
/// and the stored copy; and updates `rad/sigrefs`.
- pub fn cleanup<G>(
+ pub fn cleanup<Signer>(
self,
working: &git::raw::Repository,
- signer: &Device<G>,
+ signer: &Signer,
) -> Result<(), storage::RepositoryError>
where
- G: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
- let nid = signer.public_key();
+ let nid = &signer.verifying_key();
let stored_ref = git::refs::patch(&self.patch).with_namespace(nid.into());
let working_ref = git::refs::workdir::patch_upstream(&self.patch);
@@ -2038,20 +2040,28 @@ impl<R: ReadRepository> store::Transaction<Patch, R> {
}
}
-pub struct PatchMut<'a, 'g, R, C> {
+pub struct PatchMut<'a, 'b, 'g, Repo, Signer, Cache> {
pub id: ObjectId,
patch: Patch,
- store: &'g mut Patches<'a, R>,
- cache: &'g mut C,
+ store: &'g mut Patches<'a, Repo, WriteAs<'b, Signer>>,
+ cache: &'g mut Cache,
}
-impl<'a, 'g, R, C> PatchMut<'a, 'g, R, C>
+impl<'a, 'b, 'g, Repo, Signer, Update> PatchMut<'a, 'b, 'g, Repo, Signer, Update>
where
- C: cob::cache::Update<Patch>,
- R: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+ Update: cob::cache::Update<Patch>,
{
- pub fn new(id: ObjectId, patch: Patch, cache: &'g mut Cache<Patches<'a, R>, C>) -> Self {
+ pub fn new(
+ id: ObjectId,
+ patch: Patch,
+ cache: &'g mut Cache<'a, Repo, WriteAs<'b, Signer>, Update>,
+ ) -> Self {
Self {
id,
patch,
@@ -2074,20 +2084,14 @@ where
Ok(())
}
- pub fn transaction<G, F>(
- &mut self,
- message: &str,
- signer: &Device<G>,
- operations: F,
- ) -> Result<EntryId, Error>
+ pub fn transaction<F>(&mut self, message: &str, operations: F) -> Result<EntryId, Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
- F: FnOnce(&mut Transaction<Patch, R>) -> Result<(), store::Error>,
+ F: FnOnce(&mut Transaction<Patch, Repo>) -> Result<(), store::Error>,
{
let mut tx = Transaction::default();
operations(&mut tx)?;
- let (patch, commit) = tx.commit(message, self.id, &mut self.store.raw, signer)?;
+ let (patch, commit) = tx.commit(message, self.id, &mut self.store.raw)?;
self.cache
.update(&self.store.as_ref().id(), &self.id, &patch)
.map_err(|e| Error::CacheUpdate {
@@ -2100,73 +2104,46 @@ where
}
/// Edit patch metadata.
- pub fn edit<G, S>(
- &mut self,
- title: cob::Title,
- target: MergeTarget,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- S: ToString,
- {
- self.transaction("Edit", signer, |tx| tx.edit(title, target))
+ pub fn edit(&mut self, title: cob::Title, target: MergeTarget) -> Result<EntryId, Error> {
+ self.transaction("Edit", |tx| tx.edit(title, target))
}
/// Edit revision metadata.
- pub fn edit_revision<G, S>(
+ pub fn edit_revision(
&mut self,
revision: RevisionId,
- description: S,
+ description: impl ToString,
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- S: ToString,
- {
- self.transaction("Edit revision", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Edit revision", |tx| {
tx.edit_revision(revision, description, embeds.into_iter().collect())
})
}
/// Redact a revision.
- pub fn redact<G>(&mut self, revision: RevisionId, signer: &Device<G>) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Redact revision", signer, |tx| tx.redact(revision))
+ pub fn redact(&mut self, revision: RevisionId) -> Result<EntryId, Error> {
+ self.transaction("Redact revision", |tx| tx.redact(revision))
}
/// Create a thread on a patch revision.
- pub fn thread<G, S>(
+ pub fn thread(
&mut self,
revision: RevisionId,
- body: S,
- signer: &Device<G>,
- ) -> Result<CommentId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- S: ToString,
- {
- self.transaction("Create thread", signer, |tx| tx.thread(revision, body))
+ body: impl ToString,
+ ) -> Result<CommentId, Error> {
+ self.transaction("Create thread", |tx| tx.thread(revision, body))
}
/// Comment on a patch revision.
- pub fn comment<G, S>(
+ pub fn comment(
&mut self,
revision: RevisionId,
- body: S,
+ body: impl ToString,
reply_to: Option<CommentId>,
location: Option<CodeLocation>,
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- S: ToString,
- {
- self.transaction("Comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Comment", |tx| {
tx.comment(
revision,
body,
@@ -2178,87 +2155,61 @@ where
}
/// React on a patch revision.
- pub fn react<G>(
+ pub fn react(
&mut self,
revision: RevisionId,
reaction: Reaction,
location: Option<CodeLocation>,
active: bool,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("React", signer, |tx| {
- tx.react(revision, reaction, location, active)
- })
+ ) -> Result<EntryId, Error> {
+ self.transaction("React", |tx| tx.react(revision, reaction, location, active))
}
/// Edit a comment on a patch revision.
- pub fn comment_edit<G, S>(
+ pub fn comment_edit(
&mut self,
revision: RevisionId,
comment: CommentId,
- body: S,
+ body: impl ToString,
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- S: ToString,
- {
- self.transaction("Edit comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Edit comment", |tx| {
tx.comment_edit(revision, comment, body, embeds.into_iter().collect())
})
}
/// React to a comment on a patch revision.
- pub fn comment_react<G>(
+ pub fn comment_react(
&mut self,
revision: RevisionId,
comment: CommentId,
reaction: Reaction,
active: bool,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("React comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("React comment", |tx| {
tx.comment_react(revision, comment, reaction, active)
})
}
/// Redact a comment on a patch revision.
- pub fn comment_redact<G>(
+ pub fn comment_redact(
&mut self,
revision: RevisionId,
comment: CommentId,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Redact comment", signer, |tx| {
- tx.comment_redact(revision, comment)
- })
+ ) -> Result<EntryId, Error> {
+ self.transaction("Redact comment", |tx| tx.comment_redact(revision, comment))
}
/// Comment on a line of code as part of a review.
- pub fn review_comment<G, S>(
+ pub fn review_comment(
&mut self,
review: ReviewId,
- body: S,
+ body: impl ToString,
location: Option<CodeLocation>,
reply_to: Option<CommentId>,
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- S: ToString,
- {
- self.transaction("Review comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Review comment", |tx| {
tx.review_comment(
review,
body,
@@ -2270,164 +2221,118 @@ where
}
/// Edit review comment.
- pub fn edit_review_comment<G, S>(
+ pub fn edit_review_comment(
&mut self,
review: ReviewId,
comment: EntryId,
- body: S,
+ body: impl ToString,
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- S: ToString,
- {
- self.transaction("Edit review comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Edit review comment", |tx| {
tx.edit_review_comment(review, comment, body, embeds.into_iter().collect())
})
}
/// React to a review comment.
- pub fn react_review_comment<G>(
+ pub fn react_review_comment(
&mut self,
review: ReviewId,
comment: EntryId,
reaction: Reaction,
active: bool,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("React to review comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("React to review comment", |tx| {
tx.react_review_comment(review, comment, reaction, active)
})
}
/// React to a review comment.
- pub fn redact_review_comment<G>(
+ pub fn redact_review_comment(
&mut self,
review: ReviewId,
comment: EntryId,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Redact review comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Redact review comment", |tx| {
tx.redact_review_comment(review, comment)
})
}
/// Review a patch revision.
- pub fn review<G>(
+ pub fn review(
&mut self,
revision: RevisionId,
verdict: Option<Verdict>,
summary: Option<String>,
labels: Vec<Label>,
- signer: &Device<G>,
- ) -> Result<ReviewId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
+ ) -> Result<ReviewId, Error> {
if verdict.is_none() && summary.is_none() {
return Err(Error::EmptyReview);
}
- self.transaction("Review", signer, |tx| {
- tx.review(revision, verdict, summary, labels)
- })
- .map(ReviewId)
+ self.transaction("Review", |tx| tx.review(revision, verdict, summary, labels))
+ .map(ReviewId)
}
/// Edit a review.
- pub fn review_edit<G>(
+ pub fn review_edit(
&mut self,
review: ReviewId,
verdict: Option<Verdict>,
summary: String,
labels: Vec<Label>,
embeds: impl IntoIterator<Item = Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Edit review", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Edit review", |tx| {
tx.review_edit(review, verdict, summary, labels, embeds)
})
}
/// React to a review.
- pub fn review_react<G>(
+ pub fn review_react(
&mut self,
review: ReviewId,
reaction: Reaction,
active: bool,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("React to review", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("React to review", |tx| {
tx.review_react(review, reaction, active)
})
}
/// Redact a patch review.
- pub fn redact_review<G>(
- &mut self,
- review: ReviewId,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Redact review", signer, |tx| tx.redact_review(review))
+ pub fn redact_review(&mut self, review: ReviewId) -> Result<EntryId, Error> {
+ self.transaction("Redact review", |tx| tx.redact_review(review))
}
/// Resolve a patch review comment.
- pub fn resolve_review_comment<G>(
+ pub fn resolve_review_comment(
&mut self,
review: ReviewId,
comment: CommentId,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Resolve review comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Resolve review comment", |tx| {
tx.review_comment_resolve(review, comment)
})
}
/// Unresolve a patch review comment.
- pub fn unresolve_review_comment<G>(
+ pub fn unresolve_review_comment(
&mut self,
review: ReviewId,
comment: CommentId,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Unresolve review comment", signer, |tx| {
+ ) -> Result<EntryId, Error> {
+ self.transaction("Unresolve review comment", |tx| {
tx.review_comment_unresolve(review, comment)
})
}
/// Merge a patch revision.
- pub fn merge<G>(
+ pub fn merge(
&mut self,
revision: RevisionId,
commit: git::Oid,
- signer: &Device<G>,
- ) -> Result<Merged<'_, R>, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
+ ) -> Result<Merged<'_, Repo>, Error> {
// TODO: Don't allow merging the same revision twice?
- let entry = self.transaction("Merge revision", signer, |tx| tx.merge(revision, commit))?;
+ let entry = self.transaction("Merge revision", |tx| tx.merge(revision, commit))?;
Ok(Merged {
entry,
@@ -2437,108 +2342,73 @@ where
}
/// Update a patch with a new revision.
- pub fn update<G>(
+ pub fn update(
&mut self,
description: impl ToString,
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
- signer: &Device<G>,
- ) -> Result<RevisionId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Add revision", signer, |tx| {
- tx.revision(description, base, oid)
- })
- .map(RevisionId)
+ ) -> Result<RevisionId, Error> {
+ self.transaction("Add revision", |tx| tx.revision(description, base, oid))
+ .map(RevisionId)
}
/// Lifecycle a patch.
- pub fn lifecycle<G>(&mut self, state: Lifecycle, signer: &Device<G>) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Lifecycle", signer, |tx| tx.lifecycle(state))
+ pub fn lifecycle(&mut self, state: Lifecycle) -> Result<EntryId, Error> {
+ self.transaction("Lifecycle", |tx| tx.lifecycle(state))
}
/// Assign a patch.
- pub fn assign<G>(
- &mut self,
- assignees: BTreeSet<Did>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Assign", signer, |tx| tx.assign(assignees))
+ pub fn assign(&mut self, assignees: BTreeSet<Did>) -> Result<EntryId, Error> {
+ self.transaction("Assign", |tx| tx.assign(assignees))
}
/// Archive a patch.
- pub fn archive<G>(&mut self, signer: &Device<G>) -> Result<bool, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.lifecycle(Lifecycle::Archived, signer)?;
+ pub fn archive(&mut self) -> Result<bool, Error> {
+ self.lifecycle(Lifecycle::Archived)?;
Ok(true)
}
/// Mark an archived patch as ready to be reviewed again.
/// Returns `false` if the patch was not archived.
- pub fn unarchive<G>(&mut self, signer: &Device<G>) -> Result<bool, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
+ pub fn unarchive(&mut self) -> Result<bool, Error> {
if !self.is_archived() {
return Ok(false);
}
- self.lifecycle(Lifecycle::Open, signer)?;
+ self.lifecycle(Lifecycle::Open)?;
Ok(true)
}
/// Mark a patch as ready to be reviewed.
/// Returns `false` if the patch was not a draft.
- pub fn ready<G>(&mut self, signer: &Device<G>) -> Result<bool, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
+ pub fn ready(&mut self) -> Result<bool, Error> {
if !self.is_draft() {
return Ok(false);
}
- self.lifecycle(Lifecycle::Open, signer)?;
+ self.lifecycle(Lifecycle::Open)?;
Ok(true)
}
/// Mark an open patch as a draft.
/// Returns `false` if the patch was not open and free of merges.
- pub fn unready<G>(&mut self, signer: &Device<G>) -> Result<bool, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
+ pub fn unready(&mut self) -> Result<bool, Error> {
if !matches!(self.state(), State::Open { conflicts } if conflicts.is_empty()) {
return Ok(false);
}
- self.lifecycle(Lifecycle::Draft, signer)?;
+ self.lifecycle(Lifecycle::Draft)?;
Ok(true)
}
/// Label a patch.
- pub fn label<G>(
- &mut self,
- labels: impl IntoIterator<Item = Label>,
- signer: &Device<G>,
- ) -> Result<EntryId, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- self.transaction("Label", signer, |tx| tx.label(labels))
+ pub fn label(&mut self, labels: impl IntoIterator<Item = Label>) -> Result<EntryId, Error> {
+ self.transaction("Label", |tx| tx.label(labels))
}
}
-impl<R, C> Deref for PatchMut<'_, '_, R, C> {
+impl<Repo, Signer, Cache> Deref for PatchMut<'_, '_, '_, Repo, Signer, Cache> {
type Target = Patch;
fn deref(&self) -> &Self::Target {
@@ -2574,39 +2444,46 @@ pub struct ByRevision {
pub revision: Revision,
}
-pub struct Patches<'a, R> {
- raw: store::Store<'a, Patch, R>,
+pub struct Patches<'a, Repo, Access> {
+ raw: store::Store<'a, Patch, Repo, Access>,
}
-impl<'a, R> Deref for Patches<'a, R> {
- type Target = store::Store<'a, Patch, R>;
+impl<'a, Repo, Access> Deref for Patches<'a, Repo, Access> {
+ type Target = store::Store<'a, Patch, Repo, Access>;
fn deref(&self) -> &Self::Target {
&self.raw
}
}
-impl<R> HasRepoId for Patches<'_, R>
+impl<Repo, Access> HasRepoId for Patches<'_, Repo, Access>
where
- R: ReadRepository,
+ Repo: HasRepoId,
{
fn rid(&self) -> RepoId {
- self.as_ref().id()
+ self.raw.rid()
}
}
-impl<'a, R> Patches<'a, R>
+impl<'a, Repo, Access> Patches<'a, Repo, Access>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: store::access::Access,
{
/// Open a patches store.
- pub fn open(repository: &'a R) -> Result<Self, RepositoryError> {
+ pub fn open(repository: &'a Repo, access: Access) -> Result<Self, RepositoryError> {
let identity = repository.identity_head()?;
- let raw = store::Store::open(repository)?.identity(identity);
+ let raw = store::Store::open(repository, access)?.identity(identity);
Ok(Self { raw })
}
+}
+impl<'a, Repo, Access> Patches<'a, Repo, Access>
+where
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: store::access::Access,
+{
/// Patches count by state.
pub fn counts(&self) -> Result<PatchCounts, store::Error> {
let all = self.all()?;
@@ -2678,12 +2555,14 @@ where
}
}
-impl<'a, R> Patches<'a, R>
+impl<'a, 'b, Repo, Signer> Patches<'a, Repo, WriteAs<'b, Signer>>
where
- R: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
{
/// Open a new patch.
- pub fn create<'g, C, G>(
+ pub fn create<'g, Cache>(
&'g mut self,
title: cob::Title,
description: impl ToString,
@@ -2691,12 +2570,13 @@ where
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
labels: &[Label],
- cache: &'g mut C,
- signer: &Device<G>,
- ) -> Result<PatchMut<'a, 'g, R, C>, Error>
+ cache: &'g mut Cache,
+ ) -> Result<PatchMut<'a, 'b, 'g, Repo, Signer, Cache>, Error>
where
- C: cob::cache::Update<Patch>,
- G: crypto::signature::Signer<crypto::Signature>,
+ Cache: cob::cache::Update<Patch>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
self._create(
title,
@@ -2707,12 +2587,11 @@ where
labels,
Lifecycle::default(),
cache,
- signer,
)
}
/// Draft a patch. This patch will be created in a [`State::Draft`] state.
- pub fn draft<'g, C, G>(
+ pub fn draft<'g, Cache>(
&'g mut self,
title: cob::Title,
description: impl ToString,
@@ -2720,12 +2599,12 @@ where
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
labels: &[Label],
- cache: &'g mut C,
- signer: &Device<G>,
- ) -> Result<PatchMut<'a, 'g, R, C>, Error>
+ cache: &'g mut Cache,
+ ) -> Result<PatchMut<'a, 'b, 'g, Repo, Signer, Cache>, Error>
where
- C: cob::cache::Update<Patch>,
- G: crypto::signature::Signer<crypto::Signature>,
+ Cache: cob::cache::Update<Patch>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
self._create(
title,
@@ -2736,16 +2615,15 @@ where
labels,
Lifecycle::Draft,
cache,
- signer,
)
}
/// Get a patch mutably.
- pub fn get_mut<'g, C>(
+ pub fn get_mut<'g, Cache>(
&'g mut self,
id: &ObjectId,
- cache: &'g mut C,
- ) -> Result<PatchMut<'a, 'g, R, C>, store::Error> {
+ cache: &'g mut Cache,
+ ) -> Result<PatchMut<'a, 'b, 'g, Repo, Signer, Cache>, store::Error> {
let patch = self
.raw
.get(id)?
@@ -2760,7 +2638,7 @@ where
}
/// Create a patch. This is an internal function used by `create` and `draft`.
- fn _create<'g, C, G>(
+ fn _create<'g, Cache>(
&'g mut self,
title: cob::Title,
description: impl ToString,
@@ -2769,14 +2647,16 @@ where
oid: impl Into<git::Oid>,
labels: &[Label],
state: Lifecycle,
- cache: &'g mut C,
- signer: &Device<G>,
- ) -> Result<PatchMut<'a, 'g, R, C>, Error>
+ cache: &'g mut Cache,
+ ) -> Result<PatchMut<'a, 'b, 'g, Repo, Signer, Cache>, Error>
where
- C: cob::cache::Update<Patch>,
- G: crypto::signature::Signer<crypto::Signature>,
+ Cache: cob::cache::Update<Patch>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
- let (id, patch) = Transaction::initial("Create patch", &mut self.raw, signer, |tx, _| {
+ let (id, patch) = Transaction::initial("Create patch", &mut self.raw, |tx, _| {
tx.revision(description, base, oid)?;
tx.edit(title, target)?;
@@ -3062,7 +2942,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let author: Did = alice.signer.public_key().into();
let target = MergeTarget::Delegates;
let patch = patches
@@ -3073,7 +2953,6 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
@@ -3104,7 +2983,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3113,7 +2992,6 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
@@ -3122,7 +3000,7 @@ mod test {
let (revision_id, _) = patch.revisions().last().unwrap();
assert!(
patch
- .comment(revision_id, "patch comment", None, None, [], &alice.signer)
+ .comment(revision_id, "patch comment", None, None, [],)
.is_ok(),
"can comment on patch"
);
@@ -3137,7 +3015,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let mut patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3146,13 +3024,12 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
let id = patch.id;
let (rid, _) = patch.revisions().next().unwrap();
- let _merge = patch.merge(rid, branch.base, &alice.signer).unwrap();
+ let _merge = patch.merge(rid, branch.base).unwrap();
let patch = patches.get(&id).unwrap().unwrap();
let merges = patch.merges.iter().collect::<Vec<_>>();
@@ -3168,7 +3045,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let mut patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3177,7 +3054,6 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
@@ -3188,7 +3064,6 @@ mod test {
Some(Verdict::Accept),
Some("LGTM".to_owned()),
vec![],
- &alice.signer,
)
.unwrap();
@@ -3201,17 +3076,17 @@ mod test {
assert_eq!(review.verdict(), Some(Verdict::Accept));
assert_eq!(review.summary(), "LGTM");
- patch.redact_review(review_id, &alice.signer).unwrap();
+ patch.redact_review(review_id).unwrap();
patch.reload().unwrap();
let (_, revision) = patch.latest();
assert_eq!(revision.reviews().count(), 0);
// This is fine, redacting an already-redacted review is a no-op.
- patch.redact_review(review_id, &alice.signer).unwrap();
+ patch.redact_review(review_id).unwrap();
// If the review never existed, it's an error.
patch
- .redact_review(ReviewId(arbitrary::entry_id()), &alice.signer)
+ .redact_review(ReviewId(arbitrary::entry_id()))
.unwrap_err();
}
@@ -3220,7 +3095,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let mut patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3229,21 +3104,20 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
let update = checkout.branch_with([("README", b"Hello Radicle!")]);
let updated = patch
- .update("I've made changes.", branch.base, update.oid, &alice.signer)
+ .update("I've made changes.", branch.base, update.oid)
.unwrap();
// It's fine to redact a review from a redacted revision.
let review = patch
- .review(updated, Some(Verdict::Accept), None, vec![], &alice.signer)
+ .review(updated, Some(Verdict::Accept), None, vec![])
.unwrap();
- patch.redact(updated, &alice.signer).unwrap();
- patch.redact_review(review, &alice.signer).unwrap();
+ patch.redact(updated).unwrap();
+ patch.redact_review(review).unwrap();
}
#[test]
@@ -3408,7 +3282,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let mut patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3417,19 +3291,12 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
let (rid, _) = patch.latest();
let review = patch
- .review(
- rid,
- Some(Verdict::Accept),
- Some("LGTM".to_owned()),
- vec![],
- &alice.signer,
- )
+ .review(rid, Some(Verdict::Accept), Some("LGTM".to_owned()), vec![])
.unwrap();
patch
.review_edit(
@@ -3438,7 +3305,6 @@ mod test {
"Whoops!".to_owned(),
vec![],
vec![],
- &alice.signer,
)
.unwrap(); // Overwrite the comment.
@@ -3453,7 +3319,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let mut patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3462,16 +3328,15 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
let (rid, _) = patch.latest();
patch
- .review(rid, Some(Verdict::Accept), None, vec![], &alice.signer)
+ .review(rid, Some(Verdict::Accept), None, vec![])
.unwrap();
patch
- .review(rid, Some(Verdict::Reject), None, vec![], &alice.signer)
+ .review(rid, Some(Verdict::Reject), None, vec![])
.unwrap(); // This review is ignored, since there is already a review by this author.
let (_, revision) = patch.latest();
@@ -3484,7 +3349,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let mut patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3493,16 +3358,15 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
let (rid, _) = patch.latest();
let review = patch
- .review(rid, Some(Verdict::Accept), None, vec![], &alice.signer)
+ .review(rid, Some(Verdict::Accept), None, vec![])
.unwrap();
patch
- .review_comment(review, "First comment!", None, None, [], &alice.signer)
+ .review_comment(review, "First comment!", None, None, [])
.unwrap();
let _review = patch
@@ -3512,11 +3376,10 @@ mod test {
"".to_string(),
vec![],
vec![],
- &alice.signer,
)
.unwrap();
patch
- .review_comment(review, "Second comment!", None, None, [], &alice.signer)
+ .review_comment(review, "Second comment!", None, None, [])
.unwrap();
let (_, revision) = patch.latest();
@@ -3535,7 +3398,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let mut patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3544,7 +3407,6 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
@@ -3556,7 +3418,7 @@ mod test {
new: Some(CodeRange::Lines { range: 5..8 }),
};
let review = patch
- .review(rid, Some(Verdict::Accept), None, vec![], &alice.signer)
+ .review(rid, Some(Verdict::Accept), None, vec![])
.unwrap();
patch
.review_comment(
@@ -3565,7 +3427,6 @@ mod test {
Some(location.clone()),
None,
[],
- &alice.signer,
)
.unwrap();
@@ -3582,7 +3443,7 @@ mod test {
let alice = test::setup::NodeWithRepo::default();
let checkout = alice.repo.checkout();
let branch = checkout.branch_with([("README", b"Hello World!")]);
- let mut patches = Cache::no_cache(&*alice.repo).unwrap();
+ let mut patches = Cache::no_cache(&*alice.repo, &alice.signer).unwrap();
let mut patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3591,19 +3452,12 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
let (rid, _) = patch.latest();
let review = patch
- .review(
- rid,
- Some(Verdict::Accept),
- Some("Nah".to_owned()),
- vec![],
- &alice.signer,
- )
+ .review(rid, Some(Verdict::Accept), Some("Nah".to_owned()), vec![])
.unwrap();
patch
.review_edit(
@@ -3612,7 +3466,6 @@ mod test {
"".to_string(),
vec![],
vec![],
- &alice.signer,
)
.unwrap();
@@ -3633,7 +3486,8 @@ mod test {
let mut patches = {
let path = alice.tmp.path().join("cobs.db");
let mut db = cob::cache::Store::open(path).unwrap();
- let store = cob::patch::Patches::open(&*alice.repo).unwrap();
+ let store =
+ cob::patch::Patches::open(&*alice.repo, WriteAs::new(&alice.signer)).unwrap();
db.migrate(migrate::ignore).unwrap();
cob::patch::Cache::open(store, db)
@@ -3646,7 +3500,6 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
@@ -3655,7 +3508,7 @@ mod test {
let update = checkout.branch_with([("README", b"Hello Radicle!")]);
let _ = patch
- .update("I've made changes.", branch.base, update.oid, &alice.signer)
+ .update("I've made changes.", branch.base, update.oid)
.unwrap();
let id = patch.id;
@@ -3686,7 +3539,7 @@ mod test {
let branch = repo
.checkout()
.branch_with([("README.md", b"Hello, World!")]);
- let mut patches = Cache::no_cache(&*repo).unwrap();
+ let mut patches = Cache::no_cache(&*repo, &alice.signer).unwrap();
let mut patch = patches
.create(
cob::Title::new("My first patch").unwrap(),
@@ -3695,7 +3548,6 @@ mod test {
branch.base,
branch.oid,
&[],
- &alice.signer,
)
.unwrap();
let patch_id = patch.id;
@@ -3704,17 +3556,17 @@ mod test {
.checkout()
.branch_with([("README.md", b"Hello, Radicle!")]);
let revision_id = patch
- .update("I've made changes.", branch.base, update.oid, &alice.signer)
+ .update("I've made changes.", branch.base, update.oid)
.unwrap();
assert_eq!(patch.revisions().count(), 2);
- patch.redact(revision_id, &alice.signer).unwrap();
+ patch.redact(revision_id).unwrap();
assert_eq!(patch.latest().0, RevisionId(*patch_id));
assert_eq!(patch.revisions().count(), 1);
// The patch's root must always exist.
assert_eq!(patch.latest(), patch.root());
- assert!(patch.redact(patch.latest().0, &alice.signer).is_err());
+ assert!(patch.redact(patch.latest().0).is_err());
}
#[test]
diff --git a/crates/radicle/src/cob/patch/cache.rs b/crates/radicle/src/cob/patch/cache.rs
index 0f17c12d7..58532e329 100644
--- a/crates/radicle/src/cob/patch/cache.rs
+++ b/crates/radicle/src/cob/patch/cache.rs
@@ -8,9 +8,9 @@ use crate::cob;
use crate::cob::cache::{self, StoreReader};
use crate::cob::cache::{Remove, StoreWriter, Update};
use crate::cob::store;
+use crate::cob::store::access::{ReadOnly, WriteAs};
use crate::cob::{Label, ObjectId, TypeName};
use crate::git;
-use crate::node::device::Device;
use crate::prelude::RepoId;
use crate::storage::{HasRepoId, ReadRepository, RepositoryError, SignRepository, WriteRepository};
@@ -87,28 +87,36 @@ impl<T> PatchesMut for T where T: Patches + Update<Patch> + Remove<Patch> {}
/// The `store` is used for the main storage when performing a
/// write-through. It is also used for identifying which `RepoId` is
/// being used for the `cache`.
-pub struct Cache<R, C> {
- pub(super) store: R,
+pub struct Cache<'a, Repo, Access, C> {
+ pub(super) store: super::Patches<'a, Repo, Access>,
pub(super) cache: C,
}
-impl<R, C> Cache<R, C> {
- pub fn new(store: R, cache: C) -> Self {
+impl<'a, Repo, Access, C> Cache<'a, Repo, Access, C> {
+ pub fn new(store: super::Patches<'a, Repo, Access>, cache: C) -> Self {
Self { store, cache }
}
+}
- pub fn rid(&self) -> RepoId
- where
- R: HasRepoId,
- {
+impl<'a, Repo, Access, C> HasRepoId for Cache<'a, Repo, Access, C>
+where
+ Repo: HasRepoId,
+{
+ fn rid(&self) -> RepoId {
self.store.rid()
}
}
-impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
+impl<'a, 'b, Repo, Signer, C> Cache<'a, Repo, WriteAs<'b, Signer>, C>
+where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+{
/// Create a new [`Patch`] using the [`super::Patches`] as the
/// main storage, and writing the update to the `cache`.
- pub fn create<'g, G>(
+ pub fn create<'g>(
&'g mut self,
title: cob::Title,
description: impl ToString,
@@ -116,11 +124,9 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
labels: &[Label],
- signer: &Device<G>,
- ) -> Result<PatchMut<'a, 'g, R, C>, super::Error>
+ ) -> Result<PatchMut<'a, 'b, 'g, Repo, Signer, C>, super::Error>
where
- R: WriteRepository + cob::Store<Namespace = NodeId>,
- G: crypto::signature::Signer<crypto::Signature>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
C: Update<Patch>,
{
self.store.create(
@@ -131,14 +137,13 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
oid,
labels,
&mut self.cache,
- signer,
)
}
/// Create a new [`Patch`], in a draft state, using the
/// [`super::Patches`] as the main storage, and writing the update
/// to the `cache`.
- pub fn draft<'g, G>(
+ pub fn draft<'g>(
&'g mut self,
title: cob::Title,
description: impl ToString,
@@ -146,11 +151,9 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
labels: &[Label],
- signer: &Device<G>,
- ) -> Result<PatchMut<'a, 'g, R, C>, super::Error>
+ ) -> Result<PatchMut<'a, 'b, 'g, Repo, Signer, C>, super::Error>
where
- R: WriteRepository + cob::Store<Namespace = NodeId>,
- G: crypto::signature::Signer<crypto::Signature>,
+ Repo: WriteRepository + cob::Store<Namespace = NodeId>,
C: Update<Patch>,
{
self.store.draft(
@@ -161,19 +164,17 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
oid,
labels,
&mut self.cache,
- signer,
)
}
/// Remove the given `id` from the [`super::Patches`] storage, and
/// removing the entry from the `cache`.
- pub fn remove<G>(&mut self, id: &PatchId, signer: &Device<G>) -> Result<(), super::Error>
+ pub fn remove(&mut self, id: &PatchId) -> Result<(), super::Error>
where
- G: crypto::signature::Signer<crypto::Signature>,
- R: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
C: Remove<Patch>,
{
- self.store.remove(id, signer)?;
+ self.store.raw.remove(id)?;
self.cache
.remove(id)
.map_err(|e| super::Error::CacheRemove {
@@ -182,12 +183,17 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
})?;
Ok(())
}
+}
+impl<'a, Repo, Access, C> Cache<'a, Repo, Access, C>
+where
+ Access: cob::store::access::Access,
+{
/// Read the given `id` from the [`super::Patches`] store and
/// writing it to the `cache`.
pub fn write(&mut self, id: &PatchId) -> Result<(), super::Error>
where
- R: ReadRepository + cob::Store,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
C: Update<Patch>,
{
let issue = self
@@ -213,7 +219,7 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
callback: impl Fn(&Result<(PatchId, Patch), store::Error>, &cache::Progress) -> ControlFlow<()>,
) -> Result<(), super::Error>
where
- R: ReadRepository + cob::Store,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
C: Update<Patch> + Remove<Patch>,
{
// Start by clearing the cache. This will get rid of patches that are cached but
@@ -240,28 +246,28 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
}
}
-impl<R> Cache<R, StoreReader> {
- pub fn reader(store: R, cache: StoreReader) -> Self {
+impl<'a, Repo> Cache<'a, Repo, ReadOnly, StoreReader> {
+ pub fn reader(store: super::Patches<'a, Repo, ReadOnly>, cache: StoreReader) -> Self {
Self { store, cache }
}
}
-impl<R> Cache<R, StoreWriter> {
- pub fn open(store: R, cache: StoreWriter) -> Self {
+impl<'a, Repo, Access> Cache<'a, Repo, Access, StoreWriter> {
+ pub fn open(store: super::Patches<'a, Repo, Access>, cache: StoreWriter) -> Self {
Self { store, cache }
}
}
-impl<'a, R> Cache<super::Patches<'a, R>, StoreWriter>
+impl<'a, 'b, Repo, Signer> Cache<'a, Repo, WriteAs<'b, Signer>, StoreWriter>
where
- R: ReadRepository + cob::Store,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
/// Get the [`PatchMut`], identified by `id`, using the
/// `StoreWriter` for retrieving the `Patch`.
pub fn get_mut<'g>(
&'g mut self,
id: &ObjectId,
- ) -> Result<PatchMut<'a, 'g, R, StoreWriter>, Error> {
+ ) -> Result<PatchMut<'a, 'b, 'g, Repo, Signer, StoreWriter>, Error> {
let patch = Patches::get(self, id)?
.ok_or_else(move || Error::NotFound(super::TYPENAME.clone(), *id))?;
@@ -274,14 +280,14 @@ where
}
}
-impl<'a, R> Cache<super::Patches<'a, R>, cache::NoCache>
+impl<'a, 'b, Repo, Signer> Cache<'a, Repo, WriteAs<'b, Signer>, cache::NoCache>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
/// Get a `Cache` that does no write-through modifications and
/// uses the [`super::Patches`] store for all reads and writes.
- pub fn no_cache(repository: &'a R) -> Result<Self, RepositoryError> {
- let store = super::Patches::open(repository)?;
+ pub fn no_cache(repository: &'a Repo, signer: &'b Signer) -> Result<Self, RepositoryError> {
+ let store = super::Patches::open(repository, WriteAs::new(signer))?;
Ok(Self {
store,
cache: cache::NoCache,
@@ -292,7 +298,7 @@ where
pub fn get_mut<'g>(
&'g mut self,
id: &ObjectId,
- ) -> Result<PatchMut<'a, 'g, R, cache::NoCache>, super::Error> {
+ ) -> Result<PatchMut<'a, 'b, 'g, Repo, Signer, cache::NoCache>, super::Error> {
let patch = self
.store
.get(id)?
@@ -307,7 +313,7 @@ where
}
}
-impl<R, C> cache::Update<Patch> for Cache<R, C>
+impl<'a, Repo, Access, C> cache::Update<Patch> for Cache<'a, Repo, Access, C>
where
C: cache::Update<Patch>,
{
@@ -324,7 +330,7 @@ where
}
}
-impl<R, C> cache::Remove<Patch> for Cache<R, C>
+impl<'a, Repo, Access, C> cache::Remove<Patch> for Cache<'a, Repo, Access, C>
where
C: cache::Remove<Patch>,
{
@@ -443,9 +449,9 @@ impl Iterator for PatchesIter<'_> {
}
}
-impl<R> Patches for Cache<R, StoreReader>
+impl<'a, Repo, Access> Patches for Cache<'a, Repo, Access, StoreReader>
where
- R: HasRepoId,
+ Repo: HasRepoId,
{
type Error = Error;
type Iter<'b>
@@ -486,9 +492,10 @@ impl Iterator for NoCacheIter<'_> {
}
}
-impl<R> Patches for Cache<super::Patches<'_, R>, cache::NoCache>
+impl<'a, Repo, Access> Patches for Cache<'a, Repo, Access, cache::NoCache>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: store::access::Access,
{
type Error = super::Error;
type Iter<'b>
@@ -535,9 +542,10 @@ where
}
}
-impl<R> Patches for Cache<R, StoreWriter>
+impl<'a, Repo, Access> Patches for Cache<'a, Repo, Access, StoreWriter>
where
- R: HasRepoId,
+ Repo: HasRepoId + cob::Store<Namespace = NodeId>,
+ Access: store::access::Access,
{
type Error = Error;
type Iter<'b>
@@ -711,6 +719,7 @@ mod tests {
use radicle_cob::ObjectId;
use crate::cob::cache::{Store, Update, Write};
+ use crate::cob::store::access::ReadOnly;
use crate::cob::thread::{Comment, Thread};
use crate::cob::{Author, Title, migrate};
use crate::patch::{
@@ -718,12 +727,14 @@ mod tests {
};
use crate::prelude::Did;
use crate::profile::env;
+ use crate::storage::HasRepoId as _;
use crate::test::arbitrary;
use crate::test::storage::MockRepository;
use super::{Cache, Patches};
- fn memory(store: MockRepository) -> Cache<MockRepository, Store<Write>> {
+ fn memory<'a>(store: &'a MockRepository) -> Cache<'a, MockRepository, ReadOnly, Store<Write>> {
+ let store = super::super::Patches::open(store, ReadOnly).unwrap();
let cache = Store::<Write>::memory()
.unwrap()
.with_migrations(migrate::ignore)
@@ -764,7 +775,7 @@ mod tests {
#[test]
fn test_is_empty() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
assert!(cache.is_empty().unwrap());
let patch = Patch::new(
@@ -792,7 +803,7 @@ mod tests {
#[test]
fn test_counts() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let n_open = arbitrary::r#gen::<u8>(0);
let n_draft = arbitrary::r#gen::<u8>(1);
let n_archived = arbitrary::r#gen::<u8>(1);
@@ -880,7 +891,7 @@ mod tests {
#[test]
fn test_get() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let ids = (0..arbitrary::r#gen::<u8>(1))
.map(|_| PatchId::from(arbitrary::oid()))
.collect::<BTreeSet<PatchId>>();
@@ -916,7 +927,7 @@ mod tests {
#[test]
fn test_find_by_revision() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let patch_id = PatchId::from(arbitrary::oid());
let revisions = (0..arbitrary::r#gen::<NonZeroU8>(1).into())
.map(|_| revision())
@@ -958,7 +969,7 @@ mod tests {
#[test]
fn test_list() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let ids = (0..arbitrary::r#gen::<u8>(1))
.map(|_| PatchId::from(arbitrary::oid()))
.collect::<BTreeSet<PatchId>>();
@@ -989,7 +1000,7 @@ mod tests {
#[test]
fn test_list_by_status() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let ids = (0..arbitrary::r#gen::<u8>(1))
.map(|_| PatchId::from(arbitrary::oid()))
.collect::<BTreeSet<PatchId>>();
@@ -1020,7 +1031,7 @@ mod tests {
#[test]
fn test_remove() {
let repo = arbitrary::r#gen::<MockRepository>(1);
- let mut cache = memory(repo);
+ let mut cache = memory(&repo);
let ids = (0..arbitrary::r#gen::<u8>(1))
.map(|_| PatchId::from(arbitrary::oid()))
.collect::<BTreeSet<PatchId>>();
diff --git a/crates/radicle/src/cob/store.rs b/crates/radicle/src/cob/store.rs
index 886530697..94c2c048d 100644
--- a/crates/radicle/src/cob/store.rs
+++ b/crates/radicle/src/cob/store.rs
@@ -11,12 +11,14 @@ use serde::{Deserialize, Serialize};
use crate::cob::op::Op;
use crate::cob::{Create, Embed, EntryId, ObjectId, TypeName, Update, Updated, Uri, Version};
use crate::git;
-use crate::node::device::Device;
use crate::prelude::*;
-use crate::storage::SignRepository;
use crate::storage::git as storage;
+use crate::storage::{HasRepoId, SignRepository};
use crate::{cob, identity};
+pub mod access;
+use access::WriteAs;
+
pub trait CobAction {
/// Parent objects this action depends on. For example, patch revisions
/// have the commit objects as their parent.
@@ -135,94 +137,147 @@ pub enum Error {
ClashingIdentifiers(String, String),
}
-/// Storage for collaborative objects of a specific type `T` in a single repository.
-pub struct Store<'a, T, R> {
- identity: Option<git::Oid>,
- repo: &'a R,
+/// The [`Scope`] of a [`Store`] keeps track of what collaborative object is
+/// being accessed.
+///
+/// For example, a `Scope<Patch>` keeps track of `Patch` access.
+///
+/// The type parameter `T` is the collaborative object type.
+pub struct Scope<'a, T> {
witness: PhantomData<T>,
type_name: &'a TypeName,
}
-impl<T, R> AsRef<R> for Store<'_, T, R> {
- fn as_ref(&self) -> &R {
+impl<'a, T: CobWithType> Scope<'a, T> {
+ fn new() -> Self {
+ Self {
+ witness: PhantomData,
+ type_name: T::type_name(),
+ }
+ }
+}
+
+/// Storage for collaborative objects of a specific type `T` in a single repository.
+pub struct Store<'a, T, Repo, Access> {
+ identity: Option<git::Oid>,
+ repo: &'a Repo,
+ scope: Scope<'a, T>,
+ access: Access,
+}
+
+impl<T, Repo, Access> HasRepoId for Store<'_, T, Repo, Access>
+where
+ Repo: HasRepoId,
+{
+ fn rid(&self) -> RepoId {
+ self.repo.rid()
+ }
+}
+
+impl<T, Repo, Access> AsRef<Repo> for Store<'_, T, Repo, Access> {
+ fn as_ref(&self) -> &Repo {
self.repo
}
}
-impl<'a, T, R> Store<'a, T, R>
+impl<'a, T, Repo, Access> Store<'a, T, Repo, Access>
where
- R: ReadRepository + cob::Store,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: access::Access,
{
- /// Open a new generic store.
- pub fn open_for(type_name: &'a TypeName, repo: &'a R) -> Result<Self, Error> {
+ pub fn open_for(
+ type_name: &'a TypeName,
+ repo: &'a Repo,
+ access: Access,
+ ) -> Result<Self, Error> {
Ok(Self {
repo,
identity: None,
- witness: PhantomData,
- type_name,
+ scope: Scope {
+ witness: PhantomData,
+ type_name,
+ },
+ access,
})
}
+}
+impl<'a, T, Repo, Access> Store<'a, T, Repo, Access>
+where
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: access::Access,
+{
/// Return a new store with the attached identity.
pub fn identity(self, identity: git::Oid) -> Self {
Self {
repo: self.repo,
- witness: self.witness,
identity: Some(identity),
- type_name: self.type_name,
+ scope: self.scope,
+ access: self.access,
}
}
}
-impl<'a, T, R> Store<'a, T, R>
+impl<'a, T, Repo, Access> Store<'a, T, Repo, Access>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
T: CobWithType,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: access::Access,
{
/// Open a new generic store.
- pub fn open(repo: &'a R) -> Result<Self, Error> {
+ pub fn open(repo: &'a Repo, access: Access) -> Result<Self, Error> {
Ok(Self {
repo,
identity: None,
- witness: PhantomData,
- type_name: T::type_name(),
+ scope: Scope::new(),
+ access,
})
}
}
-impl<T, R> Store<'_, T, R>
+impl<'a, 'b, T, Repo, Signer> Store<'a, T, Repo, WriteAs<'b, Signer>>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
- T: Cob + cob::Evaluate<R>,
+ T: Cob + cob::Evaluate<Repo>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
+ #[deprecated(note = "only exists to accommodate signatures crate::cob::identity")]
+ pub(super) fn signer(&self) -> &Signer {
+ self.access.signer
+ }
+
+ #[deprecated(note = "only exists to accommodate signatures crate::cob::identity")]
+ pub(super) fn repo(&self) -> &Repo {
+ self.repo
+ }
+
pub fn transaction(
&self,
actions: Vec<T::Action>,
embeds: Vec<Embed<Uri>>,
- ) -> Transaction<T, R> {
- Transaction::new(self.type_name.clone(), actions, embeds)
+ ) -> Transaction<T, Repo> {
+ Transaction::new(self.scope.type_name.clone(), actions, embeds)
}
}
-impl<T, R> Store<'_, T, R>
+impl<'a, 'b, T, Repo, Signer> Store<'a, T, Repo, WriteAs<'b, Signer>>
where
- R: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
- T: Cob + cob::Evaluate<R>,
+ T: Cob + cob::Evaluate<Repo>,
T::Action: Serialize,
+ Repo: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
/// Update an object.
- pub fn update<G>(
- &self,
+ pub fn update(
+ &mut self,
type_name: &TypeName,
object_id: ObjectId,
message: &str,
actions: impl Into<NonEmpty<T::Action>>,
embeds: Vec<Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<Updated<T>, Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
+ ) -> Result<Updated<T>, Error> {
let actions = actions.into();
let related = actions.iter().flat_map(T::Action::parents).collect();
let changes = actions.try_map(encoding::encode)?;
@@ -235,12 +290,13 @@ where
})
})
.collect::<Result<_, _>>()?;
+ let namespace = self.access.signer.verifying_key();
let updated = cob::update(
self.repo,
- signer,
+ self.access.signer,
self.identity,
related,
- signer.public_key(),
+ &namespace,
Update {
object_id,
type_name: type_name.clone(),
@@ -250,23 +306,19 @@ where
},
)?;
self.repo
- .sign_refs(signer)
+ .sign_refs(self.access.signer)
.map_err(|e| Error::SignRefs(Box::new(e)))?;
Ok(updated)
}
/// Create an object.
- pub fn create<G>(
- &self,
+ pub fn create(
+ &mut self,
message: &str,
actions: impl Into<NonEmpty<T::Action>>,
embeds: Vec<Embed<Uri>>,
- signer: &Device<G>,
- ) -> Result<(ObjectId, T), Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
+ ) -> Result<(ObjectId, T), Error> {
let actions = actions.into();
let parents = actions.iter().flat_map(T::Action::parents).collect();
let contents = actions.try_map(encoding::encode)?;
@@ -279,14 +331,15 @@ where
})
})
.collect::<Result<_, _>>()?;
+ let namespace = self.access.signer.verifying_key();
let cob = cob::create::<T, _, _>(
self.repo,
- signer,
+ self.access.signer,
self.identity,
parents,
- signer.public_key(),
+ &namespace,
Create {
- type_name: self.type_name.clone(),
+ type_name: self.scope.type_name.clone(),
version: Version::default(),
message: message.to_owned(),
embeds,
@@ -296,28 +349,23 @@ where
// Nb. We can't sign our refs before the identity refs exist, which are created after
// the identity COB is created. Therefore we manually sign refs when creating identity
// COBs.
- if self.type_name != &*crate::cob::identity::TYPENAME {
+ if self.scope.type_name != &*crate::cob::identity::TYPENAME {
self.repo
- .sign_refs(signer)
+ .sign_refs(self.access.signer)
.map_err(|e| Error::SignRefs(Box::new(e)))?;
}
Ok((*cob.id(), cob.object))
}
/// Remove an object.
- pub fn remove<G>(&self, id: &ObjectId, signer: &Device<G>) -> Result<(), Error>
- where
- G: crypto::signature::Signer<crypto::Signature>,
- {
- let name = git::refs::storage::cob(signer.public_key(), self.type_name, id);
- match self
- .repo
- .reference_oid(signer.public_key(), &name.strip_namespace())
- {
+ pub fn remove(&mut self, id: &ObjectId) -> Result<(), Error> {
+ let namespace = self.access.signer.verifying_key();
+ let name = git::refs::storage::cob(&namespace, self.scope.type_name, id);
+ match self.repo.reference_oid(&namespace, &name.strip_namespace()) {
Ok(_) => {
- cob::remove(self.repo, signer.public_key(), self.type_name, id)?;
+ cob::remove(self.repo, &namespace, self.scope.type_name, id)?;
self.repo
- .sign_refs(signer)
+ .sign_refs(self.access.signer)
.map_err(|e| Error::SignRefs(Box::new(e)))?;
Ok(())
}
@@ -330,15 +378,16 @@ where
}
}
-impl<'a, T, R> Store<'a, T, R>
+impl<'a, T, Repo, Access> Store<'a, T, Repo, Access>
where
- R: ReadRepository + cob::Store,
- T: Cob + cob::Evaluate<R> + 'a,
+ T: Cob + cob::Evaluate<Repo> + 'a,
T::Action: Serialize,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
+ Access: access::Access,
{
/// Get an object.
pub fn get(&self, id: &ObjectId) -> Result<Option<T>, Error> {
- cob::get::<T, _>(self.repo, self.type_name, id)
+ cob::get::<T, _>(self.repo, self.scope.type_name, id)
.map(|r| r.map(|cob| cob.object))
.map_err(Error::from)
}
@@ -346,9 +395,11 @@ where
/// Return all objects.
pub fn all(
&self,
- ) -> Result<impl ExactSizeIterator<Item = Result<(ObjectId, T), Error>> + use<'a, T, R>, Error>
- {
- let raw = cob::list::<T, _>(self.repo, self.type_name)?;
+ ) -> Result<
+ impl ExactSizeIterator<Item = Result<(ObjectId, T), Error>> + use<'a, T, Repo, Access>,
+ Error,
+ > {
+ let raw = cob::list::<T, _>(self.repo, self.scope.type_name)?;
Ok(raw.into_iter().map(|o| Ok((*o.id(), o.object))))
}
@@ -360,7 +411,7 @@ where
/// Return objects count.
pub fn count(&self) -> Result<usize, Error> {
- let raw = cob::list::<T, _>(self.repo, self.type_name)?;
+ let raw = cob::list::<T, _>(self.repo, self.scope.type_name)?;
Ok(raw.len())
}
@@ -408,26 +459,33 @@ where
type_name,
}
}
+
+ #[deprecated(note = "only exists to accommodate signatures crate::cob::identity")]
+ pub(super) fn into_inner(self) -> (Vec<T::Action>, Vec<Embed<Uri>>) {
+ (self.actions, self.embeds)
+ }
}
-impl<T, R> Transaction<T, R>
+impl<T, Repo> Transaction<T, Repo>
where
- T: Cob + CobWithType + cob::Evaluate<R>,
+ T: Cob + CobWithType + cob::Evaluate<Repo>,
{
/// Create a new transaction to be used as the initial set of operations for a COB.
- pub fn initial<G, F, Tx>(
+ pub fn initial<'a, 'b, Signer, Tx, F>(
message: &str,
- store: &mut Store<T, R>,
- signer: &Device<G>,
+ store: &mut Store<'a, T, Repo, WriteAs<'b, Signer>>,
operations: F,
) -> Result<(ObjectId, T), Error>
where
+ T::Action: Serialize + Clone,
+ Repo: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
Tx: From<Self>,
Self: From<Tx>,
- G: crypto::signature::Signer<crypto::Signature>,
- F: FnOnce(&mut Tx, &R) -> Result<(), Error>,
- R: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
- T::Action: Serialize + Clone,
+ F: FnOnce(&mut Tx, &Repo) -> Result<(), Error>,
{
let mut tx = Tx::from(Transaction::default());
operations(&mut tx, store.as_ref())?;
@@ -436,13 +494,13 @@ where
let actions = NonEmpty::from_vec(tx.actions)
.expect("Transaction::initial: transaction must contain at least one action");
- store.create(message, actions, tx.embeds, signer)
+ store.create(message, actions, tx.embeds)
}
}
-impl<T, R> Transaction<T, R>
+impl<T, Repo> Transaction<T, Repo>
where
- T: Cob + cob::Evaluate<R>,
+ T: Cob + cob::Evaluate<Repo>,
{
/// Add an action to this transaction.
pub fn push(&mut self, action: T::Action) -> Result<(), Error> {
@@ -482,25 +540,28 @@ where
/// Commit transaction.
///
/// Returns an operation that can be applied onto an in-memory state.
- pub fn commit<G>(
+ pub fn commit<'a, Signer>(
self,
msg: &str,
id: ObjectId,
- store: &mut Store<T, R>,
- signer: &Device<G>,
+ store: &mut Store<T, Repo, WriteAs<'a, Signer>>,
) -> Result<(T, EntryId), Error>
where
- R: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
T::Action: Serialize + Clone,
- G: crypto::signature::Signer<crypto::Signature>,
+ Repo: ReadRepository + SignRepository + cob::Store<Namespace = NodeId>,
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Signer<crypto::ssh::ExtendedSignature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
{
let actions = NonEmpty::from_vec(self.actions)
.expect("Transaction::commit: transaction must not be empty");
+
let Updated {
head,
object: CollaborativeObject { object, .. },
..
- } = store.update(&self.type_name, id, msg, actions, self.embeds, signer)?;
+ } = store.update(&self.type_name, id, msg, actions, self.embeds)?;
Ok((object, head))
}
diff --git a/crates/radicle/src/cob/store/access.rs b/crates/radicle/src/cob/store/access.rs
new file mode 100644
index 000000000..2b70b0631
--- /dev/null
+++ b/crates/radicle/src/cob/store/access.rs
@@ -0,0 +1,37 @@
+//! Stores carry [`Access`] to indicate allowed access modes. In particular
+//! whether writes to the store are allowed.
+
+pub use seal::Access;
+
+/// [`ReadOnly`] is used for read-only [`Access].
+pub struct ReadOnly;
+
+/// [`WriteAs`] is used for write [`Access`].
+pub struct WriteAs<'a, Signer> {
+ pub(super) signer: &'a Signer,
+}
+
+impl<'a, Signer> WriteAs<'a, Signer> {
+ pub fn new(signer: &'a Signer) -> Self {
+ Self { signer }
+ }
+}
+
+// See <https://predr.ag/blog/definitive-guide-to-sealed-traits-in-rust/#sealing-traits-via-method-signatures>.
+#[allow(private_interfaces)]
+mod seal {
+ enum Seal {}
+
+ /// Marker trait for COB store access modes.
+ pub trait Access {
+ fn seal(&self, _: Seal);
+ }
+
+ impl Access for super::ReadOnly {
+ fn seal(&self, _: Seal) {}
+ }
+
+ impl<Signer> Access for super::WriteAs<'_, Signer> {
+ fn seal(&self, _: Seal) {}
+ }
+}
diff --git a/crates/radicle/src/node/device.rs b/crates/radicle/src/node/device.rs
index 3e2556aea..8daab7c43 100644
--- a/crates/radicle/src/node/device.rs
+++ b/crates/radicle/src/node/device.rs
@@ -204,3 +204,12 @@ impl AsRef<crypto::PublicKey> for BoxedDevice {
impl KeypairRef for BoxedDevice {
type VerifyingKey = crypto::PublicKey;
}
+
+impl Verifier<Signature> for BoxedDevice {
+ fn verify(&self, msg: &[u8], signature: &Signature) -> Result<(), crypto::signature::Error> {
+ self.0
+ .node
+ .verify(msg, signature)
+ .map_err(crypto::signature::Error::from_source)
+ }
+}
diff --git a/crates/radicle/src/profile.rs b/crates/radicle/src/profile.rs
index 09cbd045e..bf029b1dc 100644
--- a/crates/radicle/src/profile.rs
+++ b/crates/radicle/src/profile.rs
@@ -22,6 +22,7 @@ use localtime::LocalTime;
use thiserror::Error;
use crate::cob::migrate;
+use crate::cob::store::access::{ReadOnly, WriteAs};
use crate::crypto::PublicKey;
use crate::crypto::ssh::agent::Agent;
use crate::crypto::ssh::{Keystore, Passphrase, keystore};
@@ -757,15 +758,16 @@ impl Home {
}
/// Return a read-only handle for the issues cache.
- pub fn issues<'a, R>(
+ pub fn issues<'a, Repo>(
&self,
- repository: &'a R,
- ) -> Result<cob::issue::Cache<cob::issue::Issues<'a, R>, cob::cache::StoreReader>, Error>
+ repository: &'a Repo,
+ ) -> Result<cob::issue::Cache<'a, Repo, ReadOnly, cob::cache::StoreReader>, Error>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
let db = self.cobs_db()?;
- let store = cob::issue::Issues::open(repository)?;
+
+ let store = cob::issue::Issues::open(repository, ReadOnly)?;
db.check_version()?;
@@ -773,15 +775,16 @@ impl Home {
}
/// Return a read-write handle for the issues cache.
- pub fn issues_mut<'a, R>(
+ pub fn issues_mut<'a, 'b, Repo, Signer>(
&self,
- repository: &'a R,
- ) -> Result<cob::issue::Cache<cob::issue::Issues<'a, R>, cob::cache::StoreWriter>, Error>
+ repository: &'a Repo,
+ signer: &'b Signer,
+ ) -> Result<cob::issue::Cache<'a, Repo, WriteAs<'b, Signer>, cob::cache::StoreWriter>, Error>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
let db = self.cobs_db_mut()?;
- let store = cob::issue::Issues::open(repository)?;
+ let store = cob::issue::Issues::open(repository, WriteAs::new(signer))?;
db.check_version()?;
@@ -789,15 +792,15 @@ impl Home {
}
/// Return a read-only handle for the patches cache.
- pub fn patches<'a, R>(
+ pub fn patches<'a, Repo>(
&self,
- repository: &'a R,
- ) -> Result<cob::patch::Cache<cob::patch::Patches<'a, R>, cob::cache::StoreReader>, Error>
+ repository: &'a Repo,
+ ) -> Result<cob::patch::Cache<'a, Repo, ReadOnly, cob::cache::StoreReader>, Error>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
let db = self.cobs_db()?;
- let store = cob::patch::Patches::open(repository)?;
+ let store = cob::patch::Patches::open(repository, ReadOnly)?;
db.check_version()?;
@@ -805,15 +808,16 @@ impl Home {
}
/// Return a read-write handle for the patches cache.
- pub fn patches_mut<'a, R>(
+ pub fn patches_mut<'a, 'b, Repo, Signer>(
&self,
- repository: &'a R,
- ) -> Result<cob::patch::Cache<cob::patch::Patches<'a, R>, cob::cache::StoreWriter>, Error>
+ repository: &'a Repo,
+ signer: &'b Signer,
+ ) -> Result<cob::patch::Cache<'a, Repo, WriteAs<'b, Signer>, cob::cache::StoreWriter>, Error>
where
- R: ReadRepository + cob::Store<Namespace = NodeId>,
+ Repo: ReadRepository + cob::Store<Namespace = NodeId>,
{
let db = self.cobs_db_mut()?;
- let store = cob::patch::Patches::open(repository)?;
+ let store = cob::patch::Patches::open(repository, WriteAs::new(signer))?;
db.check_version()?;
diff --git a/crates/radicle/src/rad.rs b/crates/radicle/src/rad.rs
index eb5f65ba9..7791b66e7 100644
--- a/crates/radicle/src/rad.rs
+++ b/crates/radicle/src/rad.rs
@@ -76,6 +76,7 @@ where
)
})?;
let doc = identity::Doc::initial(proj, delegate, visibility);
+
let (project, identity) = Repository::init(&doc, &storage, signer)?;
let url = git::Url::from(project.id);
diff --git a/crates/radicle/src/storage.rs b/crates/radicle/src/storage.rs
index 5156d594a..61cefda9e 100644
--- a/crates/radicle/src/storage.rs
+++ b/crates/radicle/src/storage.rs
@@ -24,7 +24,6 @@ use crate::identity::{Did, PayloadError, doc};
use crate::identity::{Doc, DocAt, DocError};
use crate::identity::{Identity, RepoId};
use crate::node::SyncedAt;
-use crate::node::device::Device;
use crate::storage::git::NAMESPACES_GLOB;
use crate::storage::refs::{FeatureLevel, Refs, SignedRefs};
@@ -697,16 +696,20 @@ pub trait WriteRepository: ReadRepository + SignRepository {
/// Allows signing refs.
pub trait SignRepository {
/// Sign the repository's refs under the `refs/rad/sigrefs` branch.
- fn sign_refs<G>(&self, signer: &Device<G>) -> Result<SignedRefs, RepositoryError>
+ fn sign_refs<Signer>(&self, signer: &Signer) -> Result<SignedRefs, RepositoryError>
where
- G: crypto::signature::Signer<crypto::Signature>;
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>;
/// Sign the repository's refs under the `refs/rad/sigrefs` branch, even if unchanged.
///
/// Most users will prefer [`Self::sign_refs`].
- fn force_sign_refs<G>(&self, signer: &Device<G>) -> Result<SignedRefs, RepositoryError>
+ fn force_sign_refs<Signer>(&self, signer: &Signer) -> Result<SignedRefs, RepositoryError>
where
- G: crypto::signature::Signer<crypto::Signature>;
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>;
}
impl<T, S> ReadStorage for T
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index 0286cceb7..7d00c044f 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -1004,43 +1004,52 @@ impl WriteRepository for Repository {
}
impl SignRepository for Repository {
- fn sign_refs<G: crypto::signature::Signer<crypto::Signature>>(
- &self,
- signer: &Device<G>,
- ) -> Result<SignedRefs, RepositoryError> {
+ fn sign_refs<Signer>(&self, signer: &Signer) -> Result<SignedRefs, RepositoryError>
+ where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+ {
self.sign_refs_with(signer, false)
}
- fn force_sign_refs<G: crypto::signature::Signer<crypto::Signature>>(
- &self,
- signer: &Device<G>,
- ) -> Result<SignedRefs, RepositoryError> {
+ fn force_sign_refs<Signer>(&self, signer: &Signer) -> Result<SignedRefs, RepositoryError>
+ where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+ {
self.sign_refs_with(signer, true)
}
}
impl Repository {
- fn sign_refs_with<G: crypto::signature::Signer<crypto::Signature>>(
+ fn sign_refs_with<Signer>(
&self,
- signer: &Device<G>,
+ signer: &Signer,
force: bool,
- ) -> Result<SignedRefs, RepositoryError> {
- let remote = signer.public_key();
+ ) -> Result<SignedRefs, RepositoryError>
+ where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+ {
+ let remote = signer.verifying_key();
// Ensure the root reference is set, which is checked during sigref verification.
if self
- .reference_oid(remote, &git::refs::storage::IDENTITY_ROOT)
+ .reference_oid(&remote, &git::refs::storage::IDENTITY_ROOT)
.is_err()
{
- self.set_remote_identity_root(remote)?;
+ self.set_remote_identity_root(&remote)?;
}
- let committer = refs::sigrefs::git::Committer::from_env_or_now(remote);
+ let committer = refs::sigrefs::git::Committer::from_env_or_now(&remote);
- let refs = self.references_of(remote)?;
+ let refs = self.references_of(&remote)?;
let signed = if force {
- refs.force_save(*remote, committer, self, signer)?
+ refs.force_save(remote, committer, self, signer)?
} else {
- refs.save(*remote, committer, self, signer)?
+ refs.save(remote, committer, self, signer)?
};
Ok(signed)
diff --git a/crates/radicle/src/storage/git/cob.rs b/crates/radicle/src/storage/git/cob.rs
index 5c6a8b0f5..17545f509 100644
--- a/crates/radicle/src/storage/git/cob.rs
+++ b/crates/radicle/src/storage/git/cob.rs
@@ -17,7 +17,6 @@ use crate::git::*;
use crate::identity;
use crate::identity::doc::DocError;
use crate::node::NodeId;
-use crate::node::device::Device;
use crate::storage;
use crate::storage::Error;
use crate::storage::{
@@ -232,25 +231,35 @@ impl<R: storage::WriteRepository> change::Storage for DraftStore<'_, R> {
}
}
-impl<R> SignRepository for DraftStore<'_, R>
+impl<Repo> SignRepository for DraftStore<'_, Repo>
where
- R: storage::ReadRepository,
+ Repo: storage::ReadRepository,
{
- fn sign_refs<G: crypto::signature::Signer<crypto::Signature>>(
+ fn sign_refs<Signer>(
&self,
- signer: &Device<G>,
- ) -> Result<storage::refs::SignedRefs, RepositoryError> {
+ signer: &Signer,
+ ) -> Result<storage::refs::SignedRefs, RepositoryError>
+ where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+ {
// Since this is a draft store, we do not actually want to sign the refs.
// Instead, we just return the existing signed refs.
- let remote = self.repo.remote(signer.public_key())?;
+ let remote = self.repo.remote(&signer.verifying_key())?;
Ok(remote.refs)
}
- fn force_sign_refs<G: crypto::signature::Signer<crypto::Signature>>(
+ fn force_sign_refs<Signer>(
&self,
- signer: &Device<G>,
- ) -> Result<storage::refs::SignedRefs, RepositoryError> {
+ signer: &Signer,
+ ) -> Result<storage::refs::SignedRefs, RepositoryError>
+ where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+ {
self.sign_refs(signer)
}
}
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index ee98c9777..c7b6b3e91 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -499,6 +499,7 @@ mod tests {
use super::*;
use crate::assert_matches;
+
use crate::node::device::Device;
use crate::storage::WriteRepository as _;
use crate::{Storage, cob::Title, cob::identity::Identity, rad, test::fixtures};
@@ -574,14 +575,14 @@ mod tests {
})
.unwrap();
- let mut paris_ident = Identity::load_mut(&paris).unwrap();
- let mut london_ident = Identity::load_mut(&london).unwrap();
+ let mut paris_ident = Identity::load_mut(&paris, &alice).unwrap();
+ let mut london_ident = Identity::load_mut(&london, &alice).unwrap();
paris_ident
- .update(Title::new("Add Bob").unwrap(), "", &paris_doc, &alice)
+ .update(Title::new("Add Bob").unwrap(), "", &paris_doc)
.unwrap();
london_ident
- .update(Title::new("Add Bob").unwrap(), "", &london_doc, &alice)
+ .update(Title::new("Add Bob").unwrap(), "", &london_doc)
.unwrap();
}
diff --git a/crates/radicle/src/test/storage.rs b/crates/radicle/src/test/storage.rs
index 4175a67d9..f1b1ae21c 100644
--- a/crates/radicle/src/test/storage.rs
+++ b/crates/radicle/src/test/storage.rs
@@ -11,7 +11,6 @@ use crate::git::fmt;
use crate::identity::doc::{Doc, DocAt, DocError, RawDoc, RepoId};
use crate::node::NodeId;
-use crate::node::device::Device;
pub use crate::storage::*;
@@ -367,17 +366,23 @@ impl WriteRepository for MockRepository {
}
impl SignRepository for MockRepository {
- fn sign_refs<G: crypto::signature::Signer<crypto::Signature>>(
+ fn sign_refs<Signer>(
&self,
- _signer: &Device<G>,
- ) -> Result<crate::storage::refs::SignedRefs, RepositoryError> {
+ _signer: &Signer,
+ ) -> Result<crate::storage::refs::SignedRefs, RepositoryError>
+ where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ {
todo!()
}
- fn force_sign_refs<G: crypto::signature::Signer<crypto::Signature>>(
- &self,
- _signer: &Device<G>,
- ) -> Result<crate::storage::refs::SignedRefs, RepositoryError> {
+ fn force_sign_refs<Signer>(&self, _signer: &Signer) -> Result<refs::SignedRefs, RepositoryError>
+ where
+ Signer: crypto::signature::Keypair<VerifyingKey = crypto::PublicKey>,
+ Signer: crypto::signature::Signer<crypto::Signature>,
+ Signer: crypto::signature::Verifier<crypto::Signature>,
+ {
todo!()
}
}
Exit code: 0
shell: 'export RUSTDOCFLAGS=''-D warnings'' cargo --version rustc --version cargo fmt --check cargo clippy --all-targets --workspace -- --deny warnings cargo build --all-targets --workspace cargo doc --workspace --no-deps --all-features cargo test --workspace --no-fail-fast '
Commands:
$ podman run --name 3e1032cf-5e98-48bc-acf4-99193d66ae06 -v /opt/radcis/ci.rad.levitte.org/cci/state/3e1032cf-5e98-48bc-acf4-99193d66ae06/s:/3e1032cf-5e98-48bc-acf4-99193d66ae06/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/3e1032cf-5e98-48bc-acf4-99193d66ae06/w:/3e1032cf-5e98-48bc-acf4-99193d66ae06/w -w /3e1032cf-5e98-48bc-acf4-99193d66ae06/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:trixie bash /3e1032cf-5e98-48bc-acf4-99193d66ae06/s/script.sh
+ export 'RUSTDOCFLAGS=-D warnings'
+ RUSTDOCFLAGS='-D warnings'
+ cargo --version
info: syncing channel updates for '1.90-x86_64-unknown-linux-gnu'
info: latest update on 2025-09-18, rust version 1.90.0 (1159e78c4 2025-09-14)
info: downloading component 'cargo'
info: downloading component 'clippy'
info: downloading component 'rust-docs'
info: downloading component 'rust-src'
info: downloading component 'rust-std'
info: downloading component 'rustc'
info: downloading component 'rustfmt'
info: installing component 'cargo'
info: installing component 'clippy'
info: installing component 'rust-docs'
info: installing component 'rust-src'
info: installing component 'rust-std'
info: installing component 'rustc'
info: installing component 'rustfmt'
cargo 1.90.0 (840b83a10 2025-07-30)
+ rustc --version
rustc 1.90.0 (1159e78c4 2025-09-14)
+ cargo fmt --check
+ cargo clippy --all-targets --workspace -- --deny warnings
Updating crates.io index
Downloading crates ...
Downloaded bit-set v0.8.0
Downloaded document-features v0.2.11
Downloaded cipher v0.4.4
Downloaded getrandom v0.2.15
Downloaded keccak v0.1.6
Downloaded ff v0.13.0
Downloaded aes v0.8.4
Downloaded data-encoding-macro-internal v0.1.12
Downloaded ecdsa v0.16.9
Downloaded amplify_syn v2.0.1
Downloaded crossbeam-channel v0.5.15
Downloaded filetime v0.2.23
Downloaded icu_locid_transform v1.5.0
Downloaded lazy_static v1.5.0
Downloaded inout v0.1.3
Downloaded icu_normalizer_data v1.5.1
Downloaded idna_adapter v1.2.0
Downloaded ghash v0.5.1
Downloaded gix-lock v21.0.1
Downloaded lexopt v0.3.0
Downloaded gix-refspec v0.37.0
Downloaded gix-config-value v0.17.1
Downloaded errno v0.3.13
Downloaded gix-features v0.46.1
Downloaded matchers v0.2.0
Downloaded num v0.4.3
Downloaded normalize-line-endings v0.3.0
Downloaded litemap v0.7.5
Downloaded itoa v1.0.17
Downloaded num-cmp v0.1.0
Downloaded outref v0.5.2
Downloaded opaque-debug v0.3.1
Downloaded gix-protocol v0.57.0
Downloaded percent-encoding v2.3.1
Downloaded maybe-async v0.2.10
Downloaded pbkdf2 v0.12.2
Downloaded gix-revision v0.41.0
Downloaded qcheck-macros v1.0.0
Downloaded qcheck v1.0.0
Downloaded pin-project-lite v0.2.16
Downloaded ref-cast v1.0.24
Downloaded scrypt v0.11.0
Downloaded phf v0.11.3
Downloaded serde_spanned v1.0.4
Downloaded sha1 v0.10.6
Downloaded indicatif v0.18.0
Downloaded polyval v0.6.2
Downloaded snapbox-macros v0.3.8
Downloaded signal-hook-mio v0.2.4
Downloaded rustc-demangle v0.1.26
Downloaded ppv-lite86 v0.2.17
Downloaded ssh-encoding v0.2.0
Downloaded siphasher v1.0.1
Downloaded ssh-cipher v0.2.0
Downloaded strsim v0.11.1
Downloaded sval_json v2.14.1
Downloaded stable_deref_trait v1.2.0
Downloaded signal-hook-registry v1.4.5
Downloaded flate2 v1.1.1
Downloaded sval_serde v2.14.1
Downloaded test-log-macros v0.2.19
Downloaded spki v0.7.3
Downloaded schemars_derive v1.0.4
Downloaded rusty-fork v0.3.1
Downloaded tinyvec_macros v0.1.1
Downloaded primeorder v0.13.6
Downloaded pkcs1 v0.7.5
Downloaded tree-sitter-json v0.24.8
Downloaded tree-sitter-language v0.1.2
Downloaded serde_derive v1.0.228
Downloaded unarray v0.1.4
Downloaded typeid v1.0.3
Downloaded unit-prefix v0.5.1
Downloaded utf8_iter v1.0.4
Downloaded similar v2.5.0
Downloaded write16 v1.0.0
Downloaded wait-timeout v0.2.1
Downloaded value-bag-serde1 v1.11.1
Downloaded emojis v0.6.4
Downloaded yoke-derive v0.7.5
Downloaded proc-macro2 v1.0.101
Downloaded zerofrom v0.1.6
Downloaded pretty_assertions v1.4.0
Downloaded vsimd v0.8.0
Downloaded writeable v0.5.5
Downloaded yoke v0.7.5
Downloaded zeroize v1.7.0
Downloaded zerofrom-derive v0.1.6
Downloaded inquire v0.7.5
Downloaded value-bag v1.11.1
Downloaded p521 v0.13.3
Downloaded zerovec-derive v0.10.3
Downloaded url v2.5.4
Downloaded prodash v31.0.0
Downloaded uuid v1.20.0
Downloaded hashbrown v0.16.1
Downloaded tree-sitter-go v0.23.4
Downloaded chrono v0.4.38
Downloaded unicode-segmentation v1.11.0
Downloaded serde_json v1.0.140
Downloaded zerovec v0.10.4
Downloaded ssh-key v0.6.6
Downloaded portable-atomic v1.11.0
Downloaded unicode-normalization v0.1.23
Downloaded bstr v1.12.0
Downloaded zlib-rs v0.6.0
Downloaded zerocopy v0.7.35
Downloaded winnow v0.7.14
Downloaded unicode-width v0.2.1
Downloaded object v0.37.3
Downloaded vcpkg v0.2.15
Downloaded tree-sitter-c v0.23.2
Downloaded rustix v0.38.34
Downloaded tree-sitter-rust v0.23.2
Downloaded rustix v1.1.3
Downloaded tree-sitter-md v0.3.2
Downloaded regex-syntax v0.8.5
Downloaded regex v1.11.1
Downloaded gimli v0.32.3
Downloaded tree-sitter-ruby v0.23.1
Downloaded tree-sitter v0.24.4
Downloaded tree-sitter-bash v0.23.3
Downloaded tracing v0.1.44
Downloaded tracing-subscriber v0.3.22
Downloaded sysinfo v0.37.2
Downloaded p384 v0.13.0
Downloaded syn v2.0.106
Downloaded proptest v1.9.0
Downloaded icu_properties_data v1.5.1
Downloaded syn v1.0.109
Downloaded bloomy v1.2.0
Downloaded tree-sitter-python v0.23.4
Downloaded regex-automata v0.4.9
Downloaded radicle-surf v0.27.0
Downloaded itertools v0.14.0
Downloaded jiff v0.2.20
Downloaded tokio v1.47.1
Downloaded libc v0.2.182
Downloaded hashbrown v0.14.3
Downloaded idna v1.0.3
Downloaded sha1-checked v0.10.0
Downloaded tree-sitter-typescript v0.23.2
Downloaded rand v0.9.2
Downloaded clap_builder v4.5.44
Downloaded sha3 v0.10.8
Downloaded schemars v1.0.4
Downloaded unicode-ident v1.0.12
Downloaded typenum v1.17.0
Downloaded tracing-core v0.1.36
Downloaded toml v0.9.12+spec-1.1.0
Downloaded tar v0.4.40
Downloaded rsa v0.9.6
Downloaded mio v0.8.11
Downloaded crossterm v0.29.0
Downloaded yansi v0.5.1
Downloaded tree-sitter-css v0.23.1
Downloaded rand v0.8.5
Downloaded cyphernet v0.5.2
Downloaded walkdir v2.5.0
Downloaded uuid-simd v0.8.0
Downloaded sharded-slab v0.1.7
Downloaded num-bigint-dig v0.8.4
Downloaded tree-sitter-toml-ng v0.6.0
Downloaded tinyvec v1.6.0
Downloaded serde v1.0.228
Downloaded xattr v1.3.1
Downloaded version_check v0.9.4
Downloaded unicode-width v0.1.11
Downloaded tempfile v3.25.0
Downloaded linux-raw-sys v0.4.13
Downloaded num-bigint v0.4.6
Downloaded jiff-static v0.2.20
Downloaded fraction v0.15.3
Downloaded unicode-display-width v0.3.0
Downloaded value-bag-sval2 v1.11.1
Downloaded utf8parse v0.2.2
Downloaded utf16_iter v1.0.5
Downloaded universal-hash v0.5.1
Downloaded tree-sitter-html v0.23.2
Downloaded tinystr v0.7.6
Downloaded thiserror-impl v2.0.18
Downloaded socket2 v0.5.7
Downloaded snapbox v0.4.17
Downloaded smallvec v1.15.1
Downloaded signals_receipts v0.2.0
Downloaded poly1305 v0.8.0
Downloaded thiserror-impl v1.0.69
Downloaded signal-hook v0.3.18
Downloaded heapless v0.8.0
Downloaded tracing-log v0.2.0
Downloaded toml_writer v1.0.6+spec-1.1.0
Downloaded toml_datetime v0.7.5+spec-1.1.0
Downloaded libgit2-sys v0.18.3+1.9.2
Downloaded thread_local v1.1.9
Downloaded mio v1.0.4
Downloaded timeago v0.4.2
Downloaded thiserror v2.0.18
Downloaded thiserror v1.0.69
Downloaded systemd-journal-logger v2.2.2
Downloaded synstructure v0.13.1
Downloaded memchr v2.7.2
Downloaded indexmap v2.2.6
Downloaded icu_locid_transform_data v1.5.1
Downloaded serde_core v1.0.228
Downloaded sval_nested v2.14.1
Downloaded streaming-iterator v0.1.9
Downloaded spin v0.9.8
Downloaded crossterm v0.25.0
Downloaded tree-sitter-highlight v0.24.4
Downloaded sval_buffer v2.14.1
Downloaded sval v2.14.1
Downloaded ryu v1.0.17
Downloaded structured-logger v1.0.4
Downloaded sqlite3-sys v0.18.0
Downloaded sha2 v0.10.8
Downloaded der v0.7.9
Downloaded base64 v0.21.7
Downloaded jsonschema v0.30.0
Downloaded derive_more-impl v2.0.1
Downloaded miniz_oxide v0.8.8
Downloaded gix-transport v0.54.0
Downloaded gix-diff v0.58.0
Downloaded backtrace v0.3.76
Downloaded test-log v0.2.19
Downloaded sval_ref v2.14.1
Downloaded sval_fmt v2.14.1
Downloaded sval_dynamic v2.14.1
Downloaded sqlite v0.37.0
Downloaded socks5-client v0.4.1
Downloaded signature v2.2.0
Downloaded serde-untagged v0.1.7
Downloaded sem_safe v0.2.0
Downloaded referencing v0.30.0
Downloaded linux-raw-sys v0.11.0
Downloaded fancy-regex v0.14.0
Downloaded arc-swap v1.8.2
Downloaded aho-corasick v1.1.3
Downloaded shlex v1.3.0
Downloaded rfc6979 v0.4.0
Downloaded proc-macro-error2 v2.0.1
Downloaded subtle v2.5.0
Downloaded p256 v0.13.2
Downloaded num-traits v0.2.19
Downloaded siphasher v0.3.11
Downloaded icu_collections v1.5.0
Downloaded rand_chacha v0.9.0
Downloaded quote v1.0.41
Downloaded clap_complete v4.5.60
Downloaded chacha20poly1305 v0.10.1
Downloaded signature v1.6.4
Downloaded serde_derive_internals v0.29.1
Downloaded sec1 v0.7.3
Downloaded rustversion v1.0.20
Downloaded sqlite3-src v0.7.0
Downloaded rand_core v0.6.4
Downloaded parking_lot v0.12.5
Downloaded crypto-bigint v0.5.5
Downloaded ref-cast-impl v1.0.24
Downloaded derive_more v2.0.1
Downloaded cc v1.2.2
Downloaded shell-words v1.1.0
Downloaded icu_locid v1.5.0
Downloaded human-panic v2.0.6
Downloaded gix-ref v0.59.0
Downloaded pkg-config v0.3.30
Downloaded litrs v0.4.1
Downloaded icu_properties v1.5.1
Downloaded gix-pack v0.65.0
Downloaded clap v4.5.44
Downloaded serde_fmt v1.0.3
Downloaded rand_core v0.9.3
Downloaded radicle-std-ext v0.2.0
Downloaded pem-rfc7468 v0.7.0
Downloaded paste v1.0.15
Downloaded parking_lot_core v0.9.12
Downloaded once_cell v1.21.3
Downloaded scopeguard v1.2.0
Downloaded radicle-git-ext v0.12.0
Downloaded quick-error v1.2.3
Downloaded same-file v1.0.6
Downloaded salsa20 v0.10.2
Downloaded pkcs8 v0.10.2
Downloaded gix-traverse v0.52.0
Downloaded gix-object v0.56.0
Downloaded rand_xorshift v0.4.0
Downloaded rand_chacha v0.3.1
Downloaded proc-macro-error-attr2 v2.0.0
Downloaded memmap2 v0.9.8
Downloaded log v0.4.27
Downloaded clap_derive v4.5.41
Downloaded phf_shared v0.11.3
Downloaded libm v0.2.8
Downloaded gix-object v0.55.0
Downloaded elliptic-curve v0.13.8
Downloaded num-rational v0.4.2
Downloaded num-integer v0.1.46
Downloaded num-complex v0.4.6
Downloaded gix-error v0.0.0
Downloaded crc32fast v1.5.0
Downloaded gix-commitgraph v0.32.0
Downloaded bytes v1.11.1
Downloaded ascii v1.1.0
Downloaded anyhow v1.0.82
Downloaded nu-ansi-term v0.50.3
Downloaded gix-hash v0.22.1
Downloaded gix-error v0.1.0
Downloaded gix-credentials v0.36.0
Downloaded jobserver v0.1.31
Downloaded libz-sys v1.1.16
Downloaded hash32 v0.3.1
Downloaded group v0.13.0
Downloaded gix-revwalk v0.27.0
Downloaded anstyle v1.0.13
Downloaded amplify_derive v4.0.0
Downloaded lock_api v0.4.14
Downloaded equivalent v1.0.1
Downloaded ed25519 v1.5.3
Downloaded blowfish v0.9.1
Downloaded base64ct v1.6.0
Downloaded base64 v0.22.1
Downloaded chacha20 v0.9.1
Downloaded bit-vec v0.8.0
Downloaded base-x v0.2.11
Downloaded iana-time-zone v0.1.60
Downloaded gix-tempfile v21.0.1
Downloaded gix-revwalk v0.26.0
Downloaded either v1.11.0
Downloaded displaydoc v0.2.5
Downloaded num-iter v0.1.45
Downloaded gix-sec v0.13.1
Downloaded erased-serde v0.4.6
Downloaded env_logger v0.11.8
Downloaded ec25519 v0.1.0
Downloaded heck v0.5.0
Downloaded gix-negotiate v0.27.0
Downloaded gix-actor v0.38.0
Downloaded email_address v0.2.9
Downloaded nonempty v0.9.0
Downloaded noise-framework v0.4.0
Downloaded newline-converter v0.3.0
Downloaded multibase v0.9.1
Downloaded fxhash v0.2.1
Downloaded fnv v1.0.7
Downloaded is_terminal_polyfill v1.70.2
Downloaded gix-prompt v0.13.1
Downloaded gix-glob v0.24.0
Downloaded git2 v0.20.4
Downloaded data-encoding-macro v0.1.14
Downloaded dyn-clone v1.0.17
Downloaded dunce v1.0.5
Downloaded data-encoding v2.5.0
Downloaded block-padding v0.3.3
Downloaded cypheraddr v0.4.0
Downloaded convert_case v0.7.1
Downloaded cfg-if v1.0.0
Downloaded base32 v0.4.0
Downloaded git-ref-format-macro v0.6.0
Downloaded fastrand v2.3.0
Downloaded anstyle-query v1.0.2
Downloaded gix-quote v0.6.2
Downloaded fast-glob v0.3.3
Downloaded env_filter v0.1.3
Downloaded colorchoice v1.0.0
Downloaded borrow-or-share v0.2.2
Downloaded gix-odb v0.75.0
Downloaded gix-commitgraph v0.33.0
Downloaded git-ref-format v0.6.0
Downloaded fluent-uri v0.3.2
Downloaded amplify_num v0.5.2
Downloaded gix-date v0.13.0
Downloaded escargot v0.5.10
Downloaded ct-codecs v1.1.1
Downloaded bytesize v2.0.1
Downloaded crypto-common v0.1.6
Downloaded icu_provider v1.5.0
Downloaded gix-shallow v0.8.1
Downloaded gix-packetline v0.21.1
Downloaded getrandom v0.3.3
Downloaded form_urlencoded v1.2.1
Downloaded faster-hex v0.10.0
Downloaded bitflags v2.9.1
Downloaded icu_provider_macros v1.5.0
Downloaded humantime v2.3.0
Downloaded hmac v0.12.1
Downloaded gix-path v0.11.1
Downloaded gix-fs v0.19.1
Downloaded gix-date v0.14.0
Downloaded gix-actor v0.39.0
Downloaded git-ref-format-core v0.6.0
Downloaded icu_normalizer v1.5.0
Downloaded gix-validate v0.11.0
Downloaded gix-utils v0.3.1
Downloaded gix-trace v0.1.18
Downloaded gix-command v0.7.1
Downloaded gix-chunk v0.6.0
Downloaded digest v0.10.7
Downloaded diff v0.1.13
Downloaded cyphergraphy v0.3.0
Downloaded cpufeatures v0.2.12
Downloaded amplify v4.6.0
Downloaded gix-url v0.35.1
Downloaded gix-hashtable v0.12.0
Downloaded gix-chunk v0.5.0
Downloaded crossbeam-utils v0.8.19
Downloaded colored v2.1.0
Downloaded byteorder v1.5.0
Downloaded autocfg v1.2.0
Downloaded anstream v0.6.21
Downloaded bytecount v0.6.8
Downloaded block-buffer v0.10.4
Downloaded bcrypt-pbkdf v0.10.0
Downloaded const-oid v0.9.6
Downloaded console v0.16.0
Downloaded cbc v0.1.2
Downloaded base16ct v0.2.0
Downloaded anstyle-parse v0.2.3
Downloaded ctr v0.9.2
Downloaded clap_lex v0.7.5
Downloaded bitflags v1.3.2
Downloaded generic-array v0.14.7
Downloaded aes-gcm v0.10.3
Downloaded addr2line v0.25.1
Downloaded ahash v0.8.11
Downloaded aead v0.5.2
Downloaded adler2 v2.0.0
Compiling libc v0.2.182
Compiling proc-macro2 v1.0.101
Compiling unicode-ident v1.0.12
Compiling quote v1.0.41
Checking cfg-if v1.0.0
Checking memchr v2.7.2
Compiling version_check v0.9.4
Compiling shlex v1.3.0
Compiling typenum v1.17.0
Checking regex-syntax v0.8.5
Compiling syn v2.0.106
Checking getrandom v0.2.15
Compiling jobserver v0.1.31
Compiling generic-array v0.14.7
Compiling cc v1.2.2
Checking aho-corasick v1.1.3
Checking regex-automata v0.4.9
Checking rand_core v0.6.4
Compiling serde_core v1.0.228
Checking crypto-common v0.1.6
Compiling serde v1.0.228
Checking smallvec v1.15.1
Compiling thiserror v2.0.18
Checking subtle v2.5.0
Checking stable_deref_trait v1.2.0
Checking cpufeatures v0.2.12
Checking fastrand v2.3.0
Checking bstr v1.12.0
Compiling parking_lot_core v0.9.12
Checking scopeguard v1.2.0
Checking lock_api v0.4.14
Checking block-buffer v0.10.4
Checking tinyvec_macros v0.1.1
Checking parking_lot v0.12.5
Checking byteorder v1.5.0
Checking digest v0.10.7
Checking tinyvec v1.6.0
Checking gix-trace v0.1.18
Compiling crc32fast v1.5.0
Checking bitflags v2.9.1
Checking gix-validate v0.11.0
Checking itoa v1.0.17
Compiling typeid v1.0.3
Checking same-file v1.0.6
Checking walkdir v2.5.0
Checking prodash v31.0.0
Checking unicode-normalization v0.1.23
Checking zlib-rs v0.6.0
Compiling serde_derive v1.0.228
Compiling thiserror-impl v2.0.18
Checking gix-utils v0.3.1
Compiling heapless v0.8.0
Checking hash32 v0.3.1
Compiling synstructure v0.13.1
Checking faster-hex v0.10.0
Checking gix-path v0.11.1
Compiling getrandom v0.3.3
Checking gix-features v0.46.1
Compiling zerofrom-derive v0.1.6
Checking sha1 v0.10.6
Checking zeroize v1.7.0
Checking sha1-checked v0.10.0
Compiling yoke-derive v0.7.5
Compiling rustix v1.1.3
Compiling pkg-config v0.3.30
Checking zerofrom v0.1.6
Checking gix-hash v0.22.1
Checking yoke v0.7.5
Compiling zerovec-derive v0.10.3
Checking linux-raw-sys v0.11.0
Compiling displaydoc v0.2.5
Checking erased-serde v0.4.6
Checking serde_fmt v1.0.3
Checking block-padding v0.3.3
Checking value-bag-serde1 v1.11.1
Checking once_cell v1.21.3
Checking value-bag v1.11.1
Checking zerovec v0.10.4
Checking inout v0.1.3
Compiling syn v1.0.109
Checking log v0.4.27
Checking cipher v0.4.4
Checking writeable v0.5.5
Compiling icu_locid_transform_data v1.5.1
Checking litemap v0.7.5
Checking tinystr v0.7.6
Compiling icu_provider_macros v1.5.0
Checking icu_locid v1.5.0
Checking percent-encoding v2.3.1
Compiling icu_properties_data v1.5.1
Checking icu_provider v1.5.0
Compiling thiserror v1.0.69
Compiling icu_normalizer_data v1.5.1
Checking icu_locid_transform v1.5.0
Checking icu_collections v1.5.0
Compiling thiserror-impl v1.0.69
Checking equivalent v1.0.1
Compiling serde_json v1.0.140
Checking hashbrown v0.14.3
Checking icu_properties v1.5.1
Checking indexmap v2.2.6
Checking sha2 v0.10.8
Compiling vcpkg v0.2.15
Checking utf16_iter v1.0.5
Checking write16 v1.0.0
Checking utf8_iter v1.0.4
Compiling ref-cast v1.0.24
Checking ryu v1.0.17
Checking icu_normalizer v1.5.0
Compiling libz-sys v1.1.16
Checking tempfile v3.25.0
Compiling ref-cast-impl v1.0.24
Checking universal-hash v0.5.1
Checking opaque-debug v0.3.1
Checking idna_adapter v1.2.0
Compiling autocfg v1.2.0
Checking dyn-clone v1.0.17
Checking idna v1.0.3
Compiling num-traits v0.2.19
Compiling amplify_syn v2.0.1
Compiling libgit2-sys v0.18.3+1.9.2
Checking signature v1.6.4
Checking ed25519 v1.5.3
Checking form_urlencoded v1.2.1
Compiling serde_derive_internals v0.29.1
Checking aead v0.5.2
Checking amplify_num v0.5.2
Compiling amplify_derive v4.0.0
Checking ct-codecs v1.1.1
Checking ascii v1.1.0
Checking ec25519 v0.1.0
Compiling schemars_derive v1.0.4
Checking url v2.5.4
Checking amplify v4.6.0
Checking git-ref-format-core v0.6.0
Checking poly1305 v0.8.0
Checking chacha20 v0.9.1
Checking cyphergraphy v0.3.0
Checking polyval v0.6.2
Checking schemars v1.0.4
Compiling sqlite3-src v0.7.0
Checking hmac v0.12.1
Checking base64ct v1.6.0
Checking keccak v0.1.6
Checking sha3 v0.10.8
Checking pem-rfc7468 v0.7.0
Checking pbkdf2 v0.12.2
Checking ghash v0.5.1
Checking ctr v0.9.2
Checking aes v0.8.4
Checking rand v0.8.5
Checking base32 v0.4.0
Compiling data-encoding v2.5.0
Checking qcheck v1.0.0
Checking cypheraddr v0.4.0
Compiling data-encoding-macro-internal v0.1.12
Checking aes-gcm v0.10.3
Checking ssh-encoding v0.2.0
Checking chacha20poly1305 v0.10.1
Checking cbc v0.1.2
Checking blowfish v0.9.1
Checking jiff v0.2.20
Checking data-encoding-macro v0.1.14
Checking bcrypt-pbkdf v0.10.0
Checking ssh-cipher v0.2.0
Checking noise-framework v0.4.0
Checking socks5-client v0.4.1
Compiling crossbeam-utils v0.8.19
Checking signature v2.2.0
Checking base-x v0.2.11
Checking multibase v0.9.1
Checking ssh-key v0.6.6
Checking cyphernet v0.5.2
Checking radicle-ssh v0.10.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-ssh)
Checking winnow v0.7.14
Checking crossbeam-channel v0.5.15
Checking lazy_static v1.5.0
Checking hashbrown v0.16.1
Checking gix-hashtable v0.12.0
Checking nonempty v0.9.0
Checking anstyle-query v1.0.2
Checking siphasher v1.0.1
Checking radicle-git-metadata v0.2.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-git-metadata)
Checking gix-error v0.1.0
Checking radicle-dag v0.10.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-dag)
Checking memmap2 v0.9.8
Checking utf8parse v0.2.2
Checking radicle-git-ref-format v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-git-ref-format)
Checking anstyle-parse v0.2.3
Checking colorchoice v1.0.0
Checking base64 v0.21.7
Checking is_terminal_polyfill v1.70.2
Checking iana-time-zone v0.1.60
Checking anstyle v1.0.13
Checking chrono v0.4.38
Checking anstream v0.6.21
Checking colored v2.1.0
Checking radicle-localtime v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-localtime)
Checking serde-untagged v0.1.7
Checking bytesize v2.0.1
Checking gix-error v0.0.0
Checking dunce v1.0.5
Checking fast-glob v0.3.3
Checking tree-sitter-language v0.1.2
Checking gix-date v0.14.0
Checking gix-date v0.13.0
Checking gix-actor v0.39.0
Checking gix-fs v0.19.1
Checking gix-object v0.56.0
Checking gix-tempfile v21.0.1
Checking gix-actor v0.38.0
Checking gix-chunk v0.6.0
Checking mio v1.0.4
Checking gix-quote v0.6.2
Checking gix-commitgraph v0.33.0
Checking gix-object v0.55.0
Checking gix-chunk v0.5.0
Checking errno v0.3.13
Checking sem_safe v0.2.0
Checking shell-words v1.1.0
Checking either v1.11.0
Checking gix-command v0.7.1
Checking signals_receipts v0.2.0
Checking gix-commitgraph v0.32.0
Checking gix-revwalk v0.27.0
Compiling rustversion v1.0.20
Compiling object v0.37.3
Compiling signal-hook v0.3.18
Checking gix-revwalk v0.26.0
Checking gix-lock v21.0.1
Checking gix-url v0.35.1
Checking gix-config-value v0.17.1
Checking gix-sec v0.13.1
Checking signal-hook-registry v1.4.5
Compiling rustix v0.38.34
Checking adler2 v2.0.0
Checking gimli v0.32.3
Checking miniz_oxide v0.8.8
Checking gix-prompt v0.13.1
Checking gix-traverse v0.52.0
Checking addr2line v0.25.1
Checking gix-revision v0.41.0
Checking radicle-signals v0.11.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-signals)
Checking gix-diff v0.58.0
Checking mio v0.8.11
Checking gix-glob v0.24.0
Checking gix-packetline v0.21.1
Compiling tree-sitter v0.24.4
Compiling linux-raw-sys v0.4.13
Checking rustc-demangle v0.1.26
Compiling anyhow v1.0.82
Compiling unicode-segmentation v1.11.0
Compiling convert_case v0.7.1
Checking backtrace v0.3.76
Checking gix-transport v0.54.0
Checking gix-refspec v0.37.0
Checking signal-hook-mio v0.2.4
Checking gix-pack v0.65.0
Checking arc-swap v1.8.2
Checking gix-credentials v0.36.0
Checking gix-ref v0.59.0
Checking gix-shallow v0.8.1
Checking gix-negotiate v0.27.0
Compiling maybe-async v0.2.10
Checking regex v1.11.1
Compiling proc-macro-error-attr2 v2.0.0
Compiling portable-atomic v1.11.0
Compiling proc-macro-error2 v2.0.1
Checking gix-protocol v0.57.0
Checking gix-odb v0.75.0
Compiling xattr v1.3.1
Compiling derive_more-impl v2.0.1
Compiling filetime v0.2.23
Checking uuid v1.20.0
Checking bytes v1.11.1
Compiling litrs v0.4.1
Checking bitflags v1.3.2
Checking unicode-width v0.2.1
Compiling document-features v0.2.11
Checking console v0.16.0
Checking crossterm v0.25.0
Checking derive_more v2.0.1
Compiling flate2 v1.1.1
Compiling tar v0.4.40
Compiling git-ref-format-macro v0.6.0
Checking newline-converter v0.3.0
Checking snapbox-macros v0.3.8
Checking salsa20 v0.10.2
Checking fxhash v0.2.1
Checking siphasher v0.3.11
Checking similar v2.5.0
Checking unicode-width v0.1.11
Compiling heck v0.5.0
Checking strsim v0.11.1
Checking normalize-line-endings v0.3.0
Checking streaming-iterator v0.1.9
Checking clap_lex v0.7.5
Checking unit-prefix v0.5.1
Checking indicatif v0.18.0
Checking clap_builder v4.5.44
Checking snapbox v0.4.17
Compiling clap_derive v4.5.41
Checking inquire v0.7.5
Checking bloomy v1.2.0
Compiling radicle-surf v0.27.0
Checking scrypt v0.11.0
Checking git-ref-format v0.6.0
Checking crossterm v0.29.0
Checking unicode-display-width v0.3.0
Checking systemd-journal-logger v2.2.2
Checking toml_datetime v0.7.5+spec-1.1.0
Checking serde_spanned v1.0.4
Compiling tree-sitter-ruby v0.23.1
Compiling tree-sitter-html v0.23.2
Compiling tree-sitter-json v0.24.8
Compiling tree-sitter-go v0.23.4
Compiling tree-sitter-typescript v0.23.2
Compiling tree-sitter-toml-ng v0.6.0
Compiling tree-sitter-c v0.23.2
Compiling tree-sitter-md v0.3.2
Compiling tree-sitter-rust v0.23.2
Compiling tree-sitter-css v0.23.1
Checking sqlite3-sys v0.18.0
Compiling tree-sitter-bash v0.23.3
Compiling tree-sitter-python v0.23.4
Checking pin-project-lite v0.2.16
Checking sqlite v0.37.0
Checking radicle-std-ext v0.2.0
Checking toml_writer v1.0.6+spec-1.1.0
Checking radicle-crypto v0.16.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-crypto)
Checking toml v0.9.12+spec-1.1.0
Checking tokio v1.47.1
Checking clap v4.5.44
Checking sysinfo v0.37.2
Checking diff v0.1.13
Checking yansi v0.5.1
Compiling radicle-node v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-node)
Compiling radicle-cli v0.20.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cli)
Checking pretty_assertions v1.4.0
Checking human-panic v2.0.6
Checking clap_complete v4.5.60
Checking structured-logger v1.0.4
Checking radicle-systemd v0.12.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-systemd)
Checking tree-sitter-highlight v0.24.4
Checking itertools v0.14.0
Checking num-integer v0.1.46
Compiling qcheck-macros v1.0.0
Checking socket2 v0.5.7
Checking lexopt v0.3.0
Checking humantime v2.3.0
Checking timeago v0.4.2
Compiling escargot v0.5.10
Checking bit-vec v0.8.0
Checking bit-set v0.8.0
Checking num-bigint v0.4.6
Checking rand_core v0.9.3
Compiling ahash v0.8.11
Checking num-iter v0.1.45
Checking num-complex v0.4.6
Checking env_filter v0.1.3
Checking borrow-or-share v0.2.2
Checking zerocopy v0.7.35
Checking fluent-uri v0.3.2
Checking num-rational v0.4.2
Checking env_logger v0.11.8
Checking phf_shared v0.11.3
Checking num v0.4.3
Compiling test-log-macros v0.2.19
Checking wait-timeout v0.2.1
Compiling radicle-remote-helper v0.16.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-remote-helper)
Checking quick-error v1.2.3
Checking outref v0.5.2
Checking ppv-lite86 v0.2.17
Compiling paste v1.0.15
Checking vsimd v0.8.0
Checking fnv v1.0.7
Checking rusty-fork v0.3.1
Checking rand_chacha v0.9.0
Checking test-log v0.2.19
Checking phf v0.11.3
Checking fraction v0.15.3
Checking uuid-simd v0.8.0
Checking referencing v0.30.0
Checking rand_xorshift v0.4.0
Checking rand v0.9.2
Checking fancy-regex v0.14.0
Checking email_address v0.2.9
Checking bytecount v0.6.8
Checking num-cmp v0.1.0
Checking base64 v0.22.1
Checking unarray v0.1.4
Checking proptest v1.9.0
Checking emojis v0.6.4
Checking jsonschema v0.30.0
Checking radicle-windows v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-windows)
Checking git2 v0.20.4
Checking radicle-oid v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-oid)
Checking radicle-git-ext v0.12.0
Checking radicle-term v0.17.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-term)
Checking radicle-core v0.2.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-core)
Checking radicle-cob v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cob)
Checking radicle v0.23.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle)
Checking radicle-fetch v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-fetch)
Checking radicle-cli-test v0.13.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cli-test)
Checking radicle-schemars v0.7.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-schemars)
Checking radicle-protocol v0.7.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-protocol)
Finished `dev` profile [unoptimized + debuginfo] target(s) in 42.91s
+ cargo build --all-targets --workspace
Compiling libc v0.2.182
Compiling cfg-if v1.0.0
Compiling memchr v2.7.2
Compiling shlex v1.3.0
Compiling regex-syntax v0.8.5
Compiling typenum v1.17.0
Compiling aho-corasick v1.1.3
Compiling generic-array v0.14.7
Compiling jobserver v0.1.31
Compiling cc v1.2.2
Compiling getrandom v0.2.15
Compiling rand_core v0.6.4
Compiling serde_core v1.0.228
Compiling regex-automata v0.4.9
Compiling crypto-common v0.1.6
Compiling smallvec v1.15.1
Compiling subtle v2.5.0
Compiling thiserror v2.0.18
Compiling cpufeatures v0.2.12
Compiling stable_deref_trait v1.2.0
Compiling fastrand v2.3.0
Compiling scopeguard v1.2.0
Compiling lock_api v0.4.14
Compiling parking_lot_core v0.9.12
Compiling serde v1.0.228
Compiling block-buffer v0.10.4
Compiling parking_lot v0.12.5
Compiling digest v0.10.7
Compiling bitflags v2.9.1
Compiling byteorder v1.5.0
Compiling tinyvec_macros v0.1.1
Compiling tinyvec v1.6.0
Compiling gix-trace v0.1.18
Compiling crc32fast v1.5.0
Compiling itoa v1.0.17
Compiling same-file v1.0.6
Compiling typeid v1.0.3
Compiling walkdir v2.5.0
Compiling prodash v31.0.0
Compiling unicode-normalization v0.1.23
Compiling zlib-rs v0.6.0
Compiling gix-utils v0.3.1
Compiling erased-serde v0.4.6
Compiling bstr v1.12.0
Compiling hash32 v0.3.1
Compiling serde_fmt v1.0.3
Compiling gix-validate v0.11.0
Compiling gix-path v0.11.1
Compiling value-bag-serde1 v1.11.1
Compiling heapless v0.8.0
Compiling value-bag v1.11.1
Compiling faster-hex v0.10.0
Compiling log v0.4.27
Compiling sha1 v0.10.6
Compiling zeroize v1.7.0
Compiling sha1-checked v0.10.0
Compiling zerofrom v0.1.6
Compiling getrandom v0.3.3
Compiling yoke v0.7.5
Compiling linux-raw-sys v0.11.0
Compiling zerovec v0.10.4
Compiling gix-features v0.46.1
Compiling gix-hash v0.22.1
Compiling block-padding v0.3.3
Compiling once_cell v1.21.3
Compiling rustix v1.1.3
Compiling inout v0.1.3
Compiling tinystr v0.7.6
Compiling litemap v0.7.5
Compiling cipher v0.4.4
Compiling writeable v0.5.5
Compiling percent-encoding v2.3.1
Compiling icu_locid v1.5.0
Compiling icu_locid_transform_data v1.5.1
Compiling icu_properties_data v1.5.1
Compiling icu_collections v1.5.0
Compiling equivalent v1.0.1
Compiling hashbrown v0.14.3
Compiling icu_provider v1.5.0
Compiling indexmap v2.2.6
Compiling icu_normalizer_data v1.5.1
Compiling icu_locid_transform v1.5.0
Compiling sha2 v0.10.8
Compiling utf16_iter v1.0.5
Compiling ryu v1.0.17
Compiling utf8_iter v1.0.4
Compiling write16 v1.0.0
Compiling serde_json v1.0.140
Compiling icu_properties v1.5.1
Compiling tempfile v3.25.0
Compiling libz-sys v1.1.16
Compiling thiserror v1.0.69
Compiling universal-hash v0.5.1
Compiling opaque-debug v0.3.1
Compiling ref-cast v1.0.24
Compiling dyn-clone v1.0.17
Compiling libgit2-sys v0.18.3+1.9.2
Compiling signature v1.6.4
Compiling ed25519 v1.5.3
Compiling form_urlencoded v1.2.1
Compiling aead v0.5.2
Compiling icu_normalizer v1.5.0
Compiling ascii v1.1.0
Compiling idna_adapter v1.2.0
Compiling idna v1.0.3
Compiling ct-codecs v1.1.1
Compiling amplify_num v0.5.2
Compiling url v2.5.4
Compiling ec25519 v0.1.0
Compiling num-traits v0.2.19
Compiling amplify v4.6.0
Compiling poly1305 v0.8.0
Compiling git-ref-format-core v0.6.0
Compiling chacha20 v0.9.1
Compiling cyphergraphy v0.3.0
Compiling schemars v1.0.4
Compiling polyval v0.6.2
Compiling sqlite3-src v0.7.0
Compiling hmac v0.12.1
Compiling keccak v0.1.6
Compiling base64ct v1.6.0
Compiling sha3 v0.10.8
Compiling pem-rfc7468 v0.7.0
Compiling pbkdf2 v0.12.2
Compiling ghash v0.5.1
Compiling aes v0.8.4
Compiling ctr v0.9.2
Compiling rand v0.8.5
Compiling base32 v0.4.0
Compiling cypheraddr v0.4.0
Compiling qcheck v1.0.0
Compiling aes-gcm v0.10.3
Compiling ssh-encoding v0.2.0
Compiling chacha20poly1305 v0.10.1
Compiling cbc v0.1.2
Compiling blowfish v0.9.1
Compiling jiff v0.2.20
Compiling data-encoding v2.5.0
Compiling data-encoding-macro v0.1.14
Compiling bcrypt-pbkdf v0.10.0
Compiling ssh-cipher v0.2.0
Compiling noise-framework v0.4.0
Compiling socks5-client v0.4.1
Compiling signature v2.2.0
Compiling base-x v0.2.11
Compiling multibase v0.9.1
Compiling ssh-key v0.6.6
Compiling cyphernet v0.5.2
Compiling radicle-ssh v0.10.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-ssh)
Compiling crossbeam-utils v0.8.19
Compiling winnow v0.7.14
Compiling crossbeam-channel v0.5.15
Compiling lazy_static v1.5.0
Compiling hashbrown v0.16.1
Compiling gix-hashtable v0.12.0
Compiling nonempty v0.9.0
Compiling anstyle-query v1.0.2
Compiling siphasher v1.0.1
Compiling gix-error v0.1.0
Compiling radicle-dag v0.10.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-dag)
Compiling radicle-git-metadata v0.2.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-git-metadata)
Compiling memmap2 v0.9.8
Compiling utf8parse v0.2.2
Compiling anstyle-parse v0.2.3
Compiling radicle-git-ref-format v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-git-ref-format)
Compiling is_terminal_polyfill v1.70.2
Compiling base64 v0.21.7
Compiling anstyle v1.0.13
Compiling iana-time-zone v0.1.60
Compiling colorchoice v1.0.0
Compiling anstream v0.6.21
Compiling chrono v0.4.38
Compiling colored v2.1.0
Compiling radicle-localtime v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-localtime)
Compiling gix-error v0.0.0
Compiling serde-untagged v0.1.7
Compiling bytesize v2.0.1
Compiling tree-sitter-language v0.1.2
Compiling dunce v1.0.5
Compiling fast-glob v0.3.3
Compiling gix-date v0.14.0
Compiling adler2 v2.0.0
Compiling gix-date v0.13.0
Compiling gix-actor v0.39.0
Compiling gix-fs v0.19.1
Compiling gix-object v0.56.0
Compiling gix-tempfile v21.0.1
Compiling gix-actor v0.38.0
Compiling gix-chunk v0.6.0
Compiling mio v1.0.4
Compiling gix-quote v0.6.2
Compiling gix-commitgraph v0.33.0
Compiling gix-object v0.55.0
Compiling gix-chunk v0.5.0
Compiling errno v0.3.13
Compiling sem_safe v0.2.0
Compiling either v1.11.0
Compiling shell-words v1.1.0
Compiling unicode-segmentation v1.11.0
Compiling gix-command v0.7.1
Compiling signals_receipts v0.2.0
Compiling gix-commitgraph v0.32.0
Compiling gix-revwalk v0.27.0
Compiling gix-revwalk v0.26.0
Compiling gix-lock v21.0.1
Compiling gix-url v0.35.1
Compiling gix-config-value v0.17.1
Compiling gix-sec v0.13.1
Compiling signal-hook-registry v1.4.5
Compiling gimli v0.32.3
Compiling signal-hook v0.3.18
Compiling gix-prompt v0.13.1
Compiling gix-revision v0.41.0
Compiling gix-traverse v0.52.0
Compiling object v0.37.3
Compiling addr2line v0.25.1
Compiling radicle-signals v0.11.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-signals)
Compiling gix-diff v0.58.0
Compiling miniz_oxide v0.8.8
Compiling gix-glob v0.24.0
Compiling mio v0.8.11
Compiling gix-packetline v0.21.1
Compiling tree-sitter v0.24.4
Compiling rustc-demangle v0.1.26
Compiling rustix v0.38.34
Compiling backtrace v0.3.76
Compiling gix-transport v0.54.0
Compiling signal-hook-mio v0.2.4
Compiling gix-refspec v0.37.0
Compiling gix-pack v0.65.0
Compiling arc-swap v1.8.2
Compiling gix-credentials v0.36.0
Compiling sqlite3-sys v0.18.0
Compiling sqlite v0.37.0
Compiling gix-ref v0.59.0
Compiling radicle-crypto v0.16.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-crypto)
Compiling gix-shallow v0.8.1
Compiling gix-negotiate v0.27.0
Compiling convert_case v0.7.1
Compiling regex v1.11.1
Compiling gix-protocol v0.57.0
Compiling derive_more-impl v2.0.1
Compiling gix-odb v0.75.0
Compiling xattr v1.3.1
Compiling uuid v1.20.0
Compiling filetime v0.2.23
Compiling unicode-width v0.2.1
Compiling bitflags v1.3.2
Compiling bytes v1.11.1
Compiling console v0.16.0
Compiling crossterm v0.25.0
Compiling tar v0.4.40
Compiling git-ref-format-macro v0.6.0
Compiling flate2 v1.1.1
Compiling derive_more v2.0.1
Compiling portable-atomic v1.11.0
Compiling anyhow v1.0.82
Compiling newline-converter v0.3.0
Compiling snapbox-macros v0.3.8
Compiling salsa20 v0.10.2
Compiling fxhash v0.2.1
Compiling unicode-width v0.1.11
Compiling similar v2.5.0
Compiling unit-prefix v0.5.1
Compiling normalize-line-endings v0.3.0
Compiling clap_lex v0.7.5
Compiling strsim v0.11.1
Compiling streaming-iterator v0.1.9
Compiling siphasher v0.3.11
Compiling bloomy v1.2.0
Compiling snapbox v0.4.17
Compiling clap_builder v4.5.44
Compiling indicatif v0.18.0
Compiling inquire v0.7.5
Compiling radicle-surf v0.27.0
Compiling scrypt v0.11.0
Compiling crossterm v0.29.0
Compiling git-ref-format v0.6.0
Compiling unicode-display-width v0.3.0
Compiling systemd-journal-logger v2.2.2
Compiling serde_spanned v1.0.4
Compiling toml_datetime v0.7.5+spec-1.1.0
Compiling tree-sitter-rust v0.23.2
Compiling tree-sitter-go v0.23.4
Compiling tree-sitter-css v0.23.1
Compiling tree-sitter-json v0.24.8
Compiling tree-sitter-toml-ng v0.6.0
Compiling tree-sitter-typescript v0.23.2
Compiling tree-sitter-c v0.23.2
Compiling tree-sitter-md v0.3.2
Compiling tree-sitter-ruby v0.23.1
Compiling tree-sitter-python v0.23.4
Compiling tree-sitter-bash v0.23.3
Compiling tree-sitter-html v0.23.2
Compiling radicle-std-ext v0.2.0
Compiling pin-project-lite v0.2.16
Compiling toml_writer v1.0.6+spec-1.1.0
Compiling tokio v1.47.1
Compiling toml v0.9.12+spec-1.1.0
Compiling clap v4.5.44
Compiling sysinfo v0.37.2
Compiling radicle-cli v0.20.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cli)
Compiling yansi v0.5.1
Compiling diff v0.1.13
Compiling radicle-node v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-node)
Compiling pretty_assertions v1.4.0
Compiling human-panic v2.0.6
Compiling clap_complete v4.5.60
Compiling structured-logger v1.0.4
Compiling radicle-systemd v0.12.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-systemd)
Compiling tree-sitter-highlight v0.24.4
Compiling itertools v0.14.0
Compiling num-integer v0.1.46
Compiling socket2 v0.5.7
Compiling humantime v2.3.0
Compiling timeago v0.4.2
Compiling lexopt v0.3.0
Compiling bit-vec v0.8.0
Compiling escargot v0.5.10
Compiling bit-set v0.8.0
Compiling num-bigint v0.4.6
Compiling rand_core v0.9.3
Compiling num-iter v0.1.45
Compiling num-complex v0.4.6
Compiling env_filter v0.1.3
Compiling zerocopy v0.7.35
Compiling num-rational v0.4.2
Compiling borrow-or-share v0.2.2
Compiling fluent-uri v0.3.2
Compiling num v0.4.3
Compiling ahash v0.8.11
Compiling env_logger v0.11.8
Compiling phf_shared v0.11.3
Compiling wait-timeout v0.2.1
Compiling quick-error v1.2.3
Compiling ppv-lite86 v0.2.17
Compiling radicle-remote-helper v0.16.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-remote-helper)
Compiling fnv v1.0.7
Compiling vsimd v0.8.0
Compiling outref v0.5.2
Compiling rand_chacha v0.9.0
Compiling rusty-fork v0.3.1
Compiling uuid-simd v0.8.0
Compiling test-log v0.2.19
Compiling phf v0.11.3
Compiling referencing v0.30.0
Compiling fraction v0.15.3
Compiling rand v0.9.2
Compiling git2 v0.20.4
Compiling rand_xorshift v0.4.0
Compiling fancy-regex v0.14.0
Compiling email_address v0.2.9
Compiling unarray v0.1.4
Compiling bytecount v0.6.8
Compiling base64 v0.22.1
Compiling num-cmp v0.1.0
Compiling jsonschema v0.30.0
Compiling proptest v1.9.0
Compiling emojis v0.6.4
Compiling radicle-oid v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-oid)
Compiling radicle-cob v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cob)
Compiling radicle-core v0.2.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-core)
Compiling radicle-git-ext v0.12.0
Compiling radicle v0.23.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle)
Compiling radicle-term v0.17.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-term)
Compiling radicle-windows v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-windows)
Compiling radicle-fetch v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-fetch)
Compiling radicle-protocol v0.7.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-protocol)
Compiling radicle-cli-test v0.13.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cli-test)
Compiling radicle-schemars v0.7.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-schemars)
Finished `dev` profile [unoptimized + debuginfo] target(s) in 56.92s
+ cargo doc --workspace --no-deps --all-features
Checking regex-automata v0.4.9
Compiling syn v1.0.109
Checking idna v1.0.3
Compiling num-traits v0.2.19
Checking radicle-ssh v0.10.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-ssh)
Checking url v2.5.4
Checking git2 v0.20.4
Checking proptest v1.9.0
Checking bstr v1.12.0
Compiling amplify_syn v2.0.1
Checking gix-validate v0.11.0
Checking gix-path v0.11.1
Checking git-ref-format-core v0.6.0
Checking gix-features v0.46.1
Compiling data-encoding-macro-internal v0.1.12
Checking gix-hash v0.22.1
Checking radicle-git-ref-format v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-git-ref-format)
Checking gix-error v0.1.0
Compiling amplify_derive v4.0.0
Checking gix-hashtable v0.12.0
Checking radicle-oid v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-oid)
Checking gix-error v0.0.0
Checking data-encoding-macro v0.1.14
Checking multibase v0.9.1
Checking radicle-dag v0.10.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-dag)
Checking radicle-git-metadata v0.2.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-git-metadata)
Checking gix-date v0.14.0
Checking chrono v0.4.38
Checking radicle-localtime v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-localtime)
Checking gix-actor v0.39.0
Checking gix-date v0.13.0
Checking gix-fs v0.19.1
Checking gix-actor v0.38.0
Checking gix-tempfile v21.0.1
Checking gix-object v0.56.0
Checking gix-chunk v0.6.0
Checking gix-quote v0.6.2
Checking gix-commitgraph v0.33.0
Checking gix-object v0.55.0
Checking gix-chunk v0.5.0
Checking gix-command v0.7.1
Checking amplify v4.6.0
Checking gix-commitgraph v0.32.0
Checking gix-revwalk v0.27.0
Checking gix-lock v21.0.1
Checking gix-config-value v0.17.1
Checking cyphergraphy v0.3.0
Checking gix-revwalk v0.26.0
Checking gix-url v0.35.1
Checking cypheraddr v0.4.0
Checking noise-framework v0.4.0
Checking gix-traverse v0.52.0
Checking gix-prompt v0.13.1
Checking gix-diff v0.58.0
Checking gix-revision v0.41.0
Checking socks5-client v0.4.1
Checking radicle-signals v0.11.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-signals)
Checking gix-glob v0.24.0
Checking gix-packetline v0.21.1
Checking cyphernet v0.5.2
Checking regex v1.11.1
Checking radicle-crypto v0.16.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-crypto)
Checking gix-refspec v0.37.0
Checking gix-transport v0.54.0
Checking tree-sitter v0.24.4
Checking gix-pack v0.65.0
Checking radicle-cob v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cob)
Checking radicle-core v0.2.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-core)
Checking git-ref-format v0.6.0
Checking gix-credentials v0.36.0
Checking gix-ref v0.59.0
Checking gix-shallow v0.8.1
Checking gix-negotiate v0.27.0
Checking radicle-git-ext v0.12.0
Checking radicle v0.23.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle)
Checking uuid v1.20.0
Checking gix-protocol v0.57.0
Checking gix-odb v0.75.0
Compiling radicle-cli v0.20.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cli)
Checking human-panic v2.0.6
Checking radicle-surf v0.27.0
Checking tree-sitter-toml-ng v0.6.0
Checking radicle-term v0.17.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-term)
Checking tree-sitter-highlight v0.24.4
Checking radicle-systemd v0.12.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-systemd)
Documenting radicle-systemd v0.12.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-systemd)
Documenting radicle v0.23.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle)
Documenting radicle-term v0.17.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-term)
Documenting radicle-core v0.2.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-core)
Documenting radicle-cob v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cob)
Documenting radicle-crypto v0.16.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-crypto)
Documenting radicle-signals v0.11.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-signals)
Documenting radicle-oid v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-oid)
Documenting radicle-git-ref-format v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-git-ref-format)
Documenting radicle-localtime v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-localtime)
Documenting radicle-ssh v0.10.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-ssh)
Documenting radicle-dag v0.10.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-dag)
Documenting radicle-git-metadata v0.2.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-git-metadata)
Documenting radicle-windows v0.1.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-windows)
Checking radicle-fetch v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-fetch)
Documenting radicle-cli v0.20.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cli)
Documenting radicle-schemars v0.7.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-schemars)
Checking radicle-protocol v0.7.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-protocol)
Documenting radicle-protocol v0.7.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-protocol)
Documenting radicle-node v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-node)
Documenting radicle-fetch v0.19.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-fetch)
Documenting radicle-cli-test v0.13.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-cli-test)
Documenting radicle-remote-helper v0.16.0 (/3e1032cf-5e98-48bc-acf4-99193d66ae06/w/crates/radicle-remote-helper)
Finished `dev` profile [unoptimized + debuginfo] target(s) in 9.92s
Generated /3e1032cf-5e98-48bc-acf4-99193d66ae06/w/target/doc/radicle/index.html and 21 other files
+ cargo test --workspace --no-fail-fast
Finished `test` profile [unoptimized + debuginfo] target(s) in 0.15s
Running unittests src/lib.rs (target/debug/deps/radicle-f34e05c9727b7204)
running 321 tests
test canonical::formatter::test::ascii_control_characters ... ok
test canonical::formatter::test::securesystemslib_asserts ... ok
test canonical::formatter::test::ordered_nested_object ... ok
test cob::cache::migrations::_2::tests::test_patch_json_deserialization ... ok
test cob::common::test::test_color ... ok
test cob::cache::tests::test_check_version ... ok
test cob::common::test::test_title ... ok
test cob::common::test::test_emojis ... ok
test cob::cache::tests::test_migrate_to ... ok
test cob::cache::migrations::_2::tests::test_migration_2 ... ok
test cob::identity::test::prop_json_eq_str ... ok
test cob::identity::test::test_identity_redact_revision ... ok
test cob::identity::test::test_identity_remove_delegate_concurrent ... ok
test cob::identity::test::test_identity_update_rejected ... ok
test cob::identity::test::test_identity_reject_concurrent ... ok
test cob::identity::test::test_identity_updates ... ok
test cob::issue::cache::tests::test_counts ... ok
test cob::issue::cache::tests::test_get ... ok
test cob::issue::cache::tests::test_is_empty ... ok
test cob::issue::cache::tests::test_list ... ok
test cob::issue::cache::tests::test_list_by_status ... ok
test cob::issue::cache::tests::test_remove ... ok
test cob::identity::test::test_identity_updates_concurrent ... ok
test cob::identity::test::test_valid_identity ... ok
test cob::issue::test::test_embeds ... ok
test cob::issue::test::test_embeds_edit ... ok
test cob::issue::test::test_invalid_actions ... ok
test cob::identity::test::test_identity_updates_concurrent_outdated ... ok
test cob::issue::test::test_invalid_cob ... ok
test cob::issue::test::test_invalid_tx ... ok
test cob::issue::test::test_concurrency ... ok
test cob::issue::test::test_invalid_tx_reference ... ok
test cob::issue::test::test_issue_comment ... ok
test cob::issue::test::test_issue_all ... ok
test cob::issue::test::test_issue_comment_redact ... ok
test cob::issue::test::test_issue_create_and_assign ... ok
test cob::issue::test::test_issue_create_and_get ... ok
test cob::issue::test::test_issue_create_and_reassign ... ok
test cob::issue::test::test_issue_create_and_unassign ... ok
test cob::issue::test::test_issue_create_and_change_state ... ok
test cob::issue::test::test_issue_edit ... ok
test cob::issue::test::test_issue_edit_description ... ok
test cob::issue::test::test_issue_label ... ok
test cob::issue::test::test_issue_multilines ... ok
test cob::issue::test::test_issue_state_serde ... ok
test cob::issue::test::test_ordering ... ok
test cob::patch::actions::test::test_review_edit ... ok
test cob::issue::test::test_issue_react ... ok
test cob::issue::test::test_issue_reply ... ok
test cob::patch::cache::tests::test_is_empty ... ok
test cob::patch::cache::tests::test_list ... ok
test cob::patch::cache::tests::test_get ... ok
test cob::patch::cache::tests::test_list_by_status ... ok
test cob::patch::encoding::review::test::test_review_deserialize_summary_migration_null_summary ... ok
test cob::patch::encoding::review::test::test_review_deserialize_summary_migration_with_summary ... ok
test cob::patch::encoding::review::test::test_review_deserialize_summary_migration_without_summary ... ok
test cob::patch::encoding::review::test::test_review_deserialize_summary_v2 ... ok
test cob::patch::encoding::review::test::test_review_summary ... ok
test cob::patch::test::test_json ... ok
test cob::patch::test::test_json_serialization ... ok
test cob::patch::cache::tests::test_counts ... ok
test cob::patch::test::test_patch_create_and_get ... ok
test cob::patch::cache::tests::test_find_by_revision ... ok
test cob::patch::cache::tests::test_remove ... ok
test cob::patch::test::test_patch_discussion ... ok
test cob::patch::test::test_patch_merge ... ok
test cob::patch::test::test_patch_redact ... ok
test cob::patch::test::test_patch_review_comment ... ok
test cob::patch::test::test_patch_review ... ok
test cob::patch::test::test_patch_review_duplicate ... ok
test cob::patch::test::test_patch_review_edit ... ok
test cob::patch::test::test_patch_review_remove_summary ... ok
test cob::patch::test::test_reactions_json_serialization ... ok
test cob::patch::test::test_revision_edit_redact ... ok
test cob::patch::test::test_revision_reaction ... ok
test cob::patch::test::test_revision_review_merge_redacted ... ok
test cob::patch::test::test_patch_review_edit_comment ... ok
test cob::stream::tests::test_all_from ... ok
test cob::stream::tests::test_all_from_until ... ok
test cob::patch::test::test_patch_review_revision_redact ... ok
test cob::stream::tests::test_regression_from_until ... ok
test cob::stream::tests::test_all_until ... ok
test cob::stream::tests::test_from_until ... ok
test cob::thread::tests::test_comment_edit_redacted ... ok
test cob::thread::tests::test_comment_edit_missing ... ok
test cob::thread::tests::test_comment_redact_missing ... ok
test cob::thread::tests::test_duplicate_comments ... ok
test cob::thread::tests::test_redact_comment ... ok
test cob::thread::tests::test_edit_comment ... ok
test git::canonical::quorum::test::merge_base_commutative ... ok
test git::canonical::quorum::test::test_merge_bases ... ok
test cob::thread::tests::test_timeline ... ok
test git::canonical::rules::tests::test_deserialization ... ok
test git::canonical::rules::tests::test_deserialize_extensions ... ok
test git::canonical::rules::tests::test_order ... ok
test git::canonical::rules::tests::test_roundtrip ... ok
test cob::patch::test::test_patch_update ... ok
test git::canonical::rules::tests::test_rule_validate_success ... ok
test git::canonical::rules::tests::test_special_branches ... ok
test git::canonical::tests::test_commit_quorum_fork_of_a_fork ... ok
test git::canonical::tests::test_commit_quorum_forked_merge_commits ... ok
test git::canonical::tests::test_commit_quorum_groups ... ok
test git::canonical::tests::test_commit_quorum_linear ... ok
test git::canonical::tests::test_commit_quorum_merges ... ok
test git::canonical::tests::test_commit_quorum_single ... ok
test git::canonical::tests::test_commit_quorum_three_way_fork ... ok
test git::canonical::tests::test_commit_quorum_two_way_fork ... ok
test git::canonical::tests::test_quorum_different_types ... ok
test git::canonical::rules::tests::test_canonical ... ok
test git::canonical::tests::test_tag_quorum ... ok
test git::test::test_version_from_str ... ok
test git::test::test_version_ord ... ok
test identity::did::test::test_did_encode_decode ... ok
test identity::did::test::test_did_vectors ... ok
test git::canonical::rules::tests::test_rule_validate_failures ... ok
test identity::doc::test::test_canonical_doc ... ok
test identity::doc::test::test_canonical_example ... ok
test identity::doc::test::test_duplicate_dids ... ok
test identity::doc::test::test_future_version_error ... ok
test identity::doc::test::test_is_valid_version ... ok
test identity::doc::test::test_max_delegates ... ok
test identity::doc::test::test_not_found ... ok
test identity::doc::test::test_parse_version ... ok
test identity::doc::test::test_visibility_json ... ok
test identity::doc::update::test::test_can_update_crefs ... ok
test identity::doc::update::test::test_cannot_include_default_branch_rule ... ok
test identity::doc::update::test::test_default_branch_rule_exists_after_verification ... ok
test identity::project::test::test_project_name ... ok
test node::address::store::test::test_alias ... ok
test node::address::store::test::test_disconnected ... ok
test node::address::store::test::test_disconnected_ban ... ok
test node::address::store::test::test_empty ... ok
test node::address::store::test::test_entries ... ok
test node::address::store::test::test_get_none ... ok
test node::address::store::test::test_insert_and_get ... ok
test node::address::store::test::test_insert_and_remove ... ok
test node::address::store::test::test_insert_and_update ... ok
test node::address::store::test::test_insert_duplicate ... ok
test node::address::store::test::test_node_aliases ... ok
test node::address::store::test::test_remove_nothing ... ok
test node::command::test::command_result ... ok
test node::config::test::deserialize_migrating_scope ... ok
test node::config::test::fetch_level_min ... ok
test node::config::test::partial ... ok
test node::config::test::regression_ipv6_address_brackets ... ok
test node::config::test::regression_ipv6_address_no_brackets ... ok
test node::config::test::serialize_migrating_scope ... ok
test node::db::config::test::database_config_valid_combinations ... ok
test node::db::config::test::invalid ... ok
test node::db::test::migration_8::all_ipv6_formatted_dns_addresses_are_retyped ... ok
test node::db::test::migration_8::dns_address_starting_with_bracket_but_missing_closing_bracket_colon_is_unaffected ... ok
test node::db::test::migration_8::dns_address_with_bracket_not_at_start_is_unaffected ... ok
test node::db::test::migration_8::ipv4_address_is_unaffected ... ok
test node::db::test::migration_8::ipv6_formatted_dns_address_is_deleted_when_correct_ipv6_row_already_exists ... ok
test node::db::test::migration_8::ipv6_formatted_dns_address_is_retyped_to_ipv6 ... ok
test node::db::test::migration_8::migration_applies_to_all_nodes ... ok
test node::db::test::migration_8::plain_dns_hostname_without_brackets_is_unaffected ... ok
test node::db::test::migration_8::retype_preserves_address_metadata ... ok
test node::db::test::test_version ... ok
test node::features::test::test_operations ... ok
test node::notifications::store::test::test_branch_notifications ... ok
test node::notifications::store::test::test_clear ... ok
test node::notifications::store::test::test_cob_notifications ... ok
test node::notifications::store::test::test_counts_by_repo ... ok
test node::notifications::store::test::test_duplicate_notifications ... ok
test node::notifications::store::test::test_notification_status ... ok
test node::policy::store::test::test_follow_and_unfollow_node ... ok
test node::policy::store::test::test_node_aliases ... ok
test node::policy::store::test::test_node_policies ... ok
test node::policy::store::test::test_node_policy ... ok
test node::policy::store::test::test_repo_policies ... ok
test node::policy::store::test::test_repo_policy ... ok
test node::policy::store::test::test_seed_and_unseed_repo ... ok
test node::policy::store::test::test_update_alias ... ok
test node::policy::store::test::test_update_scope ... ok
test node::refs::store::test::test_count ... ok
test node::refs::store::test::test_set_and_delete ... ok
test node::refs::store::test::test_set_and_get ... ok
test node::routing::test::test_count ... ok
test node::routing::test::test_entries ... ok
test node::routing::test::test_insert_and_get ... ok
test node::routing::test::test_insert_and_get_resources ... ok
test git::canonical::tests::test_quorum_properties ... ok
test node::routing::test::test_insert_and_remove ... ok
test node::routing::test::test_insert_duplicate ... ok
test node::routing::test::test_insert_existing_updated_time ... ok
test node::routing::test::test_len ... ok
test node::routing::test::test_remove_many ... ok
test node::routing::test::test_remove_redundant ... ok
test node::routing::test::test_update_existing_multi ... ok
test node::sync::announce::test::all_synced_nodes_are_preferred_seeds ... ok
test node::sync::announce::test::announcer_adapts_target_to_reach ... ok
test node::routing::test::test_prune ... ok
test node::sync::announce::test::announcer_reached_max_replication_target ... ok
test node::sync::announce::test::announcer_preferred_seeds_or_replica_factor ... ok
test node::sync::announce::test::announcer_reached_min_replication_target ... ok
test node::sync::announce::test::announcer_reached_preferred_seeds ... ok
test node::sync::announce::test::announcer_synced_with_unknown_node ... ok
test node::sync::announce::test::announcer_timed_out ... ok
test node::sync::announce::test::announcer_with_replication_factor_zero_and_preferred_seeds ... ok
test node::sync::announce::test::construct_node_appears_in_multiple_input_sets ... ok
test node::sync::announce::test::construct_only_preferred_seeds_provided ... ok
test node::sync::announce::test::cannot_construct_announcer ... ok
test node::sync::announce::test::invariant_progress_should_match_state ... ok
test node::sync::announce::test::local_node_in_multiple_sets ... ok
test node::sync::announce::test::local_node_in_preferred_seeds ... ok
test node::sync::announce::test::local_node_in_synced_set ... ok
test node::sync::announce::test::local_node_only_in_all_sets_results_in_no_seeds_error ... ok
test node::sync::announce::test::local_node_in_unsynced_set ... ok
test node::sync::announce::test::preferred_seeds_already_synced ... ok
test node::sync::announce::test::synced_with_local_node_is_ignored ... ok
test node::sync::announce::test::synced_with_same_node_multiple_times ... ok
test node::sync::announce::test::timed_out_after_reaching_success ... ok
test node::sync::fetch::test::all_nodes_are_candidates ... ok
test node::sync::fetch::test::all_nodes_are_fetchable ... ok
test node::sync::fetch::test::could_not_reach_target ... ok
test node::sync::fetch::test::ignores_duplicates_and_local_node ... ok
test node::sync::fetch::test::preferred_seeds_target_returned_over_replicas ... ok
test node::sync::fetch::test::reaches_target_of_max_replicas ... ok
test node::sync::fetch::test::reaches_target_of_preferred_seeds ... ok
test node::sync::test::ensure_replicas_construction ... ok
test node::sync::test::replicas_constrain_to ... ok
test node::test::test_address ... ok
test node::test::test_alias ... ok
test node::test::test_command_result ... ok
test node::test::test_user_agent ... ok
test node::timestamp::tests::test_timestamp_max ... ok
test node::sync::fetch::test::reaches_target_of_replicas ... ok
test profile::test::canonicalize_home ... ok
test profile::test::test_config ... ok
test cob::thread::tests::prop_ordering ... ok
test rad::tests::test_checkout ... ok
test rad::tests::test_init ... ok
test rad::tests::test_fork ... ok
test storage::git::tests::test_references_of ... ok
test storage::git::transport::local::url::test::test_url_parse ... ok
test storage::git::transport::local::url::test::test_url_to_string ... ok
test storage::git::transport::remote::url::test::test_url_parse ... ok
test storage::git::tests::test_sign_refs ... ok
test profile::config::test::schema ... ok
test storage::refs::sigrefs::read::test::commit_reader::identity_root_error ... ok
test storage::refs::sigrefs::read::test::commit_reader::missing_commit ... ok
test storage::refs::sigrefs::read::test::commit_reader::read_ok ... ok
test storage::refs::sigrefs::read::test::commit_reader::too_many_parents ... ok
test storage::refs::sigrefs::read::test::commit_reader::tree_error ... ok
test storage::refs::sigrefs::read::test::identity_root_reader::doc_blob_error ... ok
test storage::refs::sigrefs::read::test::identity_root_reader::missing_identity ... ok
test storage::refs::sigrefs::read::test::identity_root_reader::read_ok_none ... ok
test storage::refs::sigrefs::read::test::identity_root_reader::read_ok_some ... ok
test storage::refs::sigrefs::read::test::resolve_tip::find_reference_error ... ok
test storage::refs::sigrefs::read::test::resolve_tip::missing_sigrefs ... ok
test storage::refs::sigrefs::read::test::resolve_tip::resolve_tip_ok ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::detect_parent::root_without_parent ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::detect_parent::root_without_root ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::downgrade::parent ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::downgrade::restore ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::downgrade::root ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::downgrade::root_with_parent ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::head_commit_error ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::head_verify_mismatched_identity_error ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::head_verify_signature_error ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::invalid_parent ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::read_ok_no_parent ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::read_ok_parent ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::read_ok_root ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::replay::alternating ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::replay::chain ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::replay::multiple ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::replay::root_at_head ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::single_commit ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::two_commits ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::walk_commit_error ... ok
test storage::refs::sigrefs::read::test::signed_refs_reader::walk_verify_error ... ok
test storage::refs::sigrefs::read::test::tree_reader::missing_both ... ok
test storage::refs::sigrefs::read::test::tree_reader::missing_refs ... ok
test storage::refs::sigrefs::read::test::tree_reader::missing_signature ... ok
test storage::refs::sigrefs::read::test::tree_reader::parse_refs_error ... ok
test storage::refs::sigrefs::read::test::tree_reader::parse_signature_error ... ok
test storage::refs::sigrefs::read::test::tree_reader::read_ok ... ok
test storage::refs::sigrefs::read::test::tree_reader::read_refs_error ... ok
test storage::refs::sigrefs::read::test::tree_reader::read_signature_error ... ok
test storage::refs::sigrefs::write::test::commit_writer::tree_error ... ok
test storage::refs::sigrefs::write::test::commit_writer::write_commit_error ... ok
test storage::refs::sigrefs::write::test::commit_writer::write_empty_refs ... ok
test storage::refs::sigrefs::write::test::commit_writer::write_root_ok ... ok
test storage::refs::sigrefs::write::test::commit_writer::write_with_parent_ok ... ok
test storage::refs::sigrefs::write::test::head_reader::no_head ... ok
test storage::refs::sigrefs::write::test::head_reader::read_ok ... ok
test storage::refs::sigrefs::write::test::head_reader::reference_error ... ok
test storage::refs::sigrefs::write::test::head_reader::refs_blob_error ... ok
test storage::refs::sigrefs::write::test::head_reader::refs_blob_missing ... ok
test storage::refs::sigrefs::write::test::head_reader::refs_parse_error ... ok
test storage::refs::sigrefs::write::test::head_reader::signature_blob_error ... ok
test storage::refs::sigrefs::write::test::head_reader::signature_blob_missing ... ok
test storage::refs::sigrefs::write::test::head_reader::signature_parse_error ... ok
test storage::refs::sigrefs::write::test::signed_refs_writer::commit_error ... ok
test storage::refs::sigrefs::write::test::signed_refs_writer::head_error ... ok
test storage::refs::sigrefs::write::test::signed_refs_writer::never_write_rad_sigrefs ... ok
test storage::refs::sigrefs::write::test::signed_refs_writer::reference_error ... ok
test storage::refs::sigrefs::write::test::signed_refs_writer::unchanged ... ok
test storage::refs::sigrefs::write::test::signed_refs_writer::unchanged_force_writes_new_commit ... ok
test storage::refs::sigrefs::write::test::signed_refs_writer::write_empty_refs ... ok
test storage::refs::sigrefs::write::test::signed_refs_writer::write_root_ok ... ok
test storage::refs::sigrefs::write::test::signed_refs_writer::write_with_parent_ok ... ok
test storage::refs::sigrefs::write::test::tree_writer::sign_error ... ok
test storage::refs::sigrefs::write::test::tree_writer::write_ok ... ok
test storage::refs::sigrefs::write::test::tree_writer::write_tree_error ... ok
test storage::refs::tests::prop_canonical_roundtrip ... ok
test storage::refs::tests::test_rid_verification ... ok
test storage::tests::test_storage ... ok
test test::assert::test::assert_with_message ... ok
test test::assert::test::test_assert_no_move ... ok
test test::assert::test::test_assert_panic_0 - should panic ... ok
test test::assert::test::test_assert_panic_1 - should panic ... ok
test test::assert::test::test_assert_panic_2 - should panic ... ok
test test::assert::test::test_assert_succeed ... ok
test test::assert::test::test_panic_message ... ok
test version::test::test_version ... ok
test identity::doc::test::prop_encode_decode ... ok
test storage::refs::sigrefs::property::idempotent ... ok
test storage::refs::sigrefs::property::roundtrip ... ok
test result: ok. 321 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 3.14s
Running unittests src/lib.rs (target/debug/deps/radicle_cli-ec709e4f9bbe6e62)
running 46 tests
test commands::block::args::test::should_not_parse ... ok
test commands::block::args::test::should_parse_rid ... ok
test commands::block::args::test::should_parse_nid ... ok
test commands::clone::args::test::should_parse_rid_urn ... ok
test commands::clone::args::test::should_parse_rid_url ... ok
test commands::cob::args::test::should_allow_log_json_format ... ok
test commands::clone::args::test::should_parse_rid_non_urn ... ok
test commands::cob::args::test::should_allow_log_pretty_format ... ok
test commands::cob::args::test::should_allow_show_json_format ... ok
test commands::cob::args::test::should_allow_update_json_format ... ok
test commands::fork::args::test::should_not_parse_rid_url ... ok
test commands::cob::args::test::should_not_allow_show_pretty_format ... ok
test commands::fork::args::test::should_parse_rid_non_urn ... ok
test commands::cob::args::test::should_not_allow_update_pretty_format ... ok
test commands::id::args::test::should_not_parse_into_payload - should panic ... ok
test commands::fork::args::test::should_parse_rid_urn ... ok
test commands::id::args::test::should_not_clobber_payload_args ... ok
test commands::id::args::test::should_not_parse_single_payload ... ok
test commands::id::args::test::should_parse_into_payload ... ok
test commands::id::args::test::should_not_parse_single_payloads ... ok
test commands::id::args::test::should_parse_multiple_payloads ... ok
test commands::init::args::test::should_not_parse_rid_url ... ok
test commands::init::args::test::should_parse_rid_non_urn ... ok
test commands::id::args::test::should_parse_single_payload ... ok
test commands::inspect::test::test_tree ... ok
test commands::patch::review::builder::tests::test_review_comments_basic ... ok
test commands::patch::review::builder::tests::test_review_comments_before ... ok
test commands::init::args::test::should_parse_rid_urn ... ok
test commands::patch::review::builder::tests::test_review_comments_multiline ... ok
test commands::patch::review::builder::tests::test_review_comments_split_hunk ... ok
test commands::publish::args::test::should_not_parse_rid_url ... ok
test commands::publish::args::test::should_parse_rid_non_urn ... ok
test git::pretty_diff::test::test_pretty ... ignored
test git::ddiff::tests::diff_encode_decode_ddiff_hunk ... ok
test commands::publish::args::test::should_parse_rid_urn ... ok
test commands::watch::args::test::should_parse_ref_str ... ok
test git::unified_diff::test::test_diff_content_encode_decode_content ... ok
test terminal::args::test::should_parse_rid ... ok
test git::unified_diff::test::test_diff_encode_decode_diff ... ok
test terminal::args::test::should_not_parse ... ok
test terminal::format::test::test_bytes ... ok
test terminal::args::test::should_parse_nid ... ok
test terminal::patch::test::test_edit_display_message ... ok
test terminal::format::test::test_strip_comments ... ok
test terminal::patch::test::test_create_display_message ... ok
test terminal::patch::test::test_update_display_message ... ok
test result: ok. 45 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 0.01s
Running unittests src/main.rs (target/debug/deps/rad-19d47406e05c9282)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running tests/commands.rs (target/debug/deps/commands-dba3ca96f7d66000)
running 115 tests
test commands::checkout::rad_checkout ... ok
test commands::clone::rad_clone ... ok
test commands::clone::rad_clone_bare ... ok
test commands::clone::rad_clone_all ... ok
test commands::clone::rad_clone_scope ... ok
test commands::clone::rad_clone_directory ... ok
test commands::clone::rad_clone_unknown ... ok
test commands::clone::rad_clone_connect ... ok
test commands::clone::rad_clone_partial_fail ... ok
test commands::cob::rad_cob_multiset ... ok
test commands::clone::test_clone_without_seeds ... ok
test commands::cob::rad_cob_log ... ok
test commands::cob::rad_cob_migrate ... ok
test commands::cob::rad_cob_operations ... ok
test commands::cob::rad_cob_show ... ok
test commands::cob::rad_cob_update ... ok
test commands::cob::rad_cob_update_identity ... ok
test commands::cob::test_cob_deletion ... ok
test commands::cob::test_cob_replication ... ok
test commands::git::git_push_and_fetch ... ok
test commands::git::git_push_amend ... ok
test commands::git::git_push_canonical_annotated_tags ... ok
test commands::git::git_push_canonical_lightweight_tags ... ok
test commands::git::git_push_diverge ... ok
test commands::git::git_push_force_with_lease ... ok
test commands::id::rad_id ... ok
test commands::id::rad_id_collaboration ... ignored, slow
test commands::git::git_push_rollback ... ok
test commands::git::git_tag ... ok
test commands::git::git_push_converge ... ok
test commands::id::rad_id_private ... ok
test commands::id::rad_id_threshold_soft_fork ... ok
test commands::id::rad_id_conflict ... ok
test commands::id::rad_id_threshold ... ok
test commands::id::rad_id_unknown_field ... ok
test commands::id::rad_id_update_delete_field ... ok
test commands::init::rad_init ... ignored, part of many other tests
test commands::init::rad_init_bare ... ok
test commands::id::rad_id_unauthorized_delegate ... ok
test commands::id::rad_id_multi_delegate ... ok
test commands::init::rad_init_detached_head ... ok
test commands::init::rad_init_no_git ... ok
test commands::init::rad_init_existing ... ok
test commands::init::rad_init_existing_bare ... ok
test commands::init::rad_init_no_seed ... ok
test commands::init::rad_init_private ... ok
test commands::init::rad_init_private_no_seed ... ok
test commands::init::rad_init_private_clone ... ok
test commands::inbox::rad_inbox ... ok
test commands::init::rad_init_private_clone_seed ... ok
test commands::init::rad_init_private_seed ... ok
test commands::init::rad_init_sync_not_connected ... ok
test commands::init::rad_init_sync_preferred ... ok
test commands::init::rad_init_with_existing_remote ... ok
test commands::init::rad_publish ... ok
test commands::issue::rad_issue ... ok
test commands::jj::rad_jj_bare ... ok
test commands::jj::rad_jj_colocated_patch ... ok
test commands::issue::rad_issue_list ... ok
test commands::node::rad_node_connect ... ok
test commands::node::rad_node_connect_without_address ... ok
test commands::patch::rad_merge_after_update ... ok
test commands::patch::rad_merge_no_ff ... ok
test commands::node::rad_node ... ok
test commands::patch::rad_merge_via_push ... ok
test commands::patch::rad_patch ... ok
test commands::patch::rad_patch_ahead_behind ... ok
test commands::patch::rad_patch_change_base ... ok
test commands::patch::rad_patch_checkout ... ok
test commands::patch::rad_patch_checkout_revision ... ok
test commands::patch::rad_patch_checkout_force ... ok
test commands::init::rad_init_sync_timeout ... ok
test commands::init::rad_init_sync_and_clone ... ok
test commands::patch::rad_patch_detached_head ... ok
test commands::patch::rad_patch_diff ... ok
test commands::patch::rad_patch_draft ... ok
test commands::patch::rad_patch_edit ... ok
test commands::patch::rad_patch_fetch_2 ... FAILED
test commands::patch::rad_patch_merge_draft ... ok
test commands::patch::rad_patch_fetch_1 ... ok
test commands::patch::rad_patch_delete ... ok
test commands::patch::rad_patch_revert_merge ... ok
test commands::patch::rad_patch_update ... ok
test commands::patch::rad_patch_via_push ... FAILED
test commands::patch::rad_patch_open_explore ... ok
test commands::policy::rad_block ... ok
test commands::policy::rad_seed_and_follow ... ok
test commands::patch::rad_review_by_hunk ... ok
test commands::policy::rad_seed_policy_allow_no_scope ... ok
test commands::policy::rad_seed_scope ... ok
test commands::policy::rad_unseed ... ok
test commands::policy::rad_seed_many ... ok
test commands::policy::rad_unseed_many ... ok
test commands::patch::rad_push_and_pull_patches ... ok
test commands::remote::rad_remote ... ok
test commands::sync::rad_sync_without_node ... ok
test commands::sync::rad_sync ... ok
test commands::utility::framework_home ... ok
test commands::utility::rad_auth ... ok
test commands::utility::rad_auth_errors ... ok
test commands::utility::rad_clean ... ok
test commands::patch::rad_patch_pull_update ... ok
test commands::utility::rad_config ... ok
test commands::utility::rad_diff ... ok
test commands::utility::rad_help ... ok
test commands::utility::rad_inspect ... ok
test commands::utility::rad_key_mismatch ... ok
test commands::utility::rad_self ... ok
test commands::utility::rad_warn_old_nodes ... ok
test commands::sync::rad_fetch ... ok
test commands::watch::rad_watch ... ok
test rad_remote ... ok
test commands::workflow::rad_workflow ... ok
test commands::sync::test_replication_via_seed ... ok
test commands::utility::rad_fork ... ok
failures:
---- commands::patch::rad_patch_fetch_2 stdout ----
1774961971 test: rad-init:6: `rad init --name heartwood --description Radicle Heartwood Protocol & Stack --no-confirm --public -v` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-init:28: `rad init` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-init:35: `rad ls` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-init:46: `rad node inventory` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:6: `git checkout -b alice/1 -q` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:7: `git commit --allow-empty -m Changes #1 -q` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:8: `git push rad -o patch.message=Changes HEAD:refs/patches` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:12: `git checkout master -q` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:13: `git branch -D alice/1 -q` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:14: `git update-ref -d refs/remotes/rad/alice/1` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:15: `git update-ref -d refs/remotes/rad/patches/5e2dedcc5d515fcbc1cca483d3376609fe889bfb` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:16: `git gc --prune=now` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:17: `git branch -r` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:22: `git pull` @ /tmp/.tmpjGN0tp/alice/work
1774961971 test: rad-patch-fetch-2:24: `git branch -r` @ /tmp/.tmpjGN0tp/alice/work
thread 'commands::patch::rad_patch_fetch_2' panicked at crates/radicle-cli-test/src/lib.rs:502:36:
--- Expected
++++ actual: stdout
1 - rad/HEAD -> rad/master
2 1 | rad/master
3 2 | rad/patches/5e2dedcc5d515fcbc1cca483d3376609fe889bfb
Exit status: 0
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
---- commands::patch::rad_patch_via_push stdout ----
1774961972 test: rad-init:6: `rad init --name heartwood --description Radicle Heartwood Protocol & Stack --no-confirm --public -v` @ /tmp/.tmptud6rv/alice/work
1774961972 test: rad-init:28: `rad init` @ /tmp/.tmptud6rv/alice/work
1774961972 test: rad-init:35: `rad ls` @ /tmp/.tmptud6rv/alice/work
1774961972 test: rad-init:46: `rad node inventory` @ /tmp/.tmptud6rv/alice/work
1774961972 test: rad-patch-via-push:7: `git checkout -b feature/1` @ /tmp/.tmptud6rv/alice/work
1774961972 test: rad-patch-via-push:9: `git commit -a -m Add things -q --allow-empty` @ /tmp/.tmptud6rv/alice/work
1774961972 test: rad-patch-via-push:10: `git push -o patch.message=Add things #1 -o patch.message=See commits for details. rad HEAD:refs/patches` @ /tmp/.tmptud6rv/alice/work
1774961973 test: rad-patch-via-push:22: `rad patch show 6035d2f582afbe01ff23ea87528ae523d76875b6` @ /tmp/.tmptud6rv/alice/work
1774961973 test: rad-patch-via-push:45: `git branch -vv` @ /tmp/.tmptud6rv/alice/work
1774961973 test: rad-patch-via-push:53: `git status --short --branch` @ /tmp/.tmptud6rv/alice/work
1774961973 test: rad-patch-via-push:55: `git fetch` @ /tmp/.tmptud6rv/alice/work
1774961973 test: rad-patch-via-push:56: `git push` @ /tmp/.tmptud6rv/alice/work
1774961973 test: rad-patch-via-push:62: `git show-ref` @ /tmp/.tmptud6rv/alice/work
thread 'commands::patch::rad_patch_via_push' panicked at crates/radicle-cli-test/src/lib.rs:502:36:
--- Expected
++++ actual: stdout
1 1 | 42d894a83c9c356552a57af09ccdbd5587a99045 refs/heads/feature/1
2 2 | f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
3 - f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/remotes/rad/HEAD
4 3 | f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/remotes/rad/master
5 4 | 42d894a83c9c356552a57af09ccdbd5587a99045 refs/remotes/rad/patches/6035d2f582afbe01ff23ea87528ae523d76875b6
Exit status: 0
failures:
commands::patch::rad_patch_fetch_2
commands::patch::rad_patch_via_push
test result: FAILED. 111 passed; 2 failed; 2 ignored; 0 measured; 0 filtered out; finished in 68.80s
error: test failed, to rerun pass `-p radicle-cli --test commands`
Running unittests src/lib.rs (target/debug/deps/radicle_cli_test-90338f9c3e553cbf)
running 3 tests
test tests::test_parse ... ok
test tests::test_run ... ok
test tests::test_example_spaced_brackets ... ok
test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_cob-471feae7c52155c6)
running 9 tests
test object::tests::test_serde ... ok
test tests::git::list_cobs ... ok
test tests::git::traverse_cobs ... ok
test tests::invalid_parse_refstr ... ok
test type_name::test::invalid_typenames ... ok
test type_name::test::valid_typenames ... ok
test tests::git::roundtrip ... ok
test tests::git::update_cob ... ok
test tests::parse_refstr ... ok
test result: ok. 9 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.01s
Running unittests src/lib.rs (target/debug/deps/radicle_core-71c543e62475a20f)
running 4 tests
test repo::test::invalid ... ok
test repo::test::valid ... ok
test repo::test::assert_prop_roundtrip_parse ... ok
test repo::serde_impls::test::assert_prop_roundtrip_serde_json ... ok
test result: ok. 4 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_crypto-a664afb80ffca618)
running 12 tests
test ssh::fmt::test::test_key ... ok
test ssh::fmt::test::test_fingerprint ... ok
test ssh::keystore::tests::test_init_no_passphrase ... ok
test ssh::test::prop_encode_decode_sk ... ok
test ssh::test::test_agent_encoding_remove ... ok
test ssh::test::test_agent_encoding_sign ... ok
test tests::prop_encode_decode ... ok
test tests::test_e25519_dh ... ok
test tests::test_encode_decode ... ok
test tests::prop_key_equality ... ok
test ssh::keystore::tests::test_signer ... ok
test ssh::keystore::tests::test_init_passphrase ... ok
test result: ok. 12 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.83s
Running unittests src/lib.rs (target/debug/deps/radicle_dag-05f7457e7194a495)
running 20 tests
test tests::test_contains ... ok
test tests::test_dependencies ... ok
test tests::test_cycle ... ok
test tests::test_diamond ... ok
test tests::test_fold_diamond ... ok
test tests::test_fold_multiple_roots ... ok
test tests::test_complex ... ok
test tests::test_fold_sorting_1 ... ok
test tests::test_fold_reject ... ok
test tests::test_get ... ok
test tests::test_fold_sorting_2 ... ok
test tests::test_len ... ok
test tests::test_merge_1 ... ok
test tests::test_is_empty ... ok
test tests::test_merge_2 ... ok
test tests::test_prune_1 ... ok
test tests::test_prune_2 ... ok
test tests::test_prune_by_sorting ... ok
test tests::test_remove ... ok
test tests::test_siblings ... ok
test result: ok. 20 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_fetch-ce82cb5d8ca597dc)
running 1 test
test stage::test::valid_refspecs ... ok
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_git_metadata-f234fa7eabe06ba6)
running 24 tests
test commit::parse::test::error::invalid_author ... ok
test commit::parse::test::error::invalid_committer ... ok
test commit::parse::test::error::invalid_format_continuation_without_preceding_header ... ok
test commit::parse::test::error::invalid_tree ... ok
test commit::parse::test::error::missing_committer ... ok
test commit::parse::test::error::invalid_parent ... ok
test commit::parse::test::error::missing_header_body_separator ... ok
test commit::parse::test::error::missing_author ... ok
test commit::parse::test::error::missing_tree_empty_header ... ok
test commit::parse::test::error::missing_tree_wrong_first_line ... ok
test commit::parse::test::success::commit_gpgsig_is_preserved_and_strip_removes_it ... ok
test commit::parse::test::success::commit_last_paragraph_kept_in_message_when_not_all_trailers ... ok
test commit::parse::test::success::commit_with_extra_headers ... ok
test commit::parse::test::success::commit_with_trailers ... ok
test commit::parse::test::success::merge_commit ... ok
test commit::parse::test::success::commit_with_multiline_gpgsig ... ok
test commit::parse::test::success::commit_with_single_parent ... ok
test commit::parse::test::success::root_commit ... ok
test commit::parse::test::success::roundtrip ... ok
test commit::parse::test::unit::trailers_accepts_empty_input ... ok
test commit::parse::test::unit::trailers_rejects_invalid_token_chars ... ok
test commit::parse::test::unit::trailers_rejects_line_without_separator ... ok
test commit::parse::test::unit::body_last_paragraph_not_trailers_stays_in_message ... ok
test commit::parse::test::unit::body_no_paragraph_separator_means_no_trailers ... ok
test result: ok. 24 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_git_ref_format-09d2e35a065977f7)
running 9 tests
test test::component ... ok
test test::component_invalid - should panic ... ok
test test::qualified ... ok
test test::pattern ... ok
test test::qualified_invalid - should panic ... ok
test test::qualified_pattern ... ok
test test::qualified_pattern_invalid - should panic ... ok
test test::refname_invalid - should panic ... ok
test test::refname ... ok
test result: ok. 9 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_localtime-f75e94d3ba02c400)
running 1 test
test serde_impls::test::test_localtime ... ok
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_node-923986bb67f5d933)
running 79 tests
test reactor::timer::tests::test_next ... ok
test reactor::timer::tests::test_wake ... ok
test reactor::timer::tests::test_wake_exact ... ok
test control::tests::test_control_socket ... ok
test control::tests::test_seed_unseed ... ok
test fingerprint::tests::matching ... ok
test tests::e2e::fetch_does_not_contain_rad_sigrefs_parent ... ok
test tests::e2e::missing_default_branch ... ok
test tests::e2e::missing_delegate_default_branch ... ok
test tests::e2e::test_background_foreground_fetch ... ok
test tests::e2e::test_block_prevents_connection ... ok
test tests::e2e::test_block_active_connection ... ok
test tests::e2e::test_block_prevents_fetch ... ok
test tests::e2e::test_channel_reader_limit ... ok
test tests::e2e::test_catchup_on_refs_announcements ... ok
test tests::e2e::test_clone ... ok
test tests::e2e::test_dont_fetch_owned_refs ... ok
test tests::e2e::test_fetch_followed_remotes ... ok
test tests::e2e::test_connection_crossing ... ok
test tests::e2e::test_concurrent_fetches ... ok
test tests::e2e::test_fetch_preserve_owned_refs ... ok
test tests::e2e::test_fetch_unseeded ... ok
test tests::e2e::test_fetch_up_to_date ... ok
test tests::e2e::test_inventory_sync_basic ... ok
test tests::e2e::test_fetch_emits_canonical_ref_update ... ok
test tests::e2e::test_large_fetch ... ok
test tests::e2e::test_migrated_clone ... ok
test tests::e2e::test_missing_remote ... ok
test tests::e2e::test_multiple_offline_inits ... ok
test tests::e2e::test_non_fastforward_identity_doc ... ok
test tests::e2e::test_non_fastforward_sigrefs ... ok
test tests::e2e::test_outdated_delegate_sigrefs ... ok
test tests::e2e::test_outdated_sigrefs ... ok
test tests::e2e::test_replication ... ok
test tests::e2e::test_replication_invalid ... ok
test tests::e2e::test_inventory_sync_bridge ... ok
test tests::e2e::test_inventory_sync_ring ... ok
test tests::e2e::test_replication_ref_in_sigrefs ... ok
test tests::e2e::test_inventory_sync_star ... ok
test tests::test_announcement_rebroadcast ... ok
test tests::test_announcement_rebroadcast_timestamp_filtered ... ok
test tests::test_announcement_rebroadcast_duplicates ... ok
test tests::test_connection_kept_alive ... ok
test tests::test_announcement_relay ... ok
test tests::test_disconnecting_unresponsive_peer ... ok
test tests::test_fetch_missing_inventory_on_gossip ... ok
test tests::test_fetch_missing_inventory_on_schedule ... ok
test tests::test_inbound_connection ... ok
test tests::test_inventory_decode ... ok
test tests::test_init_and_seed ... ok
test tests::test_inventory_relay ... ok
test tests::test_inventory_relay_bad_timestamp ... ok
test tests::test_inventory_sync ... ok
test tests::test_maintain_connections ... ok
test tests::test_maintain_connections_failed_attempt ... ok
test tests::test_maintain_connections_transient ... ok
test tests::test_outbound_connection ... ok
test tests::test_inventory_pruning ... ok
test tests::test_persistent_peer_connect ... ok
test tests::test_persistent_peer_reconnect_attempt ... ok
test tests::test_persistent_peer_reconnect_success ... ok
test tests::test_ping_response ... ok
test tests::test_queued_fetch_from_ann_same_rid ... ok
test tests::test_queued_fetch_max_capacity ... ok
test tests::test_queued_fetch_from_command_same_rid ... ok
test tests::test_redundant_connect ... ok
test tests::test_refs_announcement_fetch_trusted_no_inventory ... ok
test tests::test_refs_announcement_followed ... ok
test tests::test_refs_announcement_no_subscribe ... ok
test tests::test_refs_announcement_offline ... ok
test tests::prop_inventory_exchange_dense ... ok
test tests::test_refs_announcement_relay_private ... ok
test tests::test_announcement_message_amplification ... ok
test tests::test_refs_synced_event ... ok
test wire::test::test_inventory_ann_with_extension ... ok
test wire::test::test_pong_message_with_extension ... ok
test tests::test_seeding ... ok
test tests::test_refs_announcement_relay_public ... ok
test tests::test_seed_repo_subscribe ... ok
test result: ok. 79 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 14.63s
Running unittests src/main.rs (target/debug/deps/radicle_node-52da137663fa7390)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_oid-8a3ece19594f1498)
running 10 tests
test fmt::test::fixture ... ok
test fmt::test::zero ... ok
test git2::test::zero ... ok
test gix::test::zero ... ok
test fmt::test::git2 ... ok
test fmt::test::gix ... ok
test str::test::fixture ... ok
test str::test::zero ... ok
test str::test::git2_roundtrip ... ok
test str::test::gix_roundrip ... ok
test result: ok. 10 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_protocol-545fe92253769780)
running 99 tests
test deserializer::test::test_unparsed ... ok
test deserializer::test::test_decode_next ... ok
test deserializer::test::prop_decode_next ... ok
test fetcher::service::tests::test_fetch_coalescing_different_refs ... ok
test fetcher::test::queue::properties::capacity::bounded ... ok
test fetcher::test::queue::properties::capacity::rejection ... ok
test fetcher::test::queue::properties::dequeue::empty_queue_returns_none ... ok
test fetcher::test::queue::properties::dequeue::enables_reenqueue ... ok
test fetcher::test::queue::properties::dequeue::drained_queue_returns_none ... ok
test fetcher::test::queue::properties::capacity::capacity_reached_returns_same_item ... ok
test fetcher::test::queue::properties::capacity::restored_after_dequeue ... ok
test fetcher::test::queue::properties::fifo::interleaved_operations ... ok
test fetcher::test::queue::properties::fifo::ordering ... ok
test fetcher::test::queue::properties::equality::reflexive ... ok
test fetcher::test::queue::properties::merge::different_rid_accepted ... ok
test fetcher::test::queue::properties::equality::symmetric ... ok
test fetcher::test::queue::properties::equality::transitive ... ok
test fetcher::test::queue::properties::merge::longer_timeout_preserved ... ok
test fetcher::test::queue::properties::merge::combines_refs ... ok
test fetcher::test::queue::properties::merge::does_not_increase_queue_length ... ok
test fetcher::test::queue::unit::capacity_takes_precedence_over_merge_for_new_items ... ok
test fetcher::test::queue::unit::empty_refs_items_can_be_equal ... ok
test fetcher::test::queue::unit::max_timeout_accepted ... ok
test fetcher::test::queue::unit::merge_preserves_position_in_queue ... ok
test fetcher::test::queue::unit::zero_timeout_accepted ... ok
test fetcher::test::state::command::cancel::cancellation_is_isolated ... ok
test fetcher::test::state::command::cancel::non_existent_returns_unexpected ... ok
test fetcher::test::state::command::cancel::ongoing_and_queued ... ok
test fetcher::test::state::command::cancel::single_ongoing ... ok
test fetcher::test::state::command::fetch::fetch_after_previous_completed ... ok
test fetcher::test::state::command::fetch::fetch_at_capacity_enqueues ... ok
test fetcher::test::state::command::fetch::fetch_different_repo_same_node_within_capacity ... ok
test fetcher::test::state::command::fetch::fetch_duplicate_returns_already_fetching ... ok
test fetcher::test::state::command::fetch::fetch_queue_merge_empty_refs_fetches_all ... ok
test fetcher::test::state::command::fetch::fetch_queue_merge_takes_longer_timeout ... ok
test fetcher::test::queue::properties::merge::succeed_when_at_capacity ... ok
test fetcher::test::state::command::fetch::fetch_queue_merges_already_queued ... ok
test fetcher::test::state::command::fetch::fetch_queue_rejected_capacity_reached ... ok
test fetcher::test::state::command::fetch::fetch_same_repo_different_nodes_queues_second ... ok
test fetcher::test::state::command::fetch::fetch_start_first_fetch_for_node ... ok
test fetcher::test::state::command::fetch::fetch_same_repo_different_refs_enqueues ... ok
test fetcher::test::state::command::fetched::complete_single_ongoing ... ok
test fetcher::test::state::command::fetched::complete_one_of_multiple ... ok
test fetcher::test::queue::properties::merge::empty_refs_fetches_all ... ok
test fetcher::test::state::command::fetched::complete_then_dequeue_fifo ... ok
test fetcher::test::state::command::fetched::non_existent_returns_not_found ... ok
test fetcher::test::state::concurrent::fetched_then_cancel ... ok
test fetcher::test::state::concurrent::interleaved_operations ... ok
test fetcher::test::state::config::min_queue_size ... ok
test fetcher::test::state::dequeue::empty_queue_returns_none ... ok
test fetcher::test::state::dequeue::cannot_dequeue_while_node_at_capacity ... ok
test fetcher::test::state::invariant::queue_integrity_after_merge ... ok
test fetcher::test::state::dequeue::maintains_fifo_order ... ok
test fetcher::test::state::multinode::independent_queues ... ok
test service::filter::test::compatible ... ok
test service::filter::test::test_parameters ... ok
test fetcher::test::queue::properties::merge::same_rid_merges_anywhere_in_queue ... ok
test service::gossip::store::test::test_announced ... ok
test service::filter::test::test_sizes ... ok
test service::limiter::test::test_limiter_multi ... ok
test service::limiter::test::test_limiter_different_rates ... ok
test service::limiter::test::test_limiter_refill ... ok
test service::message::tests::test_inventory_limit ... ok
test fetcher::test::state::config::high_concurrency ... ok
test service::message::tests::test_ref_remote_limit ... ok
test wire::frame::test::test_encode_git_large ... ok
test wire::frame::test::test_stream_id ... ok
test fetcher::test::state::multinode::high_count ... ok
test wire::message::tests::prop_roundtrip_address ... ok
test service::message::tests::prop_refs_announcement_signing ... ok
test wire::message::tests::prop_zero_bytes_encode_decode ... ok
test wire::message::tests::test_inv_ann_max_size ... ok
test wire::message::tests::test_node_ann_max_size ... ok
test wire::message::tests::test_ping_encode_size_overflow - should panic ... ok
test wire::message::tests::test_pingpong_encode_max_size ... ok
test wire::message::tests::test_pong_encode_size_overflow - should panic ... ok
test wire::message::tests::prop_roundtrip_message ... ok
test wire::tests::prop_oid ... ok
test wire::tests::prop_roundtrip_filter ... ok
test wire::tests::prop_roundtrip_publickey ... ok
test wire::tests::prop_roundtrip_refs ... ok
test wire::tests::prop_roundtrip_repoid ... ok
test wire::tests::prop_roundtrip_tuple ... ok
test wire::tests::prop_roundtrip_u16 ... ok
test wire::tests::prop_roundtrip_u32 ... ok
test wire::tests::prop_roundtrip_u64 ... ok
test wire::tests::prop_roundtrip_vec ... ok
test wire::tests::prop_signature ... ok
test wire::tests::prop_string ... ok
test wire::tests::test_alias ... ok
test wire::tests::test_bounded_vec_limit ... ok
test wire::tests::test_filter_invalid ... ok
test wire::tests::test_string ... ok
test wire::varint::test::prop_roundtrip_varint ... ok
test wire::varint::test::test_encode_overflow - should panic ... ok
test wire::varint::test::test_encoding ... ok
test wire::message::tests::test_refs_ann_max_size ... ok
test wire::message::tests::prop_message_decoder ... ok
test service::message::tests::test_node_announcement_validate ... ok
test result: ok. 99 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 1.65s
Running unittests src/main.rs (target/debug/deps/git_remote_rad-7056cd80ed1448fe)
running 12 tests
test protocol::tests::test_empty ... ok
test protocol::tests::test_fetch ... ok
test protocol::tests::test_capabilities ... ok
test protocol::tests::test_invalid ... ok
test protocol::tests::test_list ... ok
test protocol::tests::test_fetch_whitespace ... ok
test protocol::tests::test_list_for_push ... ok
test protocol::tests::test_option ... ok
test protocol::tests::test_option_whitespace_preservation ... ok
test protocol::tests::test_push ... ok
test protocol::tests::test_push_delete ... ok
test protocol::tests::test_push_force ... ok
test result: ok. 12 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/main.rs (target/debug/deps/radicle_schemars-7ceddc08b92aed27)
Running unittests src/lib.rs (target/debug/deps/radicle_signals-1a2ca7fd33a640da)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_ssh-9f14aadafa88ba9c)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_systemd-e2cf2d080022d36d)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_term-0b9f55c733b570cc)
running 21 tests
test ansi::tests::colors_disabled ... ok
test ansi::tests::colors_enabled ... ok
test ansi::tests::wrapping ... ok
test cell::test::test_width ... ok
test element::test::test_spaced ... ok
test element::test::test_width ... ok
test element::test::test_truncate ... ok
test table::test::test_table_border ... ok
test table::test::test_table ... ok
test table::test::test_table_border_maximized ... ok
test table::test::test_table_border_truncated ... ok
test table::test::test_table_truncate ... ok
test table::test::test_table_unicode ... ok
test table::test::test_table_unicode_truncate ... ok
test table::test::test_truncate ... ok
test textarea::test::test_wrapping_fenced_block ... ok
test textarea::test::test_wrapping_code_block ... ok
test textarea::test::test_wrapping_paragraphs ... ok
test textarea::test::test_wrapping ... ok
test vstack::test::test_vstack ... ok
test vstack::test::test_vstack_maximize ... ok
test result: ok. 21 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_windows-2c067555aa9e0165)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle
running 1 test
test crates/radicle/src/cob/patch/encoding/review.rs - cob::patch::encoding::review::Review (line 23) ... ignored
test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_cli
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_cli_test
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_cob
running 1 test
test crates/radicle-cob/src/backend/stable.rs - backend::stable::with_advanced_timestamp (line 56) ... ignored
test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_core
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_crypto
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_dag
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_fetch
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_git_metadata
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_git_ref_format
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_localtime
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_node
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_oid
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_protocol
running 6 tests
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::collect_from (line 30) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::truncate (line 50) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::max (line 96) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::push (line 122) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::unbound (line 149) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::with_capacity (line 66) ... ok
test result: ok. 6 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_signals
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_ssh
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_systemd
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_term
running 1 test
test crates/radicle-term/src/table.rs - table (line 4) ... ok
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_windows
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
error: 1 target failed:
`-p radicle-cli --test commands`
Exit code: 101
{
"response": "finished",
"result": "failure"
}