tests on root and khatru working.

khatru/adding.go

@@ -45,6 +45,7 @@ func (rl *Relay) handleNormal(ctx context.Context, evt nostr.Event) (skipBroadca
 	} else {
 		// otherwise it's a replaceable
 		if nil != rl.ReplaceEvent {
+			fmt.Print("\nREPLACING .", evt.CreatedAt, "\n\n")
 			if err := rl.ReplaceEvent(ctx, evt); err != nil {
 				switch err {
 				case eventstore.ErrDupEvent:

khatru/handlers.go

@@ -53,7 +53,7 @@ func (rl *Relay) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func (rl *Relay) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
-	if rl.RejectConnection == nil {
+	if nil != rl.RejectConnection {
 		if rl.RejectConnection(r) {
 			w.WriteHeader(429) // Too many requests
 			return
@@ -92,7 +92,7 @@ func (rl *Relay) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
 	)
 
 	kill := func() {
-		if rl.OnDisconnect == nil {
+		if nil != rl.OnDisconnect {
 			rl.OnDisconnect(ctx)
 		}
 
@@ -114,7 +114,7 @@ func (rl *Relay) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
 			return nil
 		})
 
-		if rl.OnConnect == nil {
+		if nil != rl.OnConnect {
 			rl.OnConnect(ctx)
 		}
 

khatru/relay_test.go

@@ -183,7 +183,7 @@ func TestBasicRelayFunctionality(t *testing.T) {
 
 		// create newer event that should replace the first
 		evt2 := createEvent(sk1, 0, `{"name":"newer"}`, nil)
-		evt2.CreatedAt = 2000 // Newer timestamp
+		evt2.CreatedAt = 2004 // Newer timestamp
 		evt2.Sign(sk1)
 		err = client1.Publish(ctx, evt2)
 		if err != nil {
@@ -213,8 +213,8 @@ func TestBasicRelayFunctionality(t *testing.T) {
 		var receivedEvents []nostr.Event
 		for {
 			select {
-			case env := <-sub.Events:
-				receivedEvents = append(receivedEvents, env)
+			case evt := <-sub.Events:
+				receivedEvents = append(receivedEvents, evt)
 			case <-sub.EndOfStoredEvents:
 				if len(receivedEvents) != 1 {
 					t.Errorf("expected exactly 1 event, got %d", len(receivedEvents))

khatru/responding.go

@@ -32,7 +32,6 @@ func (rl *Relay) handleRequest(ctx context.Context, id string, eose *sync.WaitGr
 		for event := range rl.QueryStored(ctx, filter) {
 			ws.WriteJSON(nostr.EventEnvelope{SubscriptionID: &id, Event: event})
 		}
-		eose.Done()
 	}
 
 	return nil