laantungir/ngit-grasp
1
0
Fork 0
mirror of https://relay.ngit.dev/npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr/ngit-grasp.git synced 2026-10-05 15:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(nip09): assert on served state instead of sleeping

Browse Source 
The NIP-09 conformance suite paused 200-300 ms after every send before
querying the relay. The relay applies a deletion inside its write policy
before replying `OK`, and a served Layer-2 event is queryable as soon as
its `OK` arrives, so the pauses proved nothing and cost 3.5 s per run.

Drop the pauses that followed an awaited send, and replace the pauses
that preceded an absence assertion with `wait_until_not_served`, a
bounded poll on the served state itself. The assertions are unchanged.

Validation: measured against master with the same binaries, 20 unloaded
runs and 30 samples as three concurrent instances under CPU spinners;
see the pull request description.

Assisted-by: Claude Fable 5.1
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
DanConwayDev
2026-09-18 14:24:51 +00:00
co-authored by Claude Fable 5.1
parent 47af1bf6cb
commit 4cb642e10c
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/lifecycle/nip09_validation.rs
+9 -23
View File
@@ -54,12 +54,11 @@ mod common;
use common::{
announcement_coordinate, announcement_served_by_coordinate, build_deletion,
publish_served_repo, TestRelay,
publish_served_repo, wait_until_not_served, TestRelay,
};
use grasp_audit::{AuditClient, AuditConfig};
use nostr_sdk::prelude::*;
use std::time::Duration;
/// 1. A deletion targeting an existing, author-owned event by `e` tag is
/// accepted and the target is no longer served.
@@ -84,8 +83,6 @@ async fn valid_deletion_by_event_id_removes_target() {
.await
.expect("relay should accept issue");
tokio::time::sleep(Duration::from_millis(200)).await;
assert!(
client
.is_event_on_relay(issue_id)
@@ -100,7 +97,7 @@ async fn valid_deletion_by_event_id_removes_target() {
.await
.expect("relay should accept deletion of own event");
tokio::time::sleep(Duration::from_millis(300)).await;
wait_until_not_served(&client, issue_id).await;
let still_served = client
.is_event_on_relay(issue_id)
@@ -191,14 +188,10 @@ async fn deletion_before_target_rejects_later_submission() {
.await
.expect("relay should accept pre-emptive deletion of own (not-yet-seen) event");
tokio::time::sleep(Duration::from_millis(200)).await;
// Now send the issue the deletion already targeted. The resubmission gate
// must reject it because a tombstone for this id already exists.
let result = client.send_event(issue.clone()).await;
tokio::time::sleep(Duration::from_millis(200)).await;
let served = client
.is_event_on_relay(issue_id)
.await
@@ -272,14 +265,10 @@ async fn out_of_order_deletion_by_other_pubkey_not_actioned() {
let deletion = build_deletion(&author_b, &[issue_id], &[]);
let _ = author_b.send_event(deletion).await;
tokio::time::sleep(Duration::from_millis(200)).await;
// A now submits the genuine event. It must be accepted: B's deletion of an
// event B does not own must never have been actioned.
let result = author_a.send_event(issue.clone()).await;
tokio::time::sleep(Duration::from_millis(200)).await;
let served = author_a
.is_event_on_relay(issue_id)
.await
@@ -323,7 +312,6 @@ async fn deletion_author_mismatch_rejected() {
.await
.expect("relay should accept A's issue");
tokio::time::sleep(Duration::from_millis(200)).await;
assert!(
author_a
.is_event_on_relay(issue_id)
@@ -393,7 +381,6 @@ async fn multiple_event_targets_in_one_deletion() {
.expect("relay should accept issue");
}
tokio::time::sleep(Duration::from_millis(200)).await;
for id in &ids {
assert!(
client
@@ -411,7 +398,9 @@ async fn multiple_event_targets_in_one_deletion() {
.await
.expect("relay should accept multi-target deletion");
tokio::time::sleep(Duration::from_millis(300)).await;
for id in &ids {
wait_until_not_served(&client, *id).await;
}
let mut still_served = Vec::new();
for id in &ids {
@@ -453,7 +442,6 @@ async fn mixed_e_and_a_tag_deletion() {
.await
.expect("relay should accept issue");
tokio::time::sleep(Duration::from_millis(200)).await;
assert!(
client
.is_event_on_relay(issue_id)
@@ -469,7 +457,8 @@ async fn mixed_e_and_a_tag_deletion() {
.await
.expect("relay should accept mixed e/a deletion");
tokio::time::sleep(Duration::from_millis(300)).await;
wait_until_not_served(&client, issue_id).await;
wait_until_not_served(&client, announcement.id).await;
let issue_served = client
.is_event_on_relay(issue_id)
@@ -660,7 +649,6 @@ async fn newer_addressable_event_survives_a_tag_deletion() {
.await
.expect("relay should accept addressable event referencing the repo");
tokio::time::sleep(Duration::from_millis(200)).await;
assert!(
client
.is_event_on_relay(v1_id)
@@ -678,7 +666,7 @@ async fn newer_addressable_event_survives_a_tag_deletion() {
.await
.expect("relay should accept deletion by coordinate");
tokio::time::sleep(Duration::from_millis(300)).await;
wait_until_not_served(&client, v1_id).await;
// Stage 4: v1 must be gone.
assert!(
@@ -706,8 +694,6 @@ async fn newer_addressable_event_survives_a_tag_deletion() {
.await
.expect("relay should accept an addressable event newer than the deletion request");
tokio::time::sleep(Duration::from_millis(300)).await;
let served_by_id = client
.is_event_on_relay(v2_id)
.await
@@ -766,7 +752,7 @@ async fn normal_mode_honours_deletion() {
.await
.expect("normal relay should OK the kind-5 deletion");
tokio::time::sleep(Duration::from_millis(300)).await;
wait_until_not_served(&client, announcement.id).await;
let served_by_id = client
.is_event_on_relay(announcement.id)