fix: move StartSubscription to start.go

getAlby · Oct 29, 2024 · 9f69b1a · 9f69b1a
1 parent aa2c3c1
commit 9f69b1a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/service/service.go b/service/service.go
@@ -148,31 +148,6 @@ func (svc *service) noticeHandler(notice string) {
 	logger.Logger.Infof("Received a notice %s", notice)
 }
 
-func (svc *service) StartSubscription(ctx context.Context, sub *nostr.Subscription) error {
-	svc.nip47Service.StartNotifier(ctx, sub.Relay, svc.lnClient)
-
-	go func() {
-		// block till EOS is received
-		<-sub.EndOfStoredEvents
-		logger.Logger.Debug("Received EOS")
-
-		// loop through incoming events
-		for event := range sub.Events {
-			go svc.nip47Service.HandleEvent(ctx, sub.Relay, event, svc.lnClient)
-		}
-		logger.Logger.Debug("Relay subscription events channel ended")
-	}()
-
-	<-ctx.Done()
-
-	if sub.Relay.ConnectionError != nil {
-		logger.Logger.WithField("connectionError", sub.Relay.ConnectionError).Error("Relay error")
-		return sub.Relay.ConnectionError
-	}
-	logger.Logger.Info("Exiting subscription...")
-	return nil
-}
-
 func finishRestoreNode(workDir string) error {
 	restoreDir := filepath.Join(workDir, "restore")
 	if restoreDirStat, err := os.Stat(restoreDir); err == nil && restoreDirStat.IsDir() {

diff --git a/service/start.go b/service/start.go
@@ -162,6 +162,31 @@ func (svc *service) startAppWalletSubscription(ctx context.Context, relay *nostr
 	return nil
 }
 
+func (svc *service) StartSubscription(ctx context.Context, sub *nostr.Subscription) error {
+	svc.nip47Service.StartNotifier(ctx, sub.Relay, svc.lnClient)
+
+	go func() {
+		// block till EOS is received
+		<-sub.EndOfStoredEvents
+		logger.Logger.Debug("Received EOS")
+
+		// loop through incoming events
+		for event := range sub.Events {
+			go svc.nip47Service.HandleEvent(ctx, sub.Relay, event, svc.lnClient)
+		}
+		logger.Logger.Debug("Relay subscription events channel ended")
+	}()
+
+	<-ctx.Done()
+
+	if sub.Relay.ConnectionError != nil {
+		logger.Logger.WithField("connectionError", sub.Relay.ConnectionError).Error("Relay error")
+		return sub.Relay.ConnectionError
+	}
+	logger.Logger.Info("Exiting subscription...")
+	return nil
+}
+
 func (svc *service) StartApp(encryptionKey string) error {
 	if svc.lnClient != nil {
 		return errors.New("app already started")