replace ToMinionPayloadDetail::SubscribeNip46

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,

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]
-}

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.

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),
                 },
             }],
         );