485505c REVIEW: separate out logic of ApplyError — heartwood

Radicle Heartwood Protocol & Stack

REVIEW: separate out logic of ApplyError

✗ CI failure Fintan Halpenny committed 3 months ago

commit 485505ca90c689fe043f471db4b30b17edf1b54c
parent 067ff6819c5f50e8072ad088383c88c5f5736d1e

1 failed (1 total) View logs

2 files changed +34 -9

modified crates/radicle-cli/examples/rad-id-unauthorized-delegate.md

@@ -3,5 +3,6 @@ Alice has created a new repository `rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji` with only

 ``` ~bob (fail)
 $ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add myself!" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm
 ✗ Error: did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk is not a delegate, and only delegates are allowed to create a revision
 ✗ Hint: bob (you) is attempting to modify the identity document but isn't a delegate!
 ```

modified crates/radicle-cli/src/commands/id.rs

@@ -19,6 +19,7 @@ use crate::git::unified_diff::Encode as _;

 use crate::git::Rev;
 use crate::terminal as term;
 use crate::terminal::args::Error;
 use crate::terminal::format::Author;
 use crate::terminal::patch::Message;
 pub use args::Args;

@@ -193,7 +194,14 @@ 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)?;
             let revision = update(
                 title,
                 description,
                 proposal,
                 &mut identity,
                 &signer,
                 &profile,
             )?;
             if revision.is_accepted() && revision.parent == Some(current.id) {
                 // Update the canonical head to point to the latest accepted revision.

@@ -420,6 +428,7 @@ fn update<R, G>(

     doc: Doc,
     current: &mut IdentityMut<R>,
     signer: &Device<G>,
     profile: &Profile,
 ) -> anyhow::Result<Revision>
 where
     R: WriteRepository + cob::Store<Namespace = NodeId>,

@@ -428,7 +437,7 @@ where

     if let Some((title, description)) = edit_title_description(title, description)? {
         let id = current
             .update(title, description, &doc, signer)
             .map_err(on_identity_err)?;
             .map_err(|e| on_identity_err(e, profile))?;
         let revision = current
             .revision(&id)
             .ok_or(anyhow!("update failed: revision {id} is missing"))?;

@@ -439,16 +448,31 @@ where

     }
 }
 fn on_identity_err(e: identity::Error) -> anyhow::Error {
 fn on_identity_err(e: identity::Error, profile: &Profile) -> anyhow::Error {
     let e = anyhow::Error::from(e);
     let apply_err = e
         .chain()
         .find_map(|c| c.downcast_ref::<identity::ApplyError>());
     e.chain()
         .find_map(|c| c.downcast_ref::<identity::ApplyError>())
         .map(|e| on_apply_err(e, profile))
         .unwrap_or(e)
 }
     match apply_err {
         Some(e @ identity::ApplyError::NonDelegateUnauthorized { .. }) => anyhow!(e.to_string()),
         _ => e,
 fn on_apply_err(e: &identity::ApplyError, profile: &Profile) -> anyhow::Error {
     match e {
         e @ identity::ApplyError::NonDelegateUnauthorized { author, .. } => {
             let nid = NodeId::from(*author);
             let labels = Author::new(&nid, profile, false).labels();
             Error::with_hint(
                 anyhow!(e.to_string()),
                 format!(
                     "{} {} is attempting to modify the identity document but isn't a delegate!",
                     labels.0, labels.1
                 ),
             )
             .into()
         }
         e => anyhow!(e.to_string()),
     }
 }