From d6faad17e814d252a72e3aca39a4b3898382bab9 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Wed, 25 Sep 2024 14:37:17 +0100 Subject: chore: bump rust-nostr v0.35 bump all rust-nostr packages --- tests/git_remote_nostr/main.rs | 6 +- tests/git_remote_nostr/push.rs | 98 ++++++++++---------- tests/ngit_init.rs | 41 +++++---- tests/ngit_push.rs | 2 +- tests/ngit_send.rs | 200 ++++++++++++++++++++--------------------- 5 files changed, 173 insertions(+), 174 deletions(-) (limited to 'tests') diff --git a/tests/git_remote_nostr/main.rs b/tests/git_remote_nostr/main.rs index 5d2dcbb..189d82d 100644 --- a/tests/git_remote_nostr/main.rs +++ b/tests/git_remote_nostr/main.rs @@ -20,7 +20,7 @@ fn get_nostr_remote_url() -> Result { let repo_event = generate_repo_ref_event(); let naddr = Coordinate { kind: Kind::GitRepoAnnouncement, - public_key: repo_event.author(), + public_key: repo_event.pubkey, identifier: repo_event.identifier().unwrap().to_string(), relays: vec![ "ws://localhost:8055".to_string(), @@ -156,7 +156,7 @@ async fn generate_repo_with_state_event() -> Result<(nostr::Event, GitTestRepo)> let state_event = r56 .events .iter() - .find(|e| e.kind().eq(&STATE_KIND)) + .find(|e| e.kind.eq(&STATE_KIND)) .context("state event not created")?; assert_eq!( @@ -164,7 +164,7 @@ async fn generate_repo_with_state_event() -> Result<(nostr::Event, GitTestRepo)> .tags .iter() .filter(|t| t.kind().to_string().as_str().ne("d")) - .map(|t| t.as_vec().to_vec()) + .map(|t| t.as_slice().to_vec()) .collect::>>(), HashSet::from([ vec!["HEAD".to_string(), "ref: refs/heads/main".to_string()], diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs index f552ee5..e0a4e93 100644 --- a/tests/git_remote_nostr/push.rs +++ b/tests/git_remote_nostr/push.rs @@ -298,7 +298,7 @@ mod two_branches_in_batch_one_added_one_updated { let state_event = r56 .events .iter() - .find(|e| e.kind().eq(&STATE_KIND)) + .find(|e| e.kind.eq(&STATE_KIND)) .context("state event not created")?; assert_eq!( @@ -311,7 +311,7 @@ mod two_branches_in_batch_one_added_one_updated { .tags .iter() .filter(|t| t.kind().to_string().as_str().ne("d")) - .map(|t| t.as_vec().to_vec()) + .map(|t| t.as_slice().to_vec()) .collect::>>(), HashSet::from([ vec!["HEAD".to_string(), "ref: refs/heads/main".to_string()], @@ -415,7 +415,7 @@ mod two_branches_in_batch_one_added_one_updated { let state_event = r56 .events .iter() - .find(|e| e.kind().eq(&STATE_KIND)) + .find(|e| e.kind.eq(&STATE_KIND)) .context("state event not created")?; // println!("{:#?}", state_event); @@ -424,7 +424,7 @@ mod two_branches_in_batch_one_added_one_updated { .tags .iter() .filter(|t| t.kind().to_string().as_str().ne("d")) - .map(|t| t.as_vec().to_vec()) + .map(|t| t.as_slice().to_vec()) .collect::>>(), HashSet::from([ vec!["HEAD".to_string(), "ref: refs/heads/main".to_string()], @@ -710,7 +710,7 @@ mod delete_one_branch { let state_event = r56 .events .iter() - .find(|e| e.kind().eq(&STATE_KIND)) + .find(|e| e.kind.eq(&STATE_KIND)) .context("state event not created")?; // println!("{:#?}", state_event); @@ -719,7 +719,7 @@ mod delete_one_branch { .tags .iter() .filter(|t| t.kind().to_string().as_str().ne("d")) - .map(|t| t.as_vec().to_vec()) + .map(|t| t.as_slice().to_vec()) .collect::>>(), HashSet::from([ vec!["HEAD".to_string(), "ref: refs/heads/main".to_string()], @@ -797,7 +797,7 @@ mod delete_one_branch { let state_event = r56 .events .iter() - .find(|e| e.kind().eq(&STATE_KIND)) + .find(|e| e.kind.eq(&STATE_KIND)) .context("state event not created")?; // println!("{:#?}", state_event); @@ -806,7 +806,7 @@ mod delete_one_branch { .tags .iter() .filter(|t| t.kind().to_string().as_str().ne("d")) - .map(|t| t.as_vec().to_vec()) + .map(|t| t.as_slice().to_vec()) .collect::>>(), HashSet::from([ vec!["HEAD".to_string(), "ref: refs/heads/main".to_string()], @@ -980,16 +980,16 @@ async fn proposal_merge_commit_pushed_to_main_leads_to_status_event_issued() -> .events .iter() .find(|e| { - e.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)) + .find(|t| t.as_slice()[0].eq("branch-name")) + .is_some_and(|t| t.as_slice()[1].eq(FEATURE_BRANCH_NAME_1)) }) .unwrap(); let merge_status = new_events .iter() - .find(|e| e.kind().eq(&Kind::GitStatusApplied)) + .find(|e| e.kind.eq(&Kind::GitStatusApplied)) .unwrap(); assert_eq!( @@ -997,9 +997,9 @@ async fn proposal_merge_commit_pushed_to_main_leads_to_status_event_issued() -> merge_status .tags .iter() - .find(|t| t.as_vec()[0].eq("merge-commit-id")) + .find(|t| t.as_slice()[0].eq("merge-commit-id")) .unwrap() - .as_vec()[1], + .as_slice()[1], "status sets correct merge-commit-id tag" ); @@ -1007,35 +1007,35 @@ async fn proposal_merge_commit_pushed_to_main_leads_to_status_event_issued() -> .events .iter() .filter(|e| { - e.tags() + e.tags .iter() - .any(|t| t.as_vec()[1].eq(&proposal.id().to_string())) - && e.kind().eq(&Kind::GitPatch) + .any(|t| t.as_slice()[1].eq(&proposal.id.to_string())) + && e.kind.eq(&Kind::GitPatch) }) .last() .unwrap(); assert_eq!( - proposal_tip.id().to_string(), + proposal_tip.id.to_string(), merge_status .tags .iter() - .find(|t| t.as_vec().len().eq(&4) && t.as_vec()[3].eq("mention")) + .find(|t| t.as_slice().len().eq(&4) && t.as_slice()[3].eq("mention")) .unwrap() - .as_vec()[1], + .as_slice()[1], "status mentions proposal tip event \r\nmerge status:\r\n{}\r\nproposal tip:\r\n{}", merge_status.as_json(), proposal_tip.as_json(), ); assert_eq!( - proposal.id().to_string(), + proposal.id.to_string(), merge_status .tags .iter() .find(|t| t.is_root()) .unwrap() - .as_vec()[1], + .as_slice()[1], "status tags proposal id as root \r\nmerge status:\r\n{}\r\nproposal:\r\n{}", merge_status.as_json(), proposal.as_json(), @@ -1136,32 +1136,32 @@ async fn push_2_commits_to_existing_proposal() -> Result<()> { .events .iter() .find(|e| { - e.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)) + .find(|t| t.as_slice()[0].eq("branch-name")) + .is_some_and(|t| t.as_slice()[1].eq(FEATURE_BRANCH_NAME_1)) }) .unwrap(); assert_eq!( - proposal.id().to_string(), + proposal.id.to_string(), first_new_patch .tags .iter() .find(|t| t.is_root()) .unwrap() - .as_vec()[1], + .as_slice()[1], "first patch sets proposal id as root" ); assert_eq!( - first_new_patch.id().to_string(), + first_new_patch.id.to_string(), second_new_patch .tags .iter() .find(|t| t.is_reply()) .unwrap() - .as_vec()[1], + .as_slice()[1], "second new patch replies to the first new patch" ); @@ -1169,21 +1169,21 @@ async fn push_2_commits_to_existing_proposal() -> Result<()> { .events .iter() .find(|e| { - e.tags() + e.tags .iter() - .any(|t| t.as_vec()[1].eq(&proposal.id().to_string())) + .any(|t| t.as_slice()[1].eq(&proposal.id.to_string())) && e.content.contains("[PATCH 2/2]") }) .unwrap(); assert_eq!( - previous_proposal_tip_event.id().to_string(), + previous_proposal_tip_event.id.to_string(), first_new_patch .tags .iter() .find(|t| t.is_reply()) .unwrap() - .as_vec()[1], + .as_slice()[1], "first patch replies to the previous tip of proposal" ); @@ -1275,26 +1275,26 @@ async fn force_push_creates_proposal_revision() -> Result<()> { .events .iter() .find(|e| { - e.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)) + .find(|t| t.as_slice()[0].eq("branch-name")) + .is_some_and(|t| t.as_slice()[1].eq(FEATURE_BRANCH_NAME_1)) }) .unwrap(); let revision_root_patch = new_events .iter() - .find(|e| e.tags().iter().any(|t| t.as_vec()[1].eq("revision-root"))) + .find(|e| e.tags.iter().any(|t| t.as_slice()[1].eq("revision-root"))) .unwrap(); assert_eq!( - proposal.id().to_string(), + proposal.id.to_string(), revision_root_patch .tags .iter() .find(|t| t.is_reply()) .unwrap() - .as_vec()[1], + .as_slice()[1], "revision root patch replies to original proposal" ); @@ -1321,24 +1321,24 @@ async fn force_push_creates_proposal_revision() -> Result<()> { ); assert_eq!( - revision_root_patch.id().to_string(), + revision_root_patch.id.to_string(), second_patch .tags .iter() .find(|t| t.is_root()) .unwrap() - .as_vec()[1], + .as_slice()[1], "second patch sets revision id as root" ); assert_eq!( - second_patch.id().to_string(), + second_patch.id.to_string(), third_patch .tags .iter() .find(|t| t.is_reply()) .unwrap() - .as_vec()[1], + .as_slice()[1], "third patch replies to the second new patch" ); @@ -1423,7 +1423,7 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> { let proposal = new_events .iter() - .find(|e| e.tags().iter().any(|t| t.as_vec()[1].eq("root"))) + .find(|e| e.tags.iter().any(|t| t.as_slice()[1].eq("root"))) .unwrap(); assert!( @@ -1438,11 +1438,11 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> { assert_eq!( proposal - .tags() + .tags .iter() - .find(|t| t.as_vec()[0].eq("branch-name")) + .find(|t| t.as_slice()[0].eq("branch-name")) .unwrap() - .as_vec()[1], + .as_slice()[1], branch_name.replace("pr/", ""), ); @@ -1457,13 +1457,13 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> { ); assert_eq!( - proposal.id().to_string(), + proposal.id.to_string(), second_patch .tags .iter() .find(|t| t.is_root()) .unwrap() - .as_vec()[1], + .as_slice()[1], "second patch sets proposal id as root" ); diff --git a/tests/ngit_init.rs b/tests/ngit_init.rs index c8390e3..34da16f 100644 --- a/tests/ngit_init.rs +++ b/tests/ngit_init.rs @@ -464,11 +464,9 @@ mod when_repo_not_previously_claimed { .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); - assert!( - event.tags.iter().any( - |t| t.as_vec()[0].eq("d") && t.as_vec()[1].eq("example-identifier") - ) - ); + assert!(event.tags.iter().any( + |t| t.as_slice()[0].eq("d") && t.as_slice()[1].eq("example-identifier") + )); } Ok(()) } @@ -484,9 +482,9 @@ mod when_repo_not_previously_claimed { .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); - assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("r") - && t.as_vec()[1].eq("9ee507fc4357d7ee16a5d8901bedcd103f23c17d") - && t.as_vec()[2].eq("euc"))); + assert!(event.tags.iter().any(|t| t.as_slice()[0].eq("r") + && t.as_slice()[1].eq("9ee507fc4357d7ee16a5d8901bedcd103f23c17d") + && t.as_slice()[2].eq("euc"))); } Ok(()) } @@ -506,7 +504,8 @@ mod when_repo_not_previously_claimed { event .tags .iter() - .any(|t| t.as_vec()[0].eq("name") && t.as_vec()[1].eq("example-name")) + .any(|t| t.as_slice()[0].eq("name") + && t.as_slice()[1].eq("example-name")) ); } Ok(()) @@ -523,8 +522,8 @@ mod when_repo_not_previously_claimed { .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); - assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("alt") - && t.as_vec()[1].eq("git repository: example-name"))); + assert!(event.tags.iter().any(|t| t.as_slice()[0].eq("alt") + && t.as_slice()[1].eq("git repository: example-name"))); } Ok(()) } @@ -540,8 +539,8 @@ mod when_repo_not_previously_claimed { .find(|e| e.kind.eq(&Kind::GitRepoAnnouncement)) .unwrap(); - assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("description") - && t.as_vec()[1].eq("example-description"))); + assert!(event.tags.iter().any(|t| t.as_slice()[0].eq("description") + && t.as_slice()[1].eq("example-description"))); } Ok(()) } @@ -558,8 +557,8 @@ mod when_repo_not_previously_claimed { .unwrap(); assert!( - event.tags.iter().any(|t| t.as_vec()[0].eq("clone") - && t.as_vec()[1].eq("https://git.myhosting.com/my-repo.git")) /* todo check it defaults to origin */ + event.tags.iter().any(|t| t.as_slice()[0].eq("clone") + && t.as_slice()[1].eq("https://git.myhosting.com/my-repo.git")) /* todo check it defaults to origin */ ); } Ok(()) @@ -578,9 +577,9 @@ mod when_repo_not_previously_claimed { let relays_tag = event .tags .iter() - .find(|t| t.as_vec()[0].eq("relays")) + .find(|t| t.as_slice()[0].eq("relays")) .unwrap() - .as_vec(); + .as_slice(); assert_eq!(relays_tag[1], "ws://localhost:8055",); assert_eq!(relays_tag[2], "ws://localhost:8056",); } @@ -600,9 +599,9 @@ mod when_repo_not_previously_claimed { let web_tag = event .tags .iter() - .find(|t| t.as_vec()[0].eq("web")) + .find(|t| t.as_slice()[0].eq("web")) .unwrap() - .as_vec(); + .as_slice(); assert_eq!(web_tag[1], "https://exampleproject.xyz",); assert_eq!(web_tag[2], "https://gitworkshop.dev/123",); } @@ -622,9 +621,9 @@ mod when_repo_not_previously_claimed { let maintainers_tag = event .tags .iter() - .find(|t| t.as_vec()[0].eq("maintainers")) + .find(|t| t.as_slice()[0].eq("maintainers")) .unwrap() - .as_vec(); + .as_slice(); assert_eq!(maintainers_tag[1], TEST_KEY_1_KEYS.public_key().to_string()); } Ok(()) diff --git a/tests/ngit_push.rs b/tests/ngit_push.rs index eb452cd..3d89f6b 100644 --- a/tests/ngit_push.rs +++ b/tests/ngit_push.rs @@ -359,7 +359,7 @@ mod when_branch_is_checked_out { assert!(r55_events.iter().any(|e| { e.tags .iter() - .any(|t| t.as_vec()[0].eq("commit") && t.as_vec()[1].eq(&commit_id)) + .any(|t| t.as_slice()[0].eq("commit") && t.as_slice()[1].eq(&commit_id)) })); Ok(()) } diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs index 2aad232..0fe7a86 100644 --- a/tests/ngit_send.rs +++ b/tests/ngit_send.rs @@ -87,17 +87,17 @@ mod when_commits_behind_ask_to_proceed { fn is_cover_letter(event: &nostr::Event) -> bool { event.kind.eq(&Kind::GitPatch) && event - .tags() + .tags .iter() - .any(|t| t.as_vec()[1].eq("cover-letter")) + .any(|t| t.as_slice()[1].eq("cover-letter")) } fn is_patch(event: &nostr::Event) -> bool { event.kind.eq(&Kind::GitPatch) && !event - .tags() + .tags .iter() - .any(|t| t.as_vec()[1].eq("cover-letter")) + .any(|t| t.as_slice()[1].eq("cover-letter")) } fn prep_git_repo() -> Result { @@ -374,11 +374,11 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ assert_eq!( cover_letter_event - .tags() + .tags .iter() - .find(|t| t.as_vec()[0].eq("r")) + .find(|t| t.as_slice()[0].eq("r")) .unwrap() - .as_vec()[1], + .as_slice()[1], "9ee507fc4357d7ee16a5d8901bedcd103f23c17d" ); } @@ -394,10 +394,10 @@ 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 - .tags() + .tags .iter() - .any(|t| t.as_vec()[0].eq("a") - && t.as_vec()[1].eq(&format!( + .any(|t| t.as_slice()[0].eq("a") + && t.as_slice()[1].eq(&format!( "{}:{TEST_KEY_1_PUBKEY_HEX}:{}", Kind::GitRepoAnnouncement, generate_repo_ref_event().identifier().unwrap() @@ -405,10 +405,10 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ ); assert!( cover_letter_event - .tags() + .tags .iter() - .any(|t| t.as_vec()[0].eq("a") - && t.as_vec()[1].eq(&format!( + .any(|t| t.as_slice()[0].eq("a") + && t.as_slice()[1].eq(&format!( "{}:{TEST_KEY_2_PUBKEY_HEX}:{}", Kind::GitRepoAnnouncement, generate_repo_ref_event().identifier().unwrap() @@ -423,11 +423,11 @@ 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 - .tags() + .tags .iter() - .find(|t| t.as_vec()[0].eq(&"maintainers")) + .find(|t| t.as_slice()[0].eq(&"maintainers")) .unwrap() - .as_vec()[1..]; + .as_slice()[1..]; let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; for relay in [&r53, &r55, &r56] { for m in maintainers { @@ -435,9 +435,9 @@ 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 - .tags() + .tags .iter() - .any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(m) }) + .any(|t| { t.as_slice()[0].eq("p") && t.as_slice()[1].eq(m) }) ); } } @@ -452,10 +452,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( - cover_letter_event - .tags() - .iter() - .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"cover-letter") }) + cover_letter_event.tags.iter().any(|t| { + t.as_slice()[0].eq("t") && t.as_slice()[1].eq(&"cover-letter") + }) ); } Ok(()) @@ -470,9 +469,9 @@ 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 - .tags() + .tags .iter() - .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"root") }) + .any(|t| { t.as_slice()[0].eq("t") && t.as_slice()[1].eq(&"root") }) ); } Ok(()) @@ -489,11 +488,11 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ // branch-name tag assert_eq!( cover_letter_event - .tags() + .tags .iter() - .find(|t| t.as_vec()[0].eq("branch-name")) + .find(|t| t.as_slice()[0].eq("branch-name")) .unwrap() - .as_vec()[1], + .as_slice()[1], "feature" ); } @@ -511,11 +510,11 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ // branch-name tag assert_eq!( cover_letter_event - .tags() + .tags .iter() - .find(|t| t.as_vec()[0].eq("alt")) + .find(|t| t.as_slice()[0].eq("alt")) .unwrap() - .as_vec()[1], + .as_slice()[1], "git patch cover letter: exampletitle" ); } @@ -540,13 +539,13 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ most_recent_patch .tags .iter() - .any(|t| t.as_vec()[0].eq("r") && t.as_vec()[1].eq(COMMIT_ID)) + .any(|t| t.as_slice()[0].eq("r") && t.as_slice()[1].eq(COMMIT_ID)) ); assert!( most_recent_patch .tags .iter() - .any(|t| t.as_vec()[0].eq("commit") && t.as_vec()[1].eq(COMMIT_ID)) + .any(|t| t.as_slice()[0].eq("commit") && t.as_slice()[1].eq(COMMIT_ID)) ); Ok(()) } @@ -561,9 +560,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ most_recent_patch .tags .iter() - .find(|t| t.as_vec()[0].eq("parent-commit")) + .find(|t| t.as_slice()[0].eq("parent-commit")) .unwrap() - .as_vec()[1], + .as_slice()[1], COMMIT_PARENT_ID, ); Ok(()) @@ -572,8 +571,8 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ #[tokio::test] #[serial] async fn root_commit_as_r() -> Result<()> { - assert!(prep().await?.tags.iter().any(|t| t.as_vec()[0].eq("r") - && t.as_vec()[1].eq("9ee507fc4357d7ee16a5d8901bedcd103f23c17d"))); + assert!(prep().await?.tags.iter().any(|t| t.as_slice()[0].eq("r") + && t.as_slice()[1].eq("9ee507fc4357d7ee16a5d8901bedcd103f23c17d"))); Ok(()) } @@ -582,18 +581,18 @@ 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 - .tags() + .tags .iter() - .find(|t| t.as_vec()[0].eq(&"maintainers")) + .find(|t| t.as_slice()[0].eq(&"maintainers")) .unwrap() - .as_vec()[1..]; + .as_slice()[1..]; for m in maintainers { assert!( prep() .await? - .tags() + .tags .iter() - .any(|t| { t.as_vec()[0].eq("p") && t.as_vec()[1].eq(m) }) + .any(|t| { t.as_slice()[0].eq("p") && t.as_slice()[1].eq(m) }) ); } Ok(()) @@ -603,16 +602,16 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ #[serial] async fn a_tag_for_repo_event_of_each_maintainer() -> Result<()> { assert!(prep().await?.tags.iter().any(|t| { - t.as_vec()[0].eq("a") - && t.as_vec()[1].eq(&format!( + t.as_slice()[0].eq("a") + && t.as_slice()[1].eq(&format!( "{}:{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!( + t.as_slice()[0].eq("a") + && t.as_slice()[1].eq(&format!( "{}:{TEST_KEY_2_PUBKEY_HEX}:{}", Kind::GitRepoAnnouncement, generate_repo_ref_event().identifier().unwrap() @@ -629,9 +628,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ .await? .tags .iter() - .find(|t| t.as_vec()[0].eq("description")) + .find(|t| t.as_slice()[0].eq("description")) .unwrap() - .as_vec()[1], + .as_slice()[1], "add t3.md" ); Ok(()) @@ -645,9 +644,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ .await? .tags .iter() - .find(|t| t.as_vec()[0].eq("author")) + .find(|t| t.as_slice()[0].eq("author")) .unwrap() - .as_vec(), + .as_slice(), vec!["author", "Joe Bloggs", "joe.bloggs@pm.me", "0", "0"], ); Ok(()) @@ -661,9 +660,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ .await? .tags .iter() - .find(|t| t.as_vec()[0].eq("committer")) + .find(|t| t.as_slice()[0].eq("committer")) .unwrap() - .as_vec(), + .as_slice(), vec!["committer", "Joe Bloggs", "joe.bloggs@pm.me", "0", "0"], ); Ok(()) @@ -677,9 +676,9 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ .await? .tags .iter() - .find(|t| t.as_vec()[0].eq("alt")) + .find(|t| t.as_slice()[0].eq("alt")) .unwrap() - .as_vec(), + .as_slice(), vec!["alt", "git patch: add t3.md"], ); Ok(()) @@ -700,12 +699,14 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ .tags .iter() .find(|t| { - t.as_vec()[0].eq("e") && t.as_vec().len().eq(&4) && t.as_vec()[3].eq("root") + t.as_slice()[0].eq("e") + && t.as_slice().len().eq(&4) + && t.as_slice()[3].eq("root") }) .unwrap(); assert_eq!( - root_event_tag.as_vec()[1], + root_event_tag.as_slice()[1], cover_letter_event.id.to_string() ); } @@ -724,13 +725,13 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ .collect::>(); assert_eq!( patch_events[1] - .tags() + .tags .iter() - .find(|t| t.as_vec()[0].eq("e") - && t.as_vec().len().eq(&4) - && t.as_vec()[3].eq("reply")) + .find(|t| t.as_slice()[0].eq("e") + && t.as_slice().len().eq(&4) + && t.as_slice()[3].eq("reply")) .unwrap() - .as_vec()[1], + .as_slice()[1], patch_events[0].id.to_string(), ); } @@ -745,7 +746,7 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ .await? .tags .iter() - .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root")) + .any(|t| t.as_slice()[0].eq("t") && t.as_slice()[1].eq("root")) ); Ok(()) } @@ -1114,16 +1115,16 @@ 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] - .tags() + .tags .iter() - .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root")) + .any(|t| t.as_slice()[0].eq("t") && t.as_slice()[1].eq("root")) ); // second patch not tagged as root assert!( !patch_events[1] - .tags() + .tags .iter() - .any(|t| t.as_vec()[0].eq("t") && t.as_vec()[1].eq("root")) + .any(|t| t.as_slice()[0].eq("t") && t.as_slice()[1].eq("root")) ); } Ok(()) @@ -1143,11 +1144,11 @@ 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] - .tags() + .tags .iter() - .find(|t| t.as_vec()[0].eq("branch-name")) + .find(|t| t.as_slice()[0].eq("branch-name")) .unwrap() - .as_vec()[1], + .as_slice()[1], "feature" ); } @@ -1167,13 +1168,13 @@ mod when_no_cover_letter_flag_set_with_range_of_head_2_sends_2_patches_without_c assert_eq!( patch_events[1] - .tags() + .tags .iter() - .find(|t| t.as_vec()[0].eq("e") - && t.as_vec().len().eq(&4) - && t.as_vec()[3].eq("root")) + .find(|t| t.as_slice()[0].eq("e") + && t.as_slice().len().eq(&4) + && t.as_slice()[3].eq("root")) .unwrap() - .as_vec()[1], + .as_slice()[1], patch_events[0].id.to_string(), ); } @@ -1572,9 +1573,9 @@ 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 - .tags() + .tags .iter() - .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"root") }) + .any(|t| { t.as_slice()[0].eq("t") && t.as_slice()[1].eq(&"root") }) ); } Ok(()) @@ -1588,10 +1589,9 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let let cover_letter_event: &nostr::Event = relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( - cover_letter_event - .tags() - .iter() - .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"revision-root") }) + cover_letter_event.tags.iter().any(|t| { + t.as_slice()[0].eq("t") && t.as_slice()[1].eq(&"revision-root") + }) ); } Ok(()) @@ -1606,15 +1606,15 @@ 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 - .tags() + .tags .iter() .find(|t| { - t.as_vec()[0].eq("e") - && t.as_vec().len().eq(&4) - && t.as_vec()[3].eq("reply") + t.as_slice()[0].eq("e") + && t.as_slice().len().eq(&4) + && t.as_slice()[3].eq("reply") }) .unwrap() - .as_vec()[1], + .as_slice()[1], // id of state nevent "431e58eb8e1b4e20292d1d5bbe81d5cfb042e1bc165de32eddfdd52245a4cce4", ); @@ -1639,12 +1639,12 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let .tags .iter() .find(|t| { - t.as_vec()[0].eq("e") - && t.as_vec().len().eq(&4) - && t.as_vec()[3].eq("root") + t.as_slice()[0].eq("e") + && t.as_slice().len().eq(&4) + && t.as_slice()[3].eq("root") }) .unwrap() - .as_vec()[1], + .as_slice()[1], cover_letter_event.id.to_string() ); } @@ -1754,10 +1754,10 @@ 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.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") + assert!(cover_letter_event.tags.iter().any(|t| { + t.as_slice()[0].eq("e") + && t.as_slice()[1].eq(&get_pretend_issue_event().id.to_hex()) + && t.as_slice()[3].eq(&"mention") })); } Ok(()) @@ -1772,9 +1772,9 @@ mod in_reply_to_mentions_issue { relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); assert!( !cover_letter_event - .tags() + .tags .iter() - .any(|t| { t.as_vec()[0].eq("t") && t.as_vec()[1].eq(&"revision-root") }) + .any(|t| { t.as_slice()[0].eq("t") && t.as_slice()[1].eq(&"revision-root") }) ); } Ok(()) @@ -1877,18 +1877,18 @@ 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.tags().iter().any(|t| { - t.as_vec()[0].eq("p") - && t.as_vec()[1].eq(&nostr::Keys::parse( + assert!(cover_letter_event.tags.iter().any(|t| { + t.as_slice()[0].eq("p") + && t.as_slice()[1].eq(&nostr::Keys::parse( "nsec1q3c5xnsm5m4wgsrhwnz04p0d5mevkryyggqgdpa9jwulpq9gldhswgtxvq", ) .unwrap() .public_key() .to_hex()) })); - assert!(cover_letter_event.tags().iter().any(|t| { - t.as_vec()[0].eq("p") - && t.as_vec()[1].eq(&nostr::Keys::parse( + assert!(cover_letter_event.tags.iter().any(|t| { + t.as_slice()[0].eq("p") + && t.as_slice()[1].eq(&nostr::Keys::parse( "nsec1nx5ulvcndhcuu8k6q8fenw50l6y75sec7pj8vr0r68l6a44w3lqspvj02k", ) .unwrap() -- cgit v1.2.3