From 6ae42e67d9da36f6c2e1356acba30a3a62112bc7 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Mon, 4 Aug 2025 08:20:30 +0100
Subject: fix: `t` tag `revision-root` ~> `root-revision`

NIP-34 specifies patch revisions should have a `t` tag of
`root-revision` whereas we have been using `revision-root`.

this fixes it and and handles events created with the incorrect tag.
---
 tests/git_remote_nostr/push.rs |  6 +++++-
 tests/ngit_send.rs             | 19 ++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'tests')

diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs
index a137da5..2afadf9 100644
--- a/tests/git_remote_nostr/push.rs
+++ b/tests/git_remote_nostr/push.rs
@@ -1688,7 +1688,11 @@ async fn force_push_creates_proposal_revision() -> Result<()> {
 
     let revision_root_patch = new_events
         .iter()
-        .find(|e| e.tags.iter().any(|t| t.as_slice()[1].eq("revision-root")))
+        .find(|e| {
+            e.tags
+                .iter()
+                .any(|t| ["revision-root", "root-revision"].contains(&t.as_slice()[1].as_str()))
+        })
         .unwrap();
 
     assert_eq!(
diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs
index 9a46469..b0c1768 100644
--- a/tests/ngit_send.rs
+++ b/tests/ngit_send.rs
@@ -1592,11 +1592,10 @@ mod root_proposal_specified_using_in_reply_to_with_range_of_head_2_and_cover_let
             for relay in [&r53, &r55, &r56] {
                 let cover_letter_event: &nostr::Event =
                     relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
-                assert!(
-                    cover_letter_event.tags.iter().any(|t| {
-                        t.as_slice()[0].eq("t") && t.as_slice()[1].eq(&"revision-root")
-                    })
-                );
+                assert!(cover_letter_event.tags.iter().any(|t| {
+                    t.as_slice()[0].eq("t")
+                        && ["revision-root", "root-revision"].contains(&t.as_slice()[1].as_str())
+                }));
             }
             Ok(())
         }
@@ -1773,12 +1772,10 @@ mod in_reply_to_mentions_issue {
         for relay in [&r53, &r55, &r56] {
             let cover_letter_event: &nostr::Event =
                 relay.events.iter().find(|e| is_cover_letter(e)).unwrap();
-            assert!(
-                !cover_letter_event
-                    .tags
-                    .iter()
-                    .any(|t| { t.as_slice()[0].eq("t") && t.as_slice()[1].eq(&"revision-root") })
-            );
+            assert!(!cover_letter_event.tags.iter().any(|t| {
+                t.as_slice()[0].eq("t")
+                    && ["revision-root", "root-revision"].contains(&t.as_slice()[1].as_str())
+            }));
         }
         Ok(())
     }
-- 
cgit v1.2.3