coracle/nostrlib
2
1
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix GetTheoreticalLimit() buggy logic.

Browse Source
This commit is contained in:
fiatjaf
2025-05-12 12:23:24 -03:00
parent 7b1f4ae49a
commit f9e2907a97
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eventstore/badger/query.go
+1 -2
View File
@@ -32,7 +32,6 @@ func (b *BadgerBackend) QueryEvents(filter nostr.Filter, maxLimit int) iter.Seq[
maxLimit = filter.Limit maxLimit = filter.Limit
} }
// fmt.Println("limit", limit)
b.View(func(txn *badger.Txn) error { b.View(func(txn *badger.Txn) error {
results, err := b.query(txn, filter, maxLimit) results, err := b.query(txn, filter, maxLimit)
if err != nil { if err != nil {
@@ -161,7 +160,7 @@ func (b *BadgerBackend) query(txn *badger.Txn, filter nostr.Filter, limit int) (
} }
if err := item.Value(func(bin []byte) error { if err := item.Value(func(bin []byte) error {
// fmt.Println(" event", betterbinary.GetID(bin ), "kind", betterbinary.GetKind(bin ).Num(), "author", betterbinary.GetPubKey(bin ), "ts", betterbinary.GetCreatedAt(bin ), hex.EncodeToString(it.key), it.valIdx) // fmt.Println(" event", betterbinary.GetID(bin), "kind", betterbinary.GetKind(bin).Num(), "author", betterbinary.GetPubKey(bin), "ts", betterbinary.GetCreatedAt(bin))
// check it against pubkeys without decoding the entire thing // check it against pubkeys without decoding the entire thing
if extraFilter != nil && extraFilter.Authors != nil && if extraFilter != nil && extraFilter.Authors != nil &&
filter.go
+1 -5
View File
@@ -157,11 +157,7 @@ func (filter Filter) GetTheoreticalLimit() int {
return len(filter.IDs) return len(filter.IDs)
} }
if filter.Kinds != nil { if filter.Authors != nil && filter.Kinds != nil {
return math.MaxInt
}
if filter.Authors != nil {
allAreReplaceable := true allAreReplaceable := true
for _, kind := range filter.Kinds { for _, kind := range filter.Kinds {
if !kind.IsReplaceable() { if !kind.IsReplaceable() {
filter_test.go
+1
View File
@@ -143,6 +143,7 @@ func TestFilterClone(t *testing.T) {
func TestTheoreticalLimit(t *testing.T) { func TestTheoreticalLimit(t *testing.T) {
require.Equal(t, 6, Filter{IDs: []ID{{'a'}, {'b'}, {'c'}, {'d'}, {'e'}, {'f'}}}.GetTheoreticalLimit()) require.Equal(t, 6, Filter{IDs: []ID{{'a'}, {'b'}, {'c'}, {'d'}, {'e'}, {'f'}}}.GetTheoreticalLimit())
require.Equal(t, 9, Filter{Authors: []PubKey{{'a'}, {'b'}, {'c'}}, Kinds: []Kind{3, 0, 10002}}.GetTheoreticalLimit()) require.Equal(t, 9, Filter{Authors: []PubKey{{'a'}, {'b'}, {'c'}}, Kinds: []Kind{3, 0, 10002}}.GetTheoreticalLimit())
require.Equal(t, math.MaxInt, Filter{Authors: []PubKey{{'a'}}}.GetTheoreticalLimit())
require.Equal(t, 4, Filter{Authors: []PubKey{{'a'}, {'b'}, {'c'}, {'d'}}, Kinds: []Kind{10050}}.GetTheoreticalLimit()) require.Equal(t, 4, Filter{Authors: []PubKey{{'a'}, {'b'}, {'c'}, {'d'}}, Kinds: []Kind{10050}}.GetTheoreticalLimit())
require.Equal(t, math.MaxInt, Filter{Authors: []PubKey{{'a'}, {'b'}, {'c'}, {'d'}}}.GetTheoreticalLimit()) require.Equal(t, math.MaxInt, Filter{Authors: []PubKey{{'a'}, {'b'}, {'c'}, {'d'}}}.GetTheoreticalLimit())
require.Equal(t, math.MaxInt, Filter{Kinds: []Kind{3, 0, 10002}}.GetTheoreticalLimit()) require.Equal(t, math.MaxInt, Filter{Kinds: []Kind{3, 0, 10002}}.GetTheoreticalLimit())