eventstore tests.

eventstore/bluge/bluge_test.go

@@ -1,12 +1,11 @@
 package bluge
 
 import (
-	"context"
 	"os"
 	"testing"
 
-	"fiatjaf.com/nostr/eventstore/badger"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore/badger"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -25,9 +24,7 @@ func TestBlugeFlow(t *testing.T) {
 	bl.Init()
 	defer bl.Close()
 
-	ctx := context.Background()
-
-	willDelete := make([]*nostr.Event, 0, 3)
+	willDelete := make([]nostr.Event, 0, 3)
 
 	for i, content := range []string{
 		"good morning mr paper maker",
@@ -36,11 +33,11 @@ func TestBlugeFlow(t *testing.T) {
 		"tonight we dine in my house",
 		"the paper in this house if very good, mr",
 	} {
-		evt := &nostr.Event{Content: content, Tags: nostr.Tags{}}
-		evt.Sign("0000000000000000000000000000000000000000000000000000000000000001")
+		evt := nostr.Event{Content: content, Tags: nostr.Tags{}}
+		evt.Sign(nostr.MustSecretKeyFromHex("0000000000000000000000000000000000000000000000000000000000000001"))
 
-		bb.SaveEvent(ctx, evt)
-		bl.SaveEvent(ctx, evt)
+		bb.SaveEvent(evt)
+		bl.SaveEvent(evt)
 
 		if i%2 == 0 {
 			willDelete = append(willDelete, evt)
@@ -48,33 +45,26 @@ func TestBlugeFlow(t *testing.T) {
 	}
 
 	{
-		ch, err := bl.QueryEvents(ctx, nostr.Filter{Search: "good"})
-		if err != nil {
-			t.Fatalf("QueryEvents error: %s", err)
-			return
-		}
 		n := 0
-		for range ch {
+		for range bl.QueryEvents(nostr.Filter{Search: "good"}) {
 			n++
 		}
 		assert.Equal(t, 3, n)
 	}
 
 	for _, evt := range willDelete {
-		bl.DeleteEvent(ctx, evt)
+		bl.DeleteEvent(evt.ID)
 	}
 
 	{
-		ch, err := bl.QueryEvents(ctx, nostr.Filter{Search: "good"})
-		if err != nil {
-			t.Fatalf("QueryEvents error: %s", err)
-			return
-		}
 		n := 0
-		for res := range ch {
+		for res := range bl.QueryEvents(nostr.Filter{Search: "good"}) {
 			n++
 			assert.Equal(t, res.Content, "good night")
-			assert.Equal(t, res.PubKey, "79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798")
+			assert.Equal(t,
+				nostr.MustPubKeyFromHex("79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798"),
+				res.PubKey,
+			)
 		}
 		assert.Equal(t, 1, n)
 	}