From 8638b321fdff94d034ec912ecd0910b6f564ff04 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Wed, 24 Jul 2024 16:37:10 +0100 Subject: refactor: use nip34 kinds from rust-nostr instead of Kind::Custom(u16) as v33 of rust-nostr introduced them --- tests/init.rs | 30 ++++++++++++++++-------------- tests/list.rs | 2 +- tests/send.rs | 19 +++++++++++-------- 3 files changed, 28 insertions(+), 23 deletions(-) (limited to 'tests') diff --git a/tests/init.rs b/tests/init.rs index 7e2e080..afd3848 100644 --- a/tests/init.rs +++ b/tests/init.rs @@ -1,4 +1,5 @@ use anyhow::Result; +use nostr_sdk::Kind; use serial_test::serial; use test_utils::{git::GitTestRepo, *}; @@ -124,6 +125,7 @@ mod when_repo_not_previously_claimed { } mod sent_to_correct_relays { + use super::*; #[tokio::test] @@ -135,7 +137,7 @@ mod when_repo_not_previously_claimed { relay .events .iter() - .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .filter(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .count(), 1, ); @@ -152,7 +154,7 @@ mod when_repo_not_previously_claimed { relay .events .iter() - .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .filter(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .count(), 1, ); @@ -169,7 +171,7 @@ mod when_repo_not_previously_claimed { relay .events .iter() - .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .filter(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .count(), 1, ); @@ -184,7 +186,7 @@ mod when_repo_not_previously_claimed { assert_eq!( r57.events .iter() - .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .filter(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .count(), 1, ); @@ -324,7 +326,7 @@ mod when_repo_not_previously_claimed { .value() .unwrap(), Coordinate { - kind: nostr_sdk::Kind::Custom(REPOSITORY_KIND), + kind: nostr_sdk::Kind::GitRepoAnnouncement, identifier: "example-identifier".to_string(), public_key: TEST_KEY_1_KEYS.public_key(), relays: vec![], @@ -367,7 +369,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); assert!( @@ -387,7 +389,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("r") @@ -405,7 +407,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); assert!( @@ -426,7 +428,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("alt") @@ -443,7 +445,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("description") @@ -460,7 +462,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); assert!( @@ -479,7 +481,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); let relays_tag = event .tags @@ -501,7 +503,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); let web_tag = event .tags @@ -523,7 +525,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); let maintainers_tag = event .tags diff --git a/tests/list.rs b/tests/list.rs index 6e509ac..ce90ee4 100644 --- a/tests/list.rs +++ b/tests/list.rs @@ -88,7 +88,7 @@ mod cannot_find_repo_event { let mut input = p.expect_input("repository naddr")?; input.succeeds_with( &Coordinate { - kind: nostr::Kind::Custom(REPOSITORY_KIND), + kind: nostr::Kind::GitRepoAnnouncement, public_key: TEST_KEY_1_KEYS.public_key(), identifier: repo_event.identifier().unwrap().to_string(), relays: vec!["ws://localhost:8056".to_string()], diff --git a/tests/send.rs b/tests/send.rs index 0f18bd1..57987e3 100644 --- a/tests/send.rs +++ b/tests/send.rs @@ -1,5 +1,6 @@ use anyhow::Result; use futures::join; +use nostr_sdk::Kind; use serial_test::serial; use test_utils::{git::GitTestRepo, relay::Relay, *}; @@ -84,13 +85,11 @@ mod when_commits_behind_ask_to_proceed { } fn is_cover_letter(event: &nostr::Event) -> bool { - event.kind.as_u16().eq(&PATCH_KIND) - && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) + event.kind.eq(&Kind::GitPatch) && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) } fn is_patch(event: &nostr::Event) -> bool { - event.kind.as_u16().eq(&PATCH_KIND) - && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) + event.kind.eq(&Kind::GitPatch) && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) } fn prep_git_repo() -> Result { @@ -386,12 +385,14 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a") && t.as_vec()[1].eq(&format!( - "{REPOSITORY_KIND}:{TEST_KEY_1_PUBKEY_HEX}:{}", + "{}:{TEST_KEY_1_PUBKEY_HEX}:{}", + Kind::GitRepoAnnouncement, generate_repo_ref_event().identifier().unwrap() )))); assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a") && t.as_vec()[1].eq(&format!( - "{REPOSITORY_KIND}:{TEST_KEY_2_PUBKEY_HEX}:{}", + "{}:{TEST_KEY_2_PUBKEY_HEX}:{}", + Kind::GitRepoAnnouncement, generate_repo_ref_event().identifier().unwrap() )))); } @@ -577,14 +578,16 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ assert!(prep().await?.tags.iter().any(|t| { t.as_vec()[0].eq("a") && t.as_vec()[1].eq(&format!( - "{REPOSITORY_KIND}:{TEST_KEY_1_PUBKEY_HEX}:{}", + "{}:{TEST_KEY_1_PUBKEY_HEX}:{}", + Kind::GitRepoAnnouncement, generate_repo_ref_event().identifier().unwrap() )) })); assert!(prep().await?.tags.iter().any(|t| { t.as_vec()[0].eq("a") && t.as_vec()[1].eq(&format!( - "{REPOSITORY_KIND}:{TEST_KEY_2_PUBKEY_HEX}:{}", + "{}:{TEST_KEY_2_PUBKEY_HEX}:{}", + Kind::GitRepoAnnouncement, generate_repo_ref_event().identifier().unwrap() )) })); -- cgit v1.2.3