From 5877dd6dfc0d4cfb7334791418ce8e0cefedd7d6 Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Sun, 18 Aug 2024 10:33:58 +1200
Subject: [PATCH] replace ToMinionPayloadDetail::SubscribeNip46

---
 gossip-lib/src/comms.rs             |  1 -
 gossip-lib/src/minion/filter_fns.rs | 16 ----------------
 gossip-lib/src/minion/mod.rs        | 13 -------------
 gossip-lib/src/overlord.rs          |  2 +-
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/gossip-lib/src/comms.rs b/gossip-lib/src/comms.rs
index 5d616647..303f631d 100644
--- a/gossip-lib/src/comms.rs
+++ b/gossip-lib/src/comms.rs
@@ -270,7 +270,6 @@ pub(crate) enum ToMinionPayloadDetail {
     SubscribeReplies(IdHex),
     SubscribeRootReplies(EventReference),
     SubscribeDmChannel(DmChannel),
-    SubscribeNip46,
     TempSubscribePersonFeedChunk { pubkey: PublicKey, anchor: Unixtime },
     TempSubscribeInboxFeedChunk(Unixtime),
     UnsubscribePersonFeed,
diff --git a/gossip-lib/src/minion/filter_fns.rs b/gossip-lib/src/minion/filter_fns.rs
index ddc50d46..e380801d 100644
--- a/gossip-lib/src/minion/filter_fns.rs
+++ b/gossip-lib/src/minion/filter_fns.rs
@@ -152,19 +152,3 @@ pub fn dm_channel(dmchannel: DmChannel) -> Vec<Filter> {
 
     vec![filter]
 }
-
-pub fn nip46() -> Vec<Filter> {
-    let pubkey = match GLOBALS.identity.public_key() {
-        Some(pk) => pk,
-        None => return vec![],
-    };
-    let pkh: PublicKeyHex = pubkey.into();
-
-    let mut filter = Filter {
-        kinds: vec![EventKind::NostrConnect],
-        ..Default::default()
-    };
-    filter.set_tag_values('p', vec![pkh.to_string()]);
-
-    vec![filter]
-}
diff --git a/gossip-lib/src/minion/mod.rs b/gossip-lib/src/minion/mod.rs
index e3e11bbc..681e5683 100644
--- a/gossip-lib/src/minion/mod.rs
+++ b/gossip-lib/src/minion/mod.rs
@@ -653,9 +653,6 @@ impl Minion {
             ToMinionPayloadDetail::SubscribeDmChannel(dmchannel) => {
                 self.subscribe_dm_channel(message.job_id, dmchannel).await?;
             }
-            ToMinionPayloadDetail::SubscribeNip46 => {
-                self.subscribe_nip46(message.job_id).await?;
-            }
             ToMinionPayloadDetail::TempSubscribePersonFeedChunk { pubkey, anchor } => {
                 self.temp_subscribe_person_feed_chunk(message.job_id, pubkey, anchor)
                     .await?;
@@ -868,16 +865,6 @@ impl Minion {
         Ok(())
     }
 
-    async fn subscribe_nip46(&mut self, job_id: u64) -> Result<(), Error> {
-        let filters = filter_fns::nip46();
-
-        if !filters.is_empty() {
-            self.subscribe(filters, "nip46", job_id).await?;
-        }
-
-        Ok(())
-    }
-
     async fn get_events(&mut self) -> Result<(), Error> {
         // Collect all the sought events we have not yet asked for, and
         // presumptively mark them as having been asked for.
diff --git a/gossip-lib/src/overlord.rs b/gossip-lib/src/overlord.rs
index dd0f6176..d99c9b49 100644
--- a/gossip-lib/src/overlord.rs
+++ b/gossip-lib/src/overlord.rs
@@ -2691,7 +2691,7 @@ impl Overlord {
                 reason: RelayConnectionReason::NostrConnect,
                 payload: ToMinionPayload {
                     job_id: rand::random::<u64>(),
-                    detail: ToMinionPayloadDetail::SubscribeNip46,
+                    detail: ToMinionPayloadDetail::Subscribe(FilterSet::Nip46),
                 },
             }],
         );