upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2024-06-11 16:21:44 +0100
committerDanConwayDev <DanConwayDev@protonmail.com>2024-06-13 09:09:00 +0100
commitf1b3fcc40ab666d8def97096d1942c274da9b279 (patch)
tree05d6af0c5c1ad9baedb90ef652152fba6d46abf5 /tests
parent7c6a5ab4c5e7a81c7442061029b9230748a6639d (diff)
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
Diffstat (limited to 'tests')
-rw-r--r--tests/init.rs26
-rw-r--r--tests/list.rs1
-rw-r--r--tests/send.rs16
3 files changed, 22 insertions, 21 deletions
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 {
136 relay 136 relay
137 .events 137 .events
138 .iter() 138 .iter()
139 .filter(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 139 .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
140 .count(), 140 .count(),
141 1, 141 1,
142 ); 142 );
@@ -153,7 +153,7 @@ mod when_repo_not_previously_claimed {
153 relay 153 relay
154 .events 154 .events
155 .iter() 155 .iter()
156 .filter(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 156 .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
157 .count(), 157 .count(),
158 1, 158 1,
159 ); 159 );
@@ -170,7 +170,7 @@ mod when_repo_not_previously_claimed {
170 relay 170 relay
171 .events 171 .events
172 .iter() 172 .iter()
173 .filter(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 173 .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
174 .count(), 174 .count(),
175 1, 175 1,
176 ); 176 );
@@ -185,7 +185,7 @@ mod when_repo_not_previously_claimed {
185 assert_eq!( 185 assert_eq!(
186 r57.events 186 r57.events
187 .iter() 187 .iter()
188 .filter(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 188 .filter(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
189 .count(), 189 .count(),
190 1, 190 1,
191 ); 191 );
@@ -286,7 +286,7 @@ mod when_repo_not_previously_claimed {
286 let event: &nostr::Event = relay 286 let event: &nostr::Event = relay
287 .events 287 .events
288 .iter() 288 .iter()
289 .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 289 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
290 .unwrap(); 290 .unwrap();
291 291
292 assert!( 292 assert!(
@@ -306,7 +306,7 @@ mod when_repo_not_previously_claimed {
306 let event: &nostr::Event = relay 306 let event: &nostr::Event = relay
307 .events 307 .events
308 .iter() 308 .iter()
309 .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 309 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
310 .unwrap(); 310 .unwrap();
311 311
312 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("r") 312 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("r")
@@ -323,7 +323,7 @@ mod when_repo_not_previously_claimed {
323 let event: &nostr::Event = relay 323 let event: &nostr::Event = relay
324 .events 324 .events
325 .iter() 325 .iter()
326 .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 326 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
327 .unwrap(); 327 .unwrap();
328 328
329 assert!( 329 assert!(
@@ -344,7 +344,7 @@ mod when_repo_not_previously_claimed {
344 let event: &nostr::Event = relay 344 let event: &nostr::Event = relay
345 .events 345 .events
346 .iter() 346 .iter()
347 .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 347 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
348 .unwrap(); 348 .unwrap();
349 349
350 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("alt") 350 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("alt")
@@ -361,7 +361,7 @@ mod when_repo_not_previously_claimed {
361 let event: &nostr::Event = relay 361 let event: &nostr::Event = relay
362 .events 362 .events
363 .iter() 363 .iter()
364 .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 364 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
365 .unwrap(); 365 .unwrap();
366 366
367 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("description") 367 assert!(event.tags.iter().any(|t| t.as_vec()[0].eq("description")
@@ -378,7 +378,7 @@ mod when_repo_not_previously_claimed {
378 let event: &nostr::Event = relay 378 let event: &nostr::Event = relay
379 .events 379 .events
380 .iter() 380 .iter()
381 .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 381 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
382 .unwrap(); 382 .unwrap();
383 383
384 assert!( 384 assert!(
@@ -397,7 +397,7 @@ mod when_repo_not_previously_claimed {
397 let event: &nostr::Event = relay 397 let event: &nostr::Event = relay
398 .events 398 .events
399 .iter() 399 .iter()
400 .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 400 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
401 .unwrap(); 401 .unwrap();
402 let relays_tag = event 402 let relays_tag = event
403 .tags 403 .tags
@@ -419,7 +419,7 @@ mod when_repo_not_previously_claimed {
419 let event: &nostr::Event = relay 419 let event: &nostr::Event = relay
420 .events 420 .events
421 .iter() 421 .iter()
422 .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 422 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
423 .unwrap(); 423 .unwrap();
424 let web_tag = event 424 let web_tag = event
425 .tags 425 .tags
@@ -441,7 +441,7 @@ mod when_repo_not_previously_claimed {
441 let event: &nostr::Event = relay 441 let event: &nostr::Event = relay
442 .events 442 .events
443 .iter() 443 .iter()
444 .find(|e| e.kind.as_u64().eq(&REPOSITORY_KIND)) 444 .find(|e| e.kind.as_u16().eq(&REPOSITORY_KIND))
445 .unwrap(); 445 .unwrap();
446 let maintainers_tag = event 446 let maintainers_tag = event
447 .tags 447 .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 {
181 event_id: repo_event.id, 181 event_id: repo_event.id,
182 author: Some(TEST_KEY_1_KEYS.public_key()), 182 author: Some(TEST_KEY_1_KEYS.public_key()),
183 relays: vec!["ws://localhost:8056".to_string()], 183 relays: vec!["ws://localhost:8056".to_string()],
184 kind: None,
184 } 185 }
185 .to_bech32()?, 186 .to_bech32()?,
186 )?; 187 )?;
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 {
82} 82}
83 83
84fn is_cover_letter(event: &nostr::Event) -> bool { 84fn is_cover_letter(event: &nostr::Event) -> bool {
85 event.kind.as_u64().eq(&PATCH_KIND) 85 event.kind.as_u16().eq(&PATCH_KIND)
86 && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) 86 && event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter"))
87} 87}
88 88
89fn is_patch(event: &nostr::Event) -> bool { 89fn is_patch(event: &nostr::Event) -> bool {
90 event.kind.as_u64().eq(&PATCH_KIND) 90 event.kind.as_u16().eq(&PATCH_KIND)
91 && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter")) 91 && !event.iter_tags().any(|t| t.as_vec()[1].eq("cover-letter"))
92} 92}
93 93
@@ -393,12 +393,12 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
393 #[tokio::test] 393 #[tokio::test]
394 #[serial] 394 #[serial]
395 async fn p_tags_for_maintainers() -> Result<()> { 395 async fn p_tags_for_maintainers() -> Result<()> {
396 let maintainers = &generate_repo_ref_event() 396 let event = generate_repo_ref_event();
397 let maintainers = &event
397 .iter_tags() 398 .iter_tags()
398 .find(|t| t.as_vec()[0].eq(&"maintainers")) 399 .find(|t| t.as_vec()[0].eq(&"maintainers"))
399 .unwrap() 400 .unwrap()
400 .as_vec() 401 .as_vec()[1..];
401 .clone()[1..];
402 let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?; 402 let (_, _, r53, r55, r56) = prep_run_create_proposal(true).await?;
403 for relay in [&r53, &r55, &r56] { 403 for relay in [&r53, &r55, &r56] {
404 for m in maintainers { 404 for m in maintainers {
@@ -546,12 +546,12 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
546 #[tokio::test] 546 #[tokio::test]
547 #[serial] 547 #[serial]
548 async fn p_tags_for_maintainers() -> Result<()> { 548 async fn p_tags_for_maintainers() -> Result<()> {
549 let maintainers = &generate_repo_ref_event() 549 let event = generate_repo_ref_event();
550 let maintainers = &event
550 .iter_tags() 551 .iter_tags()
551 .find(|t| t.as_vec()[0].eq(&"maintainers")) 552 .find(|t| t.as_vec()[0].eq(&"maintainers"))
552 .unwrap() 553 .unwrap()
553 .as_vec() 554 .as_vec()[1..];
554 .clone()[1..];
555 for m in maintainers { 555 for m in maintainers {
556 assert!( 556 assert!(
557 prep() 557 prep()
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-05 17:55:06 +0000