diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-07-24 16:37:10 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-07-24 16:37:10 +0100 |
| commit | 8638b321fdff94d034ec912ecd0910b6f564ff04 (patch) | |
| tree | 411e0ca989d8c53be5b11b39461297bf6a92d781 /tests/send.rs | |
| parent | 95cb9c040dfa8ca18bf907a44a86df35b316b6ca (diff) | |
refactor: use nip34 kinds from rust-nostr
instead of Kind::Custom(u16) as v33 of rust-nostr introduced them
Diffstat (limited to 'tests/send.rs')
| -rw-r--r-- | tests/send.rs | 19 |
1 files changed, 11 insertions, 8 deletions
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 @@ | |||
| 1 | use anyhow::Result; | 1 | use anyhow::Result; |
| 2 | use futures::join; | 2 | use futures::join; |
| 3 | use nostr_sdk::Kind; | ||
| 3 | use serial_test::serial; | 4 | use serial_test::serial; |
| 4 | use test_utils::{git::GitTestRepo, relay::Relay, *}; | 5 | use test_utils::{git::GitTestRepo, relay::Relay, *}; |
| 5 | 6 | ||
| @@ -84,13 +85,11 @@ mod when_commits_behind_ask_to_proceed { | |||
| 84 | } | 85 | } |
| 85 | 86 | ||
| 86 | fn is_cover_letter(event: &nostr::Event) -> bool { | 87 | fn is_cover_letter(event: &nostr::Event) -> bool { |
| 87 | event.kind.as_u16().eq(&PATCH_KIND) | 88 | event.kind.eq(&Kind::GitPatch) && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) |
| 88 | && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) | ||
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | fn is_patch(event: &nostr::Event) -> bool { | 91 | fn is_patch(event: &nostr::Event) -> bool { |
| 92 | event.kind.as_u16().eq(&PATCH_KIND) | 92 | event.kind.eq(&Kind::GitPatch) && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) |
| 93 | && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) | ||
| 94 | } | 93 | } |
| 95 | 94 | ||
| 96 | fn prep_git_repo() -> Result<GitTestRepo> { | 95 | fn prep_git_repo() -> Result<GitTestRepo> { |
| @@ -386,12 +385,14 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ | |||
| 386 | relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); | 385 | relay.events.iter().find(|e| is_cover_letter(e)).unwrap(); |
| 387 | assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a") | 386 | assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a") |
| 388 | && t.as_vec()[1].eq(&format!( | 387 | && t.as_vec()[1].eq(&format!( |
| 389 | "{REPOSITORY_KIND}:{TEST_KEY_1_PUBKEY_HEX}:{}", | 388 | "{}:{TEST_KEY_1_PUBKEY_HEX}:{}", |
| 389 | Kind::GitRepoAnnouncement, | ||
| 390 | generate_repo_ref_event().identifier().unwrap() | 390 | generate_repo_ref_event().identifier().unwrap() |
| 391 | )))); | 391 | )))); |
| 392 | assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a") | 392 | assert!(cover_letter_event.iter_tags().any(|t| t.as_vec()[0].eq("a") |
| 393 | && t.as_vec()[1].eq(&format!( | 393 | && t.as_vec()[1].eq(&format!( |
| 394 | "{REPOSITORY_KIND}:{TEST_KEY_2_PUBKEY_HEX}:{}", | 394 | "{}:{TEST_KEY_2_PUBKEY_HEX}:{}", |
| 395 | Kind::GitRepoAnnouncement, | ||
| 395 | generate_repo_ref_event().identifier().unwrap() | 396 | generate_repo_ref_event().identifier().unwrap() |
| 396 | )))); | 397 | )))); |
| 397 | } | 398 | } |
| @@ -577,14 +578,16 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ | |||
| 577 | assert!(prep().await?.tags.iter().any(|t| { | 578 | assert!(prep().await?.tags.iter().any(|t| { |
| 578 | t.as_vec()[0].eq("a") | 579 | t.as_vec()[0].eq("a") |
| 579 | && t.as_vec()[1].eq(&format!( | 580 | && t.as_vec()[1].eq(&format!( |
| 580 | "{REPOSITORY_KIND}:{TEST_KEY_1_PUBKEY_HEX}:{}", | 581 | "{}:{TEST_KEY_1_PUBKEY_HEX}:{}", |
| 582 | Kind::GitRepoAnnouncement, | ||
| 581 | generate_repo_ref_event().identifier().unwrap() | 583 | generate_repo_ref_event().identifier().unwrap() |
| 582 | )) | 584 | )) |
| 583 | })); | 585 | })); |
| 584 | assert!(prep().await?.tags.iter().any(|t| { | 586 | assert!(prep().await?.tags.iter().any(|t| { |
| 585 | t.as_vec()[0].eq("a") | 587 | t.as_vec()[0].eq("a") |
| 586 | && t.as_vec()[1].eq(&format!( | 588 | && t.as_vec()[1].eq(&format!( |
| 587 | "{REPOSITORY_KIND}:{TEST_KEY_2_PUBKEY_HEX}:{}", | 589 | "{}:{TEST_KEY_2_PUBKEY_HEX}:{}", |
| 590 | Kind::GitRepoAnnouncement, | ||
| 588 | generate_repo_ref_event().identifier().unwrap() | 591 | generate_repo_ref_event().identifier().unwrap() |
| 589 | )) | 592 | )) |
| 590 | })); | 593 | })); |