From 6daa75b21cac5a5ad0b9281fbd892f0369dc436f Mon Sep 17 00:00:00 2001 From: ennmichael Date: Thu, 2 Mar 2023 21:13:57 +0100 Subject: [PATCH] fix the test --- packages/nostr/src/client/emitter.ts | 9 +-------- packages/nostr/src/client/index.ts | 7 +++++++ packages/nostr/test/simple-communication.ts | 10 ++++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/nostr/src/client/emitter.ts b/packages/nostr/src/client/emitter.ts index e0cc67d..3c98021 100644 --- a/packages/nostr/src/client/emitter.ts +++ b/packages/nostr/src/client/emitter.ts @@ -1,6 +1,5 @@ import Base from "events" -import { Nostr, SubscriptionId } from "." -import { RawEvent, SignedEvent } from "../event" +import { EventParams, Nostr } from "." /** * Overrides providing better types for EventEmitter methods. @@ -144,9 +143,3 @@ type Listener = | EventListener | NoticeListener | ErrorListener - -interface EventParams { - signed: SignedEvent - subscriptionId: SubscriptionId - raw: RawEvent -} diff --git a/packages/nostr/src/client/index.ts b/packages/nostr/src/client/index.ts index ae712ab..49a7957 100644 --- a/packages/nostr/src/client/index.ts +++ b/packages/nostr/src/client/index.ts @@ -295,3 +295,10 @@ export interface Filters { until?: Date limit?: number } + +// TODO Document this +export interface EventParams { + signed: SignedEvent + subscriptionId: SubscriptionId + raw: RawEvent +} diff --git a/packages/nostr/test/simple-communication.ts b/packages/nostr/test/simple-communication.ts index af4041c..86c6618 100644 --- a/packages/nostr/test/simple-communication.ts +++ b/packages/nostr/test/simple-communication.ts @@ -1,4 +1,4 @@ -import { Nostr } from "../src/client" +import { EventParams, Nostr } from "../src/client" import { EventKind } from "../src/event" import { PrivateKey } from "../src/keypair" import assert from "assert" @@ -20,7 +20,7 @@ describe("single event communication", function () { const subscriber = new Nostr() subscriber.open("ws://localhost:12648") - subscriber.on("event", ({ signed: { event } }) => { + function listener({ signed: { event } }: EventParams) { assert.equal(event.kind, EventKind.TextNote) assert.equal(event.pubkey.toString(), pubkey.toString()) assert.equal(event.createdAt.toString(), timestamp.toString()) @@ -32,13 +32,15 @@ describe("single event communication", function () { // subscribe happen at the same time, the same event might end up being broadcast twice. // To prevent reacting to the same event and calling done() twice, remove the callback // for future events. - subscriber.on("event", null) + subscriber.off("event", listener) publisher.close() subscriber.close() done() - }) + } + + subscriber.on("event", listener) subscriber.subscribe([])