From 2369030ff0d91953f7b01d24030c2934a6c37561 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 23 Jan 2024 17:18:44 -0600
Subject: [PATCH] Upgrade NLib, remove unnecessary generics

---
 src/deps.ts                  | 5 +++--
 src/storages/memorelay.ts    | 2 +-
 src/storages/optimizer.ts    | 2 +-
 src/storages/pool-store.ts   | 2 +-
 src/storages/search-store.ts | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/deps.ts b/src/deps.ts
index 6827815..d85577f 100644
--- a/src/deps.ts
+++ b/src/deps.ts
@@ -83,16 +83,17 @@ export { EventEmitter } from 'npm:tseep@^1.1.3';
 export { default as stringifyStable } from 'npm:fast-stable-stringify@^1.0.0';
 // @deno-types="npm:@types/debug@^4.1.12"
 export { default as Debug } from 'npm:debug@^4.3.4';
-export { NSet } from 'https://gitlab.com/soapbox-pub/nset/-/raw/b3c5601612f9bd277626198c5534e0796e003884/mod.ts';
 export {
   LNURL,
   type LNURLDetails,
   type MapCache,
+  NCache,
   NIP05,
   type NostrEvent,
   type NostrFilter,
+  NSet,
   type NStore,
   type NStoreOpts,
-} from 'https://gitlab.com/soapbox-pub/nlib/-/raw/057ecc6e2ce813db6e2279288fbfd08c5b53cc0c/mod.ts';
+} from 'https://gitlab.com/soapbox-pub/nlib/-/raw/554ec56cd92ff0a65e8b74765da3b854f50e4a2a/mod.ts';
 
 export type * as TypeFest from 'npm:type-fest@^4.3.0';
diff --git a/src/storages/memorelay.ts b/src/storages/memorelay.ts
index 2d67173..daaa41d 100644
--- a/src/storages/memorelay.ts
+++ b/src/storages/memorelay.ts
@@ -38,7 +38,7 @@ class Memorelay implements NStore {
     if (!filters.length) return Promise.resolve([]);
 
     /** Event results to return. */
-    const results = new NSet<NostrEvent>();
+    const results = new NSet();
 
     /** Number of times an event has been added to results for each filter. */
     const filterUsages: number[] = [];
diff --git a/src/storages/optimizer.ts b/src/storages/optimizer.ts
index f3ac342..10d509a 100644
--- a/src/storages/optimizer.ts
+++ b/src/storages/optimizer.ts
@@ -40,7 +40,7 @@ class Optimizer implements NStore {
     if (!filters.length) return Promise.resolve([]);
 
     const { limit = Infinity } = opts;
-    const results = new NSet<DittoEvent>();
+    const results = new NSet();
 
     // Filters with IDs are immutable, so we can take them straight from the cache if we have them.
     for (let i = 0; i < filters.length; i++) {
diff --git a/src/storages/pool-store.ts b/src/storages/pool-store.ts
index 8beadac..0781035 100644
--- a/src/storages/pool-store.ts
+++ b/src/storages/pool-store.ts
@@ -53,7 +53,7 @@ class PoolStore implements NStore {
     if (!filters.length) return Promise.resolve([]);
 
     return new Promise((resolve, reject) => {
-      const results = new NSet<NostrEvent>();
+      const results = new NSet();
 
       const unsub = this.#pool.subscribe(
         filters,
diff --git a/src/storages/search-store.ts b/src/storages/search-store.ts
index b8109f5..639b8f0 100644
--- a/src/storages/search-store.ts
+++ b/src/storages/search-store.ts
@@ -56,7 +56,7 @@ class SearchStore implements NStore {
       opts?.signal?.addEventListener('abort', close, { once: true });
       sub.eoseSignal.addEventListener('abort', close, { once: true });
 
-      const events = new NSet<DittoEvent>();
+      const events = new NSet();
 
       for await (const event of sub) {
         events.add(event);