Coracle/nostrlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix types so tests compile.

Browse Source
This commit is contained in:
fiatjaf
2025-05-12 09:34:25 -03:00
parent f4855dba4e
commit 7b1f4ae49a
17 changed files with 64 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eventstore/badger/badger_test.go
View File

@@ -47,7 +47,7 @@ func TestBasicStoreAndQuery(t *testing.T) {
// collect results
results := make([]nostr.Event, 0)
for event := range db.QueryEvents(filter) {
for event := range db.QueryEvents(filter, 500) {
results = append(results, event)
}

3
eventstore/badger/fuzz_test.go
View File

@@ -61,7 +61,6 @@ func FuzzQuery(f *testing.F) {
return
}
db.MaxLimit = 500
defer db.Close()
// ~ start actual test
@@ -116,7 +115,7 @@ func FuzzQuery(f *testing.F) {
start := time.Now()
// fmt.Println(filter)
res := slices.Collect(db.QueryEvents(filter))
res := slices.Collect(db.QueryEvents(filter, 500))
end := time.Now()
require.NoError(t, err)

4
eventstore/bluge/bluge_test.go
View File

@@ -46,7 +46,7 @@ func TestBlugeFlow(t *testing.T) {
{
n := 0
for range bl.QueryEvents(nostr.Filter{Search: "good"}) {
for range bl.QueryEvents(nostr.Filter{Search: "good"}, 400) {
n++
}
assert.Equal(t, 3, n)
@@ -58,7 +58,7 @@ func TestBlugeFlow(t *testing.T) {
{
n := 0
for res := range bl.QueryEvents(nostr.Filter{Search: "good"}) {
for res := range bl.QueryEvents(nostr.Filter{Search: "good"}, 400) {
n++
assert.Equal(t, res.Content, "good night")
assert.Equal(t,

3
eventstore/lmdb/fuzz_test.go
View File

@@ -36,7 +36,6 @@ func FuzzQuery(f *testing.F) {
db := &LMDBBackend{}
db.Path = "/tmp/lmdbtest"
db.extraFlags = lmdb.NoSync
db.MaxLimit = 500
if err := db.Init(); err != nil {
t.Fatal(err)
return
@@ -95,7 +94,7 @@ func FuzzQuery(f *testing.F) {
start := time.Now()
res := slices.Collect(db.QueryEvents(filter))
res := slices.Collect(db.QueryEvents(filter, 500))
end := time.Now()
require.Equal(t, len(expected), len(res), "number of results is different than expected")

12
eventstore/mmm/fuzz_test.go
View File

@@ -40,9 +40,7 @@ func FuzzTest(f *testing.F) {
for i := range nlayers {
name := string([]byte{97 + byte(i)})
err = mmm.EnsureLayer(name, &IndexingLayer{
MaxLimit: 1000,
})
err = mmm.EnsureLayer(name, &IndexingLayer{})
require.NoError(t, err, "layer %s/%d", name, i)
}
@@ -90,7 +88,7 @@ func FuzzTest(f *testing.F) {
// verify each layer has the correct events
for _, layer := range mmm.layers {
count := 0
for evt := range layer.QueryEvents(nostr.Filter{}) {
for evt := range layer.QueryEvents(nostr.Filter{}, 500) {
require.True(t, evt.Tags.ContainsAny("t", []string{layer.name}))
count++
}
@@ -148,13 +146,13 @@ func FuzzTest(f *testing.F) {
for _, layer := range mmm.layers {
// verify event still accessible from other layers
if slices.Contains(foundlayers, layer) {
next, stop := iter.Pull(layer.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{evt.Kind}})) // hack
next, stop := iter.Pull(layer.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{evt.Kind}}, 500)) // hack
_, fetched := next()
require.True(t, fetched)
stop()
} else {
// and not accessible from this layer we just deleted
next, stop := iter.Pull(layer.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{evt.Kind}})) // hack
next, stop := iter.Pull(layer.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{evt.Kind}}, 500)) // hack
_, fetched := next()
require.True(t, fetched)
stop()
@@ -166,7 +164,7 @@ func FuzzTest(f *testing.F) {
// now delete a layer and events that only exist in that layer should vanish
layer := mmm.layers[rnd.Int()%len(mmm.layers)]
eventsThatShouldVanish := make([]nostr.ID, 0, nevents/2)
for evt := range layer.QueryEvents(nostr.Filter{}) {
for evt := range layer.QueryEvents(nostr.Filter{}, 500) {
if len(evt.Tags) == 1+len(deleted[evt.ID]) {
eventsThatShouldVanish = append(eventsThatShouldVanish, evt.ID)
}

8
eventstore/slicestore/slicestore_test.go
View File

@@ -27,7 +27,7 @@ func TestBasicStuff(t *testing.T) {
}
list := make([]nostr.Event, 0, 20)
for event := range ss.QueryEvents(nostr.Filter{}) {
for event := range ss.QueryEvents(nostr.Filter{}, 500) {
list = append(list, event)
}
require.Len(t, list, 20)
@@ -36,18 +36,16 @@ func TestBasicStuff(t *testing.T) {
t.Fatalf("order is incorrect")
}
until := nostr.Timestamp(9999)
list = make([]nostr.Event, 0, 7)
for event := range ss.QueryEvents(nostr.Filter{Limit: 15, Until: &until, Kinds: []nostr.Kind{11}}) {
for event := range ss.QueryEvents(nostr.Filter{Limit: 15, Until: nostr.Timestamp(9999), Kinds: []nostr.Kind{11}}, 500) {
list = append(list, event)
}
if len(list) != 7 {
t.Fatalf("should have gotten 7, not %d", len(list))
}
since := nostr.Timestamp(10009)
list = make([]nostr.Event, 0, 5)
for event := range ss.QueryEvents(nostr.Filter{Since: &since}) {
for event := range ss.QueryEvents(nostr.Filter{Since: nostr.Timestamp(10009)}, 500) {
list = append(list, event)
}
require.Len(t, list, 5)

2
eventstore/test/benchmark_test.go
View File

@@ -88,7 +88,7 @@ func runBenchmarkOn(b *testing.B, db eventstore.Store) {
for q, filter := range filters {
b.Run(fmt.Sprintf("q-%d", q), func(b *testing.B) {
for i := 0; i < b.N; i++ {
_ = db.QueryEvents(filter)
_ = db.QueryEvents(filter, 500)
}
})
}

34
eventstore/test/first_test.go
View File

@@ -44,7 +44,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
// query
{
results := slices.Collect(db.QueryEvents(nostr.Filter{}))
results := slices.Collect(db.QueryEvents(nostr.Filter{}, 500))
require.Len(t, results, len(allEvents))
require.ElementsMatch(t,
allEvents,
@@ -54,8 +54,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
{
for i := 0; i < 10; i++ {
since := nostr.Timestamp(i*10 + 1)
results := slices.Collect(db.QueryEvents(nostr.Filter{Since: &since}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Since: nostr.Timestamp(i*10 + 1)}, 500))
require.ElementsMatch(t,
allEvents[i:],
results,
@@ -64,7 +63,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
}
{
results := slices.Collect(db.QueryEvents(nostr.Filter{IDs: []nostr.ID{allEvents[7].ID, allEvents[9].ID}}))
results := slices.Collect(db.QueryEvents(nostr.Filter{IDs: []nostr.ID{allEvents[7].ID, allEvents[9].ID}}, 500))
require.Len(t, results, 2)
require.ElementsMatch(t,
[]nostr.Event{allEvents[7], allEvents[9]},
@@ -73,7 +72,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
}
{
results := slices.Collect(db.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{1}}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{1}}, 500))
require.ElementsMatch(t,
[]nostr.Event{allEvents[1], allEvents[3], allEvents[5], allEvents[7], allEvents[9]},
results,
@@ -81,7 +80,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
}
{
results := slices.Collect(db.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{9}}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{9}}, 500))
require.ElementsMatch(t,
[]nostr.Event{allEvents[0], allEvents[2], allEvents[4], allEvents[6], allEvents[8]},
results,
@@ -90,7 +89,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
{
pk4 := nostr.GetPublicKey(sk4)
results := slices.Collect(db.QueryEvents(nostr.Filter{Authors: []nostr.PubKey{pk4}}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Authors: []nostr.PubKey{pk4}}, 500))
require.ElementsMatch(t,
[]nostr.Event{allEvents[0], allEvents[3], allEvents[6], allEvents[9]},
results,
@@ -99,7 +98,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
{
pk3 := nostr.GetPublicKey(sk3)
results := slices.Collect(db.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{9}, Authors: []nostr.PubKey{pk3}}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{9}, Authors: []nostr.PubKey{pk3}}, 500))
require.ElementsMatch(t,
[]nostr.Event{allEvents[2], allEvents[4], allEvents[8]},
results,
@@ -109,7 +108,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
{
pk3 := nostr.GetPublicKey(sk3)
pk4 := nostr.GetPublicKey(sk4)
results := slices.Collect(db.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{9, 5, 7}, Authors: []nostr.PubKey{pk3, pk4}}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Kinds: []nostr.Kind{9, 5, 7}, Authors: []nostr.PubKey{pk3, pk4}}, 500))
require.ElementsMatch(t,
[]nostr.Event{allEvents[0], allEvents[2], allEvents[4], allEvents[6], allEvents[8]},
results,
@@ -117,7 +116,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
}
{
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"t": []string{"2", "4", "6"}}}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"t": []string{"2", "4", "6"}}}, 500))
require.ElementsMatch(t,
[]nostr.Event{allEvents[2], allEvents[4], allEvents[6]},
results,
@@ -130,7 +129,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
// query again
{
results := slices.Collect(db.QueryEvents(nostr.Filter{}))
results := slices.Collect(db.QueryEvents(nostr.Filter{}, 500))
require.ElementsMatch(t,
slices.Concat(allEvents[0:4], allEvents[6:]),
results,
@@ -138,7 +137,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
}
{
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"t": []string{"2", "6"}}}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"t": []string{"2", "6"}}}, 500))
require.ElementsMatch(t,
[]nostr.Event{allEvents[2], allEvents[6]},
results,
@@ -146,7 +145,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
}
{
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"e": []string{allEvents[3].Tags[1][1]}}}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"e": []string{allEvents[3].Tags[1][1]}}}, 500))
require.ElementsMatch(t,
[]nostr.Event{allEvents[3]},
results,
@@ -155,8 +154,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
{
for i := 0; i < 4; i++ {
until := nostr.Timestamp(i*10 + 1)
results := slices.Collect(db.QueryEvents(nostr.Filter{Until: &until}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Until: nostr.Timestamp(i*10 + 1)}, 500))
require.ElementsMatch(t,
allEvents[:i],
@@ -188,7 +186,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
}
{
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"p": []string{p}}, Kinds: []nostr.Kind{1984}, Limit: 2}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"p": []string{p}}, Kinds: []nostr.Kind{1984}, Limit: 2}, 500))
require.ElementsMatch(t,
[]nostr.Event{newEvents[2], newEvents[1]},
results,
@@ -197,7 +195,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
}
{
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"p": []string{p}, "t": []string{"x"}}, Limit: 4}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"p": []string{p}, "t": []string{"x"}}, Limit: 4}, 500))
require.ElementsMatch(t,
// the results won't be in canonical time order because this query is too awful, needs a kind
[]nostr.Event{newEvents[1]},
@@ -206,7 +204,7 @@ func runFirstTestOn(t *testing.T, db eventstore.Store) {
}
{
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"p": []string{p, p2}}, Kinds: []nostr.Kind{1}, Limit: 4}))
results := slices.Collect(db.QueryEvents(nostr.Filter{Tags: nostr.TagMap{"p": []string{p, p2}}, Kinds: []nostr.Kind{1}, Limit: 4}, 500))
for _, idx := range []int{5, 6, 7} {
require.True(t,
slices.ContainsFunc(

2
eventstore/test/manyauthors_test.go
View File

@@ -53,7 +53,7 @@ func manyAuthorsTest(t *testing.T, db eventstore.Store) {
}
}
res := slices.Collect(db.QueryEvents(bigfilter))
res := slices.Collect(db.QueryEvents(bigfilter, 500))
require.Len(t, res, limit)
require.True(t, slices.IsSortedFunc(res, nostr.CompareEventReverse))
slices.SortFunc(ordered, nostr.CompareEventReverse)

2
eventstore/test/second_test.go
View File

@@ -71,7 +71,7 @@ func runSecondTestOn(t *testing.T, db eventstore.Store) {
for q, filter := range filters {
label := fmt.Sprintf("filter %d: %s", q, filter)
t.Run(fmt.Sprintf("q-%d", q), func(t *testing.T) {
results := slices.Collect(db.QueryEvents(filter))
results := slices.Collect(db.QueryEvents(filter, 500))
require.NotEmpty(t, results, label)
})
}

2
eventstore/test/unbalanced_test.go
View File

@@ -60,7 +60,7 @@ func unbalancedTest(t *testing.T, db eventstore.Store) {
}
require.Len(t, expected, limit)
res := slices.Collect(db.QueryEvents(bigfilter))
res := slices.Collect(db.QueryEvents(bigfilter, 500))
require.Equal(t, limit, len(res))
require.True(t, slices.IsSortedFunc(res, nostr.CompareEventReverse))