refactor these tests to ensure nested subscriptions are not blocking each other.

subscription_test.go

@@ -2,11 +2,13 @@ package nostr
 
 import (
 	"context"
+	"fmt"
+	"sync/atomic"
 	"testing"
 	"time"
 )
 
-const RELAY = "wss://relay.damus.io"
+const RELAY = "wss://relay.nostr.band"
 
 // test if we can fetch a couple of random events
 func TestSubscribe(t *testing.T) {
@@ -51,19 +53,19 @@ func TestNestedSubscriptions(t *testing.T) {
 	rl := mustRelayConnect(RELAY)
 	defer rl.Close()
 
-	// fetch any note
+	n := atomic.Uint32{}
-	sub, err := rl.Subscribe(context.Background(), Filters{{Kinds: []int{1}, Limit: 1}})
+
+	// fetch 2 replies to a note
+	sub, err := rl.Subscribe(context.Background(), Filters{{Kinds: []int{1}, Tags: TagMap{"e": []string{"0e34a74f8547e3b95d52a2543719b109fd0312aba144e2ef95cba043f42fe8c5"}}, Limit: 3}})
 	if err != nil {
 		t.Errorf("subscription 1 failed: %v", err)
 		return
 	}
 
-	timeout := time.After(5 * time.Second)
-
 	for {
 		select {
 		case event := <-sub.Events:
-			// now fetch author of this event
+			// now fetch author of this
 			sub, err := rl.Subscribe(context.Background(), Filters{{Kinds: []int{0}, Authors: []string{event.PubKey}, Limit: 1}})
 			if err != nil {
 				t.Errorf("subscription 2 failed: %v", err)
@@ -73,30 +75,28 @@ func TestNestedSubscriptions(t *testing.T) {
 			for {
 				select {
 				case <-sub.Events:
-					// now mentions of this person
+					// do another subscription here in "sync" mode, just so we're sure things are not blocking
-					sub, err := rl.Subscribe(context.Background(), Filters{{Kinds: []int{1}, Tags: TagMap{"p": []string{event.PubKey}}, Limit: 1}})
+					rl.QuerySync(context.Background(), Filter{Limit: 1})
-					if err != nil {
+
-						t.Errorf("subscription 3 failed: %v", err)
+					n.Add(1)
+					if n.Load() == 3 {
+						// if we get here it means the test passed
 						return
 					}
-
+				case <-sub.Context.Done():
-					for {
+					goto end
-						select {
+				case <-sub.EndOfStoredEvents:
-						case <-sub.Events:
+					sub.Unsub()
-							// if we get here safely we won
-							return
-						case <-timeout:
-							t.Errorf("timeout 3")
-						}
-					}
-				case <-timeout:
-					t.Errorf("timeout 2")
 				}
 			}
-		case <-rl.Context().Done():
+		end:
+			fmt.Println("")
+		case <-sub.EndOfStoredEvents:
+			sub.Unsub()
+			return
+		case <-sub.Context.Done():
 			t.Errorf("connection closed: %v", rl.Context().Err())
-		case <-timeout:
+			return
-			t.Errorf("timeout 1")
 		}
 	}
 }