From f41bd47bf95dabfa3d0e6cb110e751e7cd43f138 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Fri, 19 Dec 2025 13:17:29 +0000
Subject: refactor: rename connect_and_subscribe to connect

Separated connection from subscription logic. The RelayConnection.connect()
method now only handles WebSocket connection establishment. Subscriptions
are managed separately via handle_connect_or_reconnect.

Changes:
- Renamed RelayConnection::connect_and_subscribe() to connect()
- Removed subscription logic from connect method
- Updated call site in try_connect_relay()
- Removed unused build_announcement_filter import
---
 src/sync/mod.rs              |  6 +++---
 src/sync/relay_connection.rs | 28 +++++++---------------------
 2 files changed, 10 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/sync/mod.rs b/src/sync/mod.rs
index 85ab680..3f8e503 100644
--- a/src/sync/mod.rs
+++ b/src/sync/mod.rs
@@ -1205,8 +1205,8 @@ impl SyncManager {
 
         let timeout = self.health_tracker.base_backoff_secs();
 
-        match connection.connect_and_subscribe(None, timeout).await {
-            Ok(_) => {
+        match connection.connect(timeout).await {
+            Ok(()) => {
                 // Success - record and send notification
                 self.health_tracker.record_success(relay_url);
 
@@ -1346,7 +1346,7 @@ impl SyncManager {
 
         // 3. Keep RelayConnection in HashMap for reuse on reconnect
         // The connection object persists and will be reused when retry_disconnected_relays
-        // calls try_connect_relay -> connection.connect_and_subscribe()
+        // calls try_connect_relay -> connection.connect()
         tracing::debug!(
             relay = %relay_url,
             "Keeping RelayConnection in HashMap for reconnection"
diff --git a/src/sync/relay_connection.rs b/src/sync/relay_connection.rs
index fdb32cb..fa229c4 100644
--- a/src/sync/relay_connection.rs
+++ b/src/sync/relay_connection.rs
@@ -18,7 +18,6 @@
 use nostr_sdk::prelude::*;
 use tokio::sync::mpsc;
 
-use super::filters::build_announcement_filter;
 use crate::nostr::builder::SharedDatabase;
 
 /// Events from a relay connection
@@ -107,28 +106,24 @@ impl RelayConnection {
         }
     }
 
-    /// Connect to the relay and subscribe to Layer 1 (announcements)
+    /// Connect to the relay
     ///
     /// This method:
     /// 1. Adds the relay to the client
     /// 2. Establishes the WebSocket connection
     /// 3. Verifies connection was established
-    /// 4. Subscribes to Layer 1 filter (kinds 30617 + 30618)
+    ///
+    /// Subscriptions are handled separately via handle_connect_or_reconnect.
     ///
     /// # Arguments
-    /// * `since` - Optional timestamp for incremental sync on reconnect
     /// * `connection_timeout_secs` - Timeout for the connection attempt in seconds.
     ///   Should be no larger than base_backoff_secs to ensure the connection attempt
     ///   completes before the next retry would be scheduled.
     ///
     /// # Returns
-    /// * `Ok(SubscriptionId)` - The subscription ID on successful connection
+    /// * `Ok(())` - Connection established successfully
     /// * `Err(String)` with error description on failure
-    pub async fn connect_and_subscribe(
-        &self,
-        since: Option<Timestamp>,
-        connection_timeout_secs: u64,
-    ) -> Result<SubscriptionId, String> {
+    pub async fn connect(&self, connection_timeout_secs: u64) -> Result<(), String> {
         // Add relay to client
         self.client
             .add_relay(&self.url)
@@ -157,17 +152,8 @@ impl RelayConnection {
             .await
             .map_err(|e| format!("Failed to connect to relay {}: {}", self.url, e))?;
 
-        // Subscribe to Layer 1 (announcements)
-        let filter = build_announcement_filter(since);
-        let output = self.client.subscribe(filter, None).await.map_err(|e| {
-            format!(
-                "Failed to subscribe to announcements on {}: {}",
-                self.url, e
-            )
-        })?;
-
-        tracing::info!(url = %self.url, sub_id = %output.val, "Connected and subscribed to Layer 1 (announcements)");
-        Ok(output.val)
+        tracing::info!(url = %self.url, "Connected to relay");
+        Ok(())
     }
 
     /// Run the event loop, sending events through the provided channel
-- 
cgit v1.2.3