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

fix: use ValidRepoServed for events that tag repo events

Browse Source 
PR events, issues, and comments need a queryable repo announcement
to reference. Changed PREvent and PREventGenerated fixtures and
related tests to depend on ValidRepoServed instead of ValidRepoSent.

This ensures tests will fail correctly when announcement purgatory
is implemented - events tagging a repo should require that repo
to be served (not in purgatory).
This commit is contained in:
DanConwayDev
2026-02-13 12:31:49 +00:00
parent d6b955104f
commit a2a99d5a41
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grasp-audit/src/fixtures.rs
+17 -17
View File
@@ -140,7 +140,7 @@ pub enum FixtureKind {
ValidRepoServed,
/// Repository with one issue (kind 1621)
/// - Requires ValidRepoSent (reuses same repo_id)
/// - Requires ValidRepoServed (needs queryable repo for issue to reference)
RepoWithIssue,
/// Repository with issue and comment (kind 1111)
@@ -154,8 +154,8 @@ pub enum FixtureKind {
/// - Timestamp: 10 seconds in the past
RepoState,
/// PR (Pull Request) event for the SAME repo_id as ValidRepoSent
/// - Requires ValidRepoSent (uses same repo_id)
/// PR (Pull Request) event for the SAME repo_id as ValidRepoServed
/// - Requires ValidRepoServed (uses same repo_id, needs queryable repo)
/// - Signed by `client.pr_author_keys()`
/// - Kind 1618 (NIP-34 PR)
/// - Includes `a` tag referencing the repo
@@ -168,7 +168,7 @@ pub enum FixtureKind {
/// This is a "Generated" stage fixture - the event is created but not published.
/// Useful for tests that need the PR event ID before the event exists on the relay.
///
/// - Requires ValidRepoSent (uses same repo_id)
/// - Requires ValidRepoServed (uses same repo_id, needs queryable repo)
/// - Signed by `client.pr_author_keys()`
/// - Kind 1618 (NIP-34 PR)
/// - Includes `c` tag pointing to PR_TEST_COMMIT_HASH
@@ -202,7 +202,7 @@ pub enum FixtureKind {
/// (the "wrong" commit), but no PR event exists yet on the relay.
///
/// Server state after this fixture:
/// - ValidRepoSent announcement on relay
/// - ValidRepoServed announcement on relay (repo is queryable)
/// - refs/nostr/<pr-event-id> exists on git server with wrong commit
/// - PR event is NOT on relay (but returned for tests to publish later)
///
@@ -218,7 +218,7 @@ pub enum FixtureKind {
/// then the PR event was published (which may trigger cleanup).
///
/// Server state after this fixture:
/// - ValidRepoSent announcement on relay
/// - ValidRepoServed announcement on relay
/// - PR event is on relay
/// - refs/nostr/<pr-event-id> may have been cleaned up (that's what tests verify)
///
@@ -343,8 +343,8 @@ impl FixtureKind {
// Fixtures that depend on ValidRepoServed (need queryable announcement)
Self::RepoWithIssue => vec![Self::ValidRepoServed],
Self::RepoState => vec![Self::ValidRepoSent],
Self::PREvent => vec![Self::ValidRepoSent],
Self::PREventGenerated => vec![Self::ValidRepoSent],
Self::PREvent => vec![Self::ValidRepoServed],
Self::PREventGenerated => vec![Self::ValidRepoServed],
Self::PRWrongCommitPushedBeforeEvent => vec![Self::PREventGenerated],
Self::PREventSentAfterWrongPush => vec![Self::PRWrongCommitPushedBeforeEvent],
@@ -777,15 +777,15 @@ impl<'a> TestContext<'a> {
FixtureKind::PREvent => {
use nostr_sdk::prelude::*;
// ValidRepoSent is ensured by ensure_fixture before this is called
let repo = self.get_cached_dependency(FixtureKind::ValidRepoSent)?;
// ValidRepoServed is ensured by ensure_fixture before this is called
let repo = self.get_cached_dependency(FixtureKind::ValidRepoServed)?;
let repo_id = repo
.tags
.iter()
.find(|t| t.kind() == TagKind::d())
.and_then(|t| t.content())
.ok_or_else(|| anyhow::anyhow!("Missing repo_id in ValidRepoSent fixture"))?
.ok_or_else(|| anyhow::anyhow!("Missing repo_id in ValidRepoServed fixture"))?
.to_string();
// Create PR event 1 second in the past
@@ -820,15 +820,15 @@ impl<'a> TestContext<'a> {
// This fixture is for "Generated" stage only
use nostr_sdk::prelude::*;
// ValidRepoSent is ensured by ensure_fixture before this is called
let repo = self.get_cached_dependency(FixtureKind::ValidRepoSent)?;
// ValidRepoServed is ensured by ensure_fixture before this is called
let repo = self.get_cached_dependency(FixtureKind::ValidRepoServed)?;
let repo_id = repo
.tags
.iter()
.find(|t| t.kind() == TagKind::d())
.and_then(|t| t.content())
.ok_or_else(|| anyhow::anyhow!("Missing repo_id in ValidRepoSent fixture"))?
.ok_or_else(|| anyhow::anyhow!("Missing repo_id in ValidRepoServed fixture"))?
.to_string();
// Create PR event 1 second in the past
@@ -1533,8 +1533,8 @@ impl<'a> TestContext<'a> {
let pr_event = self.get_cached_dependency(FixtureKind::PREventGenerated)?;
let pr_event_id = pr_event.id.to_hex();
// Get the ValidRepoSent to extract repo info
let repo = self.get_cached_dependency(FixtureKind::ValidRepoSent)?;
// Get the ValidRepoServed to extract repo info
let repo = self.get_cached_dependency(FixtureKind::ValidRepoServed)?;
let repo_id = self.extract_repo_id(&repo)?;
// Get relay domain for cloning
@@ -1613,7 +1613,7 @@ impl<'a> TestContext<'a> {
///
/// This fixture builds on PRWrongCommitPushedBeforeEvent by sending the PR event.
/// After this fixture, the relay has:
/// - ValidRepoSent announcement
/// - ValidRepoServed announcement
/// - PR event
/// - refs/nostr/<pr-event-id> may have been cleaned up (that's what tests verify)
///
grasp-audit/src/specs/grasp01/nip01_smoke.rs
+7 -7
View File
@@ -66,12 +66,12 @@ impl Nip01SmokeTests {
"MUST accept valid EVENT messages",
)
.run(|| async {
// Step 1: GENERATE - Create TestContext and get ValidRepo fixture
// Step 1: GENERATE - Create TestContext and get ValidRepoServed fixture
let ctx = TestContext::new(client);
let event = ctx
.get_fixture(FixtureKind::ValidRepoSent)
.get_fixture(FixtureKind::ValidRepoServed)
.await
.map_err(|e| format!("Failed to create ValidRepo fixture: {}", e))?;
.map_err(|e| format!("Failed to create ValidRepoServed fixture: {}", e))?;
let event_id = event.id;
@@ -122,7 +122,7 @@ impl Nip01SmokeTests {
///
/// ## Fixture-First Pattern
///
/// 1. **Generate**: Create TestContext and get ValidRepo fixture
/// 1. **Generate**: Create TestContext and get ValidRepoServed fixture
/// 2. **Send**: Fixture already sends the event to relay
/// 3. **Verify**: Subscribe and verify we receive the event
pub async fn test_create_subscription(client: &AuditClient) -> TestResult {
@@ -132,12 +132,12 @@ impl Nip01SmokeTests {
"MUST support REQ subscriptions",
)
.run(|| async {
// Step 1: GENERATE - Create TestContext and get ValidRepo fixture
// Step 1: GENERATE - Create TestContext and get ValidRepoServed fixture
let ctx = TestContext::new(client);
let _event = ctx
.get_fixture(FixtureKind::ValidRepoSent)
.get_fixture(FixtureKind::ValidRepoServed)
.await
.map_err(|e| format!("Failed to create ValidRepo fixture: {}", e))?;
.map_err(|e| format!("Failed to create ValidRepoServed fixture: {}", e))?;
// Step 2: VERIFY - Subscribe to NIP-34 announcements from this author
let filter = Filter::new()
grasp-audit/src/specs/grasp01/push_authorization.rs
+4 -4
View File
@@ -208,7 +208,7 @@ async fn setup_pr_test_repo(
) -> Result<(PathBuf, String, String, String), String> {
// Get fixtures
let repo_event = ctx
.get_fixture(FixtureKind::ValidRepoSent)
.get_fixture(FixtureKind::ValidRepoServed)
.await
.map_err(|e| format!("Failed to get repo announcement: {}", e))?;
@@ -1110,7 +1110,7 @@ impl PushAuthorizationTests {
let pr_event_id = pr_event.id.to_hex();
// Get repo info for cloning (fresh clone for verification)
let repo = match ctx.get_fixture(FixtureKind::ValidRepoSent).await {
let repo = match ctx.get_fixture(FixtureKind::ValidRepoServed).await {
Ok(r) => r,
Err(e) => {
return TestResult::new(test_name, SpecRef::GitAcceptRefsNostrEventId, desc)
@@ -1198,7 +1198,7 @@ impl PushAuthorizationTests {
let pr_event_id = pr_event.id.to_hex();
// Get repo info for cloning (fresh clone for this test)
let repo = match ctx.get_fixture(FixtureKind::ValidRepoSent).await {
let repo = match ctx.get_fixture(FixtureKind::ValidRepoServed).await {
Ok(r) => r,
Err(e) => {
return TestResult::new(test_name, SpecRef::GitAcceptRefsNostrEventId, desc)
@@ -1289,7 +1289,7 @@ impl PushAuthorizationTests {
let pr_event_id = pr_event.id.to_hex();
// Get repo info for cloning (fresh clone for this test)
let repo = match ctx.get_fixture(FixtureKind::ValidRepoSent).await {
let repo = match ctx.get_fixture(FixtureKind::ValidRepoServed).await {
Ok(r) => r,
Err(e) => {
return TestResult::new(test_name, SpecRef::GitAcceptRefsNostrEventId, desc)