Port upstream tests and rebuilt NIP-09 handling #7

Merged

padreug merged 6 commits from test/port-upstream-tests into main 2026-09-13 16:56:18 +00:00

Conversation 0 Commits 6 Files changed 8 +289 -76

padreug commented 2026-09-13 16:56:06 +00:00

Owner

Copy link

Ports the test files from the upstream PRs (lnbits/nostrrelay#37, #42, #46) so the fork's suite covers the same ground, and brings the NIP-09 handling up to the rebuilt version from #42: created_at cutoff, colon-safe kind:pubkey:d parsing, only replaceable/addressable kinds, and an empty d on an addressable kind meaning "the version with no d" rather than "all of them".

Running upstream's client-flow test here turned up a fork bug: nostr_dict() returned every model field, so the size column added in b74af26 has been leaking into every EVENT sent to clients. Fixed by emitting only the seven NIP-01 fields.

28 tests pass against lnbits 1.3.1 / Python 3.10. Version 1.1.0-aio.4; tag, hash and catalog entry after merge.

Ports the test files from the upstream PRs (lnbits/nostrrelay#37, #42, #46) so the fork's suite covers the same ground, and brings the NIP-09 handling up to the rebuilt version from #42: `created_at` cutoff, colon-safe `kind:pubkey:d` parsing, only replaceable/addressable kinds, and an empty `d` on an addressable kind meaning "the version with no `d`" rather than "all of them". Running upstream's client-flow test here turned up a fork bug: `nostr_dict()` returned every model field, so the `size` column added in b74af26 has been leaking into every EVENT sent to clients. Fixed by emitting only the seven NIP-01 fields. 28 tests pass against lnbits 1.3.1 / Python 3.10. Version `1.1.0-aio.4`; tag, hash and catalog entry after merge.

padreug added 6 commits 2026-09-13 16:56:06 +00:00

fix: keep every filter of a multi-filter REQ ... 06eab1b007

_handle_request dropped the subscription's existing filters before
adding each filter of a REQ, so a REQ carrying several filters ended
up with only its last one registered. Remove the old filters once per
REQ instead, before the loop, since a REQ replaces the subscription as
a whole.

Also invert _can_add_filter so its name matches what it returns. The
old version returned "limit exceeded" and the caller tested for that,
so behaviour is unchanged; the tests pin it.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013Tbyw6FwjhEJg3gHfPHxWt
(cherry picked from commit 37331b14847cfb5d43f8e97b36a6f52d9b86abae)

test: wait for messages instead of sleeping in the client flow ... d2350f907d

test_alice_and_bob paused for fixed 0.1-0.5 s between wiring events
and asserting on the replies. On a slow runner the replies were not
there yet; on a fast one the next step ran before the previous event
was stored. Both show up as spurious failures (CI on #45, 2026-09-13).

Give the mock socket a wait_for_messages(count) helper and wait for
the expected number of messages at each step instead. Exact-count
assertions stay, so extra messages still fail.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013Tbyw6FwjhEJg3gHfPHxWt
(cherry picked from commit deb6510193b68f343c2f7845c615634beb020911)

fix(nip09): honour a tags in deletion requests ... fd19acff97

A kind-5 request could only name events by `e` tag. Worse, one that
carried `a` tags and no `e` tags built a filter with an empty id list,
which matched every event by that author and marked them all deleted.

Handle `a` tags per NIP-09: parse `kind:pubkey:d` (the `d` value may
contain ':'), require the pubkey to be the request author and the kind
to be replaceable or addressable, and remove only versions up to the
request's `created_at` so a later re-publication survives. An empty
`d` addresses a replaceable kind.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013Tbyw6FwjhEJg3gHfPHxWt
(cherry picked from commit e695f9c66881d3d520d40f0cd3e9c95d9435938c)

fix: send only NIP-01 fields in EVENT responses ... 2f965e0023

nostr_dict() returned every model field except relay_id and publisher,
so the size column added for storage accounting leaked into every
EVENT sent to clients. Emit the seven NIP-01 fields explicitly instead.
Caught by the client-flow test ported from upstream.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013Tbyw6FwjhEJg3gHfPHxWt

chore: wrap an over-long log line ... 42d3c76e1c

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013Tbyw6FwjhEJg3gHfPHxWt

chore: bump version to 1.1.0-aio.4 ... cbcdce8c41

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013Tbyw6FwjhEJg3gHfPHxWt

padreug merged commit a82b127153 into main 2026-09-13 16:56:18 +00:00

padreug deleted branch test/port-upstream-tests 2026-09-13 16:56:18 +00:00

padreug referenced this pull request from a commit 2026-09-13 16:56:20 +00:00

Merge pull request 'Port upstream tests and rebuilt NIP-09 handling' (#7) from test/port-upstream-tests into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

aiolabs/nostrrelay!7

No description provided.