From 5d02ad6b893f9059044914c115d77cf9d8e589c3 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Thu, 8 Jan 2026 11:20:35 +0000 Subject: refactor: replace hardcoded Kind constants with rust-nostr variants - Replace KIND_REPOSITORY_ANNOUNCEMENT with Kind::GitRepoAnnouncement - Replace KIND_REPOSITORY_STATE with Kind::RepoState - Replace KIND_PR with Kind::GitPullRequest - Replace KIND_PR_UPDATE with Kind::GitPullRequestUpdate - Replace KIND_USER_GRASP_LIST with Kind::GitUserGraspList - Replace KIND_PATCH with Kind::GitPatch - Replace KIND_ISSUE with Kind::GitIssue - Replace KIND_COMMENT with Kind::Comment - Replace all Kind::Custom(30617|30618|1617|1618|1619|1621|1111|10317) patterns - Remove all hardcoded KIND_* constants from events.rs - Update all match statements to use Kind enum directly - Update all filter builders to use Kind variants - Update all test helpers and assertions Benefits: - Type safety: compiler prevents wrong kind numbers - Readability: Kind::GitRepoAnnouncement is self-documenting - Maintainability: single source of truth (rust-nostr) - IDE support: full autocompletion and refactoring - Standards: aligns with rust-nostr best practices Files modified: 21 Constants removed: 9 Patterns replaced: 100+ Tests passing: 222/222 --- tests/nip77_negentropy.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tests/nip77_negentropy.rs') diff --git a/tests/nip77_negentropy.rs b/tests/nip77_negentropy.rs index 5293754..fccfe67 100644 --- a/tests/nip77_negentropy.rs +++ b/tests/nip77_negentropy.rs @@ -56,7 +56,7 @@ async fn test_nip77_negentropy_sync_finds_events() { // Create a second event (issue referencing the repo) let repo_coord = format!( "{}:{}:{}", - KIND_REPOSITORY_STATE, + Kind::GitRepoAnnouncement.as_u16(), keys.public_key().to_hex(), "test-repo-nip77" ); @@ -103,10 +103,9 @@ async fn test_nip77_negentropy_sync_finds_events() { tokio::time::sleep(Duration::from_millis(500)).await; // 6. Perform negentropy sync with filter matching our events - let filter = Filter::new().author(keys.public_key()).kinds(vec![ - Kind::Custom(KIND_REPOSITORY_STATE), - Kind::Custom(KIND_ISSUE), - ]); + let filter = Filter::new() + .author(keys.public_key()) + .kinds(vec![Kind::GitRepoAnnouncement, Kind::GitIssue]); println!("Starting negentropy sync with filter: {:?}", filter); @@ -183,7 +182,7 @@ async fn test_nip77_negentropy_sync_empty_result() { // 3. Sync with filter that won't match anything let filter = Filter::new() .author(keys.public_key()) // Random new key, no events exist - .kind(Kind::Custom(KIND_REPOSITORY_STATE)); + .kind(Kind::GitRepoAnnouncement); println!("Starting negentropy sync with empty filter"); -- cgit v1.2.3