From f1b3fcc40ab666d8def97096d1942c274da9b279 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 11 Jun 2024 16:21:44 +0100 Subject: chore: bump rust-nostr to v0.32.0 both nostr and nostr-sdk packages and also in test_utils fix the many breaking changes fix: ignore trailing slash when depuplicate relays for send events. this was picked up as TagStandard::RelayMetadata has started adding a traling slash. refactor cli output test function `expect_send_with_progress` so that relays can succeed / fail in a random order --- tests/init.rs | 26 +++++++++++++------------- tests/list.rs | 1 + tests/send.rs | 16 ++++++++-------- 3 files changed, 22 insertions(+), 21 deletions(-) (limited to 'tests') diff --git a/tests/init.rs b/tests/init.rs index 1beeaa5..43d5637 100644 --- a/tests/init.rs +++ b/tests/init.rs @@ -136,7 +136,7 @@ mod when_repo_not_previously_claimed { relay .events .iter() - .filter(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .count(), 1, ); @@ -153,7 +153,7 @@ mod when_repo_not_previously_claimed { relay .events .iter() - .filter(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .count(), 1, ); @@ -170,7 +170,7 @@ mod when_repo_not_previously_claimed { relay .events .iter() - .filter(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .count(), 1, ); @@ -185,7 +185,7 @@ mod when_repo_not_previously_claimed { assert_eq!( r57.events .iter() - .filter(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .count(), 1, ); @@ -286,7 +286,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .unwrap(); assert!( @@ -306,7 +306,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .unwrap(); assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("r") @@ -323,7 +323,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .unwrap(); assert!( @@ -344,7 +344,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .unwrap(); assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("alt") @@ -361,7 +361,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .unwrap(); assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("description") @@ -378,7 +378,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .unwrap(); assert!( @@ -397,7 +397,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .unwrap(); let relays_tag = event .tags @@ -419,7 +419,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .unwrap(); let web_tag = event .tags @@ -441,7 +441,7 @@ mod when_repo_not_previously_claimed { let event: &nostr::Event = relay .events .iter() - .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) + .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND)) .unwrap(); let maintainers_tag = event .tags diff --git a/tests/list.rs b/tests/list.rs index 61c2201..cd071a9 100644 --- a/tests/list.rs +++ b/tests/list.rs @@ -181,6 +181,7 @@ mod cannot_find_repo_event { event_id: repo_event.id, author: Some(TEST_KEY_1_KEYS.public_key()), relays: vec!["ws://localhost:8056".to_string()], + kind: None, } .to_bech32()?, )?; diff --git a/tests/send.rs b/tests/send.rs index aa16949..22216a8 100644 --- a/tests/send.rs +++ b/tests/send.rs @@ -82,12 +82,12 @@ mod when_commits_behind_ask_to_proceed { } fn is_cover_letter(event: &nostr::Event) -> bool { - event.kind.as_u64().eq(&PATCH_KIND) + event.kind.as_u16().eq(&PATCH_KIND) && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) } fn is_patch(event: &nostr::Event) -> bool { - event.kind.as_u64().eq(&PATCH_KIND) + event.kind.as_u16().eq(&PATCH_KIND) && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) } @@ -393,12 +393,12 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ #[tokio::test] #[serial] async fn p_tags_for_maintainers() -> Result<()> { - let maintainers = &generate_repo_ref_event() + let event = generate_repo_ref_event(); + let maintainers = &event .iter_tags() .find(|t| t.as_vec()[0].eq(&"maintainers")) .unwrap() - .as_vec() - .clone()[1..]; + .as_vec()[1..]; let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { for m in maintainers { @@ -546,12 +546,12 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ #[tokio::test] #[serial] async fn p_tags_for_maintainers() -> Result<()> { - let maintainers = &generate_repo_ref_event() + let event = generate_repo_ref_event(); + let maintainers = &event .iter_tags() .find(|t| t.as_vec()[0].eq(&"maintainers")) .unwrap() - .as_vec() - .clone()[1..]; + .as_vec()[1..]; for m in maintainers { assert!( prep() -- cgit v1.2.3