Radish alpha
r
radicle-ci-broker
rad:zwTxygwuz5LDGBq255RA2CbNGrz8
Radicle CI broker
Radicle
Git
Patches › ac14d9f1
refactor: simplify patch related constructors for CiEvent
Merged liw opened 1 year ago

Signed-off-by: Lars Wirzenius liw@liw.fi

Activity Changes +8 -22
2 files changed +8 -22 a01aa8ce → 08bcf703
modified src/bin/cibtoolcmd/event.rs
@@ -211,11 +211,9 @@ impl Leaf for AddEvent {
            EventKind::PatchCreated => {

                if let Some(patch_id) = &self.patch_id {

                    CiEvent::patch_created(nid, rid, *patch_id, oid)
- 
                        .map_err(CibToolError::CiEvent)?

                } else if let Some(filename) = &self.patch_id_file {

                    let patch_id = read_file_as_objectid(filename)?;

                    CiEvent::patch_created(nid, rid, patch_id, oid)
- 
                        .map_err(CibToolError::CiEvent)?

                } else {

                    return Err(CibToolError::PatchIdRequired);

                }
@@ -223,11 +221,9 @@ impl Leaf for AddEvent {
            EventKind::PatchUpdated => {

                if let Some(patch_id) = &self.patch_id {

                    CiEvent::patch_updated(nid, rid, *patch_id, oid)
- 
                        .map_err(CibToolError::CiEvent)?

                } else if let Some(filename) = &self.patch_id_file {

                    let patch_id = read_file_as_objectid(filename)?;

                    CiEvent::patch_created(nid, rid, patch_id, oid)
- 
                        .map_err(CibToolError::CiEvent)?

                } else {

                    return Err(CibToolError::PatchIdRequired);

                }
modified src/ci_event.rs
@@ -104,32 +104,22 @@ impl CiEvent {
        }))

    }
- 
    pub fn patch_created(
- 
        from_node: NodeId,
- 
        repo: RepoId,
- 
        patch: PatchId,
- 
        tip: Oid,
- 
    ) -> Result<Self, CiEventError> {
- 
        Ok(Self::V1(CiEventV1::PatchCreated {
+ 
    pub fn patch_created(from_node: NodeId, repo: RepoId, patch: PatchId, tip: Oid) -> Self {
+ 
        Self::V1(CiEventV1::PatchCreated {

            from_node,

            repo,

            patch,

            new_tip: tip,
- 
        }))
+ 
        })

    }
- 
    pub fn patch_updated(
- 
        from_node: NodeId,
- 
        repo: RepoId,
- 
        patch: PatchId,
- 
        new_tip: Oid,
- 
    ) -> Result<Self, CiEventError> {
- 
        Ok(Self::V1(CiEventV1::PatchUpdated {
+ 
    pub fn patch_updated(from_node: NodeId, repo: RepoId, patch: PatchId, new_tip: Oid) -> Self {
+ 
        Self::V1(CiEventV1::PatchUpdated {

            from_node,

            repo,

            patch,

            new_tip,
- 
        }))
+ 
        })

    }



    #[allow(clippy::unwrap_used)]
@@ -146,7 +136,7 @@ impl CiEvent {
                        RefUpdate::Created { name, oid } => {

                            let origin = originator(name.to_ref_string())?;

                            if let Ok(patch_id) = patch_id(name) {
- 
                                Self::patch_created(origin, *rid, patch_id, *oid)?
+ 
                                Self::patch_created(origin, *rid, patch_id, *oid)

                            } else if let Ok(branch) = namespaced_branch(name) {

                                Self::branch_created(origin, *rid, &branch, *oid)?

                            } else {
@@ -156,7 +146,7 @@ impl CiEvent {
                        RefUpdate::Updated { name, old, new } => {

                            let origin = originator(name.to_ref_string())?;

                            if let Ok(patch_id) = patch_id(name) {
- 
                                Self::patch_updated(origin, *rid, patch_id, *new)?
+ 
                                Self::patch_updated(origin, *rid, patch_id, *new)

                            } else if namespaced_branch(name).is_ok() {

                                Self::branch_updated(origin, *rid, name, *new, *old)?

                            } else {