From 82f1ba360b60c8339c7caea0dec7903ee5e764cd Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Wed, 1 Nov 2023 00:00:00 +0000 Subject: refactor(claim) move repo_ref.rs file created in the wrong folder in error --- src/sub_commands/claim.rs | 2 +- src/sub_commands/mod.rs | 1 - src/sub_commands/repo_ref.rs | 116 ------------------------------------------- 3 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 src/sub_commands/repo_ref.rs (limited to 'src/sub_commands') diff --git a/src/sub_commands/claim.rs b/src/sub_commands/claim.rs index 9a38f56..c0d26dd 100644 --- a/src/sub_commands/claim.rs +++ b/src/sub_commands/claim.rs @@ -10,7 +10,7 @@ use crate::{ client::Connect, git::{Repo, RepoActions}, login, - sub_commands::repo_ref::RepoRef, + repo_ref::RepoRef, Cli, }; diff --git a/src/sub_commands/mod.rs b/src/sub_commands/mod.rs index 9e9f602..6e99ca5 100644 --- a/src/sub_commands/mod.rs +++ b/src/sub_commands/mod.rs @@ -1,4 +1,3 @@ pub mod claim; pub mod login; pub mod prs; -pub mod repo_ref; diff --git a/src/sub_commands/repo_ref.rs b/src/sub_commands/repo_ref.rs deleted file mode 100644 index 3b0b1b4..0000000 --- a/src/sub_commands/repo_ref.rs +++ /dev/null @@ -1,116 +0,0 @@ -use anyhow::{Context, Result}; -use nostr::Tag; - -#[derive(Default)] -pub struct RepoRef { - pub name: String, - pub description: String, - pub root_commit: String, - pub relays: Vec, - // git_server: String, - // other maintainers - // code languages and hashtags -} - -impl RepoRef { - pub fn to_event(&self, keys: &nostr::Keys) -> Result { - nostr_sdk::EventBuilder::new( - nostr::event::Kind::Custom(30017), - "", - &[ - vec![ - Tag::Identifier(self.root_commit.to_string()), - Tag::Reference(format!("r-{}", self.root_commit)), - Tag::Name(self.name.clone()), - Tag::Description(self.description.clone()), - ], - self.relays.iter().map(|r| Tag::Relay(r.into())).collect(), - // git_servers - // other maintainers - // code languages and hashtags - ] - .concat(), - ) - .to_event(keys) - .context("failed to create repository reference event") - } -} - -#[cfg(test)] -mod tests { - use test_utils::*; - - use super::*; - - fn create() -> nostr::Event { - RepoRef { - name: "test name".to_string(), - description: "test description".to_string(), - root_commit: "23471389461".to_string(), - relays: vec!["ws://relay1.io".to_string(), "ws://relay2.io".to_string()], - } - .to_event(&TEST_KEY_1_KEYS) - .unwrap() - } - - mod to_event { - use super::*; - mod tags { - use super::*; - - #[test] - fn name() { - assert!( - create() - .tags - .iter() - .any(|t| t.as_vec()[0].eq("name") && t.as_vec()[1].eq("test name")) - ) - } - #[test] - fn description() { - assert!(create().tags.iter().any( - |t| t.as_vec()[0].eq("description") && t.as_vec()[1].eq("test description") - )) - } - - #[test] - fn root_commit_as_d_replaceable_event_identifier() { - assert!( - create() - .tags - .iter() - .any(|t| t.as_vec()[0].eq("d") && t.as_vec()[1].eq("23471389461")) - ) - } - - #[test] - fn root_commit_as_reference() { - assert!( - create() - .tags - .iter() - .any(|t| t.as_vec()[0].eq("r") && t.as_vec()[1].eq("r-23471389461")) - ) - } - - #[test] - fn relays() { - let event = create(); - let relay_tags = event - .tags - .iter() - .filter(|t| t.as_vec()[0].eq("relay")) - .collect::>(); - assert_eq!(relay_tags[0].as_vec().len(), 2); - assert_eq!(relay_tags[0].as_vec()[1], "ws://relay1.io"); - assert_eq!(relay_tags[1].as_vec()[1], "ws://relay2.io"); - } - - #[test] - fn no_other_tags() { - assert_eq!(create().tags.len(), 6) - } - } - } -} -- cgit v1.2.3