From a5216602749bff55c2773acce098c91942cd3920 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Wed, 28 Aug 2024 14:20:34 +0100 Subject: chore: bump rust-nostr to v0.34.0 bump all rust-nostr packages I'm not sure I'm completely happy with allowing mutable_key_type but it is just run inside tests it appears that Event didn't have the Copy trait in v0.33.0 so I'm not sure why this warning suddenly appeared the timeout of client.get_events_of needed to be doubled which could indicate that an ineffiency has been introduced in v0.34.0 the primary motivation for upgrading now was to get this fix: nostr:nevent1qqsffl2ld678pjj77rh9k2g4edljmxdu6ew4lvgnglxv7jhu3ru8vvcpp4mhxue69uhkummn9ekx7mqzyzsq3hh327t0h2dq6matqn5064cgj2zanl2stkj6s0lg4t2h5dty6rm2ucm as I suspect it is also effecting other repositories eg nostr-profile-manager --- tests/git_remote_helper.rs | 26 +++++++---- tests/send.rs | 106 ++++++++++++++++++++++++++++++--------------- 2 files changed, 89 insertions(+), 43 deletions(-) (limited to 'tests') diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs index a44b141..07f9ec8 100644 --- a/tests/git_remote_helper.rs +++ b/tests/git_remote_helper.rs @@ -1730,6 +1730,7 @@ mod push { r51.events = events.clone(); r55.events = events.clone(); + #[allow(clippy::mutable_key_type)] let before = r55.events.iter().cloned().collect::>(); let cli_tester_handle = std::thread::spawn(move || -> Result<(String, Oid)> { @@ -1798,7 +1799,8 @@ mod push { .events .iter() .find(|e| { - e.iter_tags() + e.tags() + .iter() .find(|t| t.as_vec()[0].eq("branch-name")) .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1)) }) @@ -1824,7 +1826,8 @@ mod push { .events .iter() .filter(|e| { - e.iter_tags() + e.tags() + .iter() .any(|t| t.as_vec()[1].eq(&proposal.id().to_string())) && e.kind().eq(&Kind::GitPatch) }) @@ -1877,6 +1880,7 @@ mod push { r51.events = events.clone(); r55.events = events.clone(); + #[allow(clippy::mutable_key_type)] let before = r55.events.iter().cloned().collect::>(); let cli_tester_handle = std::thread::spawn(move || -> Result<(String, String)> { @@ -1950,7 +1954,8 @@ mod push { .events .iter() .find(|e| { - e.iter_tags() + e.tags() + .iter() .find(|t| t.as_vec()[0].eq("branch-name")) .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1)) }) @@ -1982,7 +1987,8 @@ mod push { .events .iter() .find(|e| { - e.iter_tags() + e.tags() + .iter() .any(|t| t.as_vec()[1].eq(&proposal.id().to_string())) && e.content.contains("[PATCH 2/2]") }) @@ -2019,6 +2025,7 @@ mod push { r51.events = events.clone(); r55.events = events.clone(); + #[allow(clippy::mutable_key_type)] let before = r55.events.iter().cloned().collect::>(); let cli_tester_handle = std::thread::spawn(move || -> Result<(String, String)> { @@ -2086,7 +2093,8 @@ mod push { .events .iter() .find(|e| { - e.iter_tags() + e.tags() + .iter() .find(|t| t.as_vec()[0].eq("branch-name")) .is_some_and(|t| t.as_vec()[1].eq(FEATURE_BRANCH_NAME_1)) }) @@ -2094,7 +2102,7 @@ mod push { let revision_root_patch = new_events .iter() - .find(|e| e.iter_tags().any(|t| t.as_vec()[1].eq("revision-root"))) + .find(|e| e.tags().iter().any(|t| t.as_vec()[1].eq("revision-root"))) .unwrap(); assert_eq!( @@ -2172,6 +2180,7 @@ mod push { r51.events = events.clone(); r55.events = events.clone(); + #[allow(clippy::mutable_key_type)] let before = r55.events.iter().cloned().collect::>(); let branch_name = "pr/my-new-proposal"; @@ -2231,7 +2240,7 @@ mod push { let proposal = new_events .iter() - .find(|e| e.iter_tags().any(|t| t.as_vec()[1].eq("root"))) + .find(|e| e.tags().iter().any(|t| t.as_vec()[1].eq("root"))) .unwrap(); assert!( @@ -2246,7 +2255,8 @@ mod push { assert_eq!( proposal - .iter_tags() + .tags() + .iter() .find(|t| t.as_vec()[0].eq("branch-name")) .unwrap() .as_vec()[1], diff --git a/tests/send.rs b/tests/send.rs index 57987e3..ef09425 100644 --- a/tests/send.rs +++ b/tests/send.rs @@ -85,11 +85,19 @@ mod when_commits_behind_ask_to_proceed { } fn is_cover_letter(event: &nostr::Event) -> bool { - event.kind.eq(&Kind::GitPatch) && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) + event.kind.eq(&Kind::GitPatch) + && event + .tags() + .iter() + .any(|t| t.as_vec()[1].eq("cover-letter")) } fn is_patch(event: &nostr::Event) -> bool { - event.kind.eq(&Kind::GitPatch) && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) + event.kind.eq(&Kind::GitPatch) + && !event + .tags() + .iter() + .any(|t| t.as_vec()[1].eq("cover-letter")) } fn prep_git_repo() -> Result { @@ -366,7 +374,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ assert_eq!( cover_letter_event - .iter_tags() + .tags() + .iter() .find(|t| t.as_vec()[0].eq("r")) .unwrap() .as_vec()[1], @@ -383,18 +392,28 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = 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!( - "{}:{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!( - "{}:{TEST_KEY_2_PUBKEY_HEX}:{}", - Kind::GitRepoAnnouncement, - generate_repo_ref_event().identifier().unwrap() - )))); + assert!( + cover_letter_event + .tags() + .iter() + .any(|t| t.as_vec()[0].eq("a") + && t.as_vec()[1].eq(&format!( + "{}:{TEST_KEY_1_PUBKEY_HEX}:{}", + Kind::GitRepoAnnouncement, + generate_repo_ref_event().identifier().unwrap() + ))) + ); + assert!( + cover_letter_event + .tags() + .iter() + .any(|t| t.as_vec()[0].eq("a") + && t.as_vec()[1].eq(&format!( + "{}:{TEST_KEY_2_PUBKEY_HEX}:{}", + Kind::GitRepoAnnouncement, + generate_repo_ref_event().identifier().unwrap() + ))) + ); } Ok(()) } @@ -404,7 +423,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ async fn p_tags_for_maintainers() -> Result<()> { let event = generate_repo_ref_event(); let maintainers = &event - .iter_tags() + .tags() + .iter() .find(|t| t.as_vec()[0].eq(&"maintainers")) .unwrap() .as_vec()[1..]; @@ -415,7 +435,8 @@ 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() + .tags() + .iter() .any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(m) }) ); } @@ -432,7 +453,8 @@ 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() + .tags() + .iter() .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"cover-letter") }) ); } @@ -448,7 +470,8 @@ 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() + .tags() + .iter() .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"root") }) ); } @@ -466,7 +489,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ // branch-name tag assert_eq!( cover_letter_event - .iter_tags() + .tags() + .iter() .find(|t| t.as_vec()[0].eq("branch-name")) .unwrap() .as_vec()[1], @@ -487,7 +511,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ // branch-name tag assert_eq!( cover_letter_event - .iter_tags() + .tags() + .iter() .find(|t| t.as_vec()[0].eq("alt")) .unwrap() .as_vec()[1], @@ -557,7 +582,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ async fn p_tags_for_maintainers() -> Result<()> { let event = generate_repo_ref_event(); let maintainers = &event - .iter_tags() + .tags() + .iter() .find(|t| t.as_vec()[0].eq(&"maintainers")) .unwrap() .as_vec()[1..]; @@ -565,7 +591,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ assert!( prep() .await? - .iter_tags() + .tags() + .iter() .any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(m) }) ); } @@ -697,7 +724,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ .collect::>(); assert_eq!( patch_events[1] - .iter_tags() + .tags() + .iter() .find(|t| t.as_vec()[0].eq("e") && t.as_vec().len().eq(&4) && t.as_vec()[3].eq("reply")) @@ -1086,13 +1114,15 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c // first patch tagged as root assert!( patch_events[0] - .iter_tags() + .tags() + .iter() .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root")) ); // second patch not tagged as root assert!( !patch_events[1] - .iter_tags() + .tags() + .iter() .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root")) ); } @@ -1113,7 +1143,8 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c // branch-name tag assert_eq!( patch_events[0] - .iter_tags() + .tags() + .iter() .find(|t| t.as_vec()[0].eq("branch-name")) .unwrap() .as_vec()[1], @@ -1136,7 +1167,8 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c assert_eq!( patch_events[1] - .iter_tags() + .tags() + .iter() .find(|t| t.as_vec()[0].eq("e") && t.as_vec().len().eq(&4) && t.as_vec()[3].eq("root")) @@ -1540,7 +1572,8 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( cover_letter_event - .iter_tags() + .tags() + .iter() .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"root") }) ); } @@ -1556,7 +1589,8 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( cover_letter_event - .iter_tags() + .tags() + .iter() .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"revision-root") }) ); } @@ -1572,7 +1606,8 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert_eq!( cover_letter_event - .iter_tags() + .tags() + .iter() .find(|t| { t.as_vec()[0].eq("e") && t.as_vec().len().eq(&4) @@ -1719,7 +1754,7 @@ mod in_reply_to_mentions_issue { for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); - assert!(cover_letter_event.iter_tags().any(|t| { + assert!(cover_letter_event.tags().iter().any(|t| { t.as_vec()[0].eq("e") && t.as_vec()[1].eq(&get_pretend_issue_event().id.to_hex()) && t.as_vec()[3].eq(&"mention") @@ -1737,7 +1772,8 @@ mod in_reply_to_mentions_issue { relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( !cover_letter_event - .iter_tags() + .tags() + .iter() .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"revision-root") }) ); } @@ -1841,7 +1877,7 @@ mod in_reply_to_mentions_npub_and_nprofile_which_get_mentioned_in_proposal_root for relay in [&r53, &r55, &r56] { let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); - assert!(cover_letter_event.iter_tags().any(|t| { + assert!(cover_letter_event.tags().iter().any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(&nostr::Keys::parse( "nsec1q3c5xnsm5m4wgsrhwnz04p0d5mevkryyggqgdpa9jwulpq9gldhswgtxvq", @@ -1850,7 +1886,7 @@ mod in_reply_to_mentions_npub_and_nprofile_which_get_mentioned_in_proposal_root .public_key() .to_hex()) })); - assert!(cover_letter_event.iter_tags().any(|t| { + assert!(cover_letter_event.tags().iter().any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(&nostr::Keys::parse( "nsec1nx5ulvcndhcuu8k6q8fenw50l6y75sec7pj8vr0r68l6a44w3lqspvj02k", -- cgit v1.2.3