From a8f2eb666b6f5cdd87583010de8a8568c0a7ef24 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Thu, 7 Sep 2023 19:29:33 -0400 Subject: [PATCH] refactor: move away from the tuple pattern --- src/err.ts | 2 -- src/portal.ts | 9 +++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/err.ts b/src/err.ts index 4f2d79e..c62766e 100644 --- a/src/err.ts +++ b/src/err.ts @@ -15,5 +15,3 @@ function addContextToErr(err: any, context: string): string { } export { addContextToErr }; - -export const NO_PORTALS_ERROR = [null, "no active portals"] as ErrTuple; diff --git a/src/portal.ts b/src/portal.ts index 3d3956c..8e1dcbf 100644 --- a/src/portal.ts +++ b/src/portal.ts @@ -1,10 +1,9 @@ -import { ErrTuple, KeyPair, Portal } from "#types.js"; +import { KeyPair, Portal } from "#types.js"; import { Client } from "@lumeweb/libportal"; import { deriveChildKey } from "#keys.js"; import { ed25519 } from "@noble/curves/ed25519"; import { bytesToHex } from "@noble/hashes/utils"; import COMMUNITY_PORTAL_LIST from "@lumeweb/community-portals"; -import { NO_PORTALS_ERROR } from "#err.js"; let activePortalMasterKey; @@ -17,9 +16,9 @@ type PortalSessionsStore = { [id: string]: string }; const PORTAL_ID = Symbol.for("PORTAL_ID"); const PORTAL_NAME = Symbol.for("PORTAL_NAME"); -export function maybeInitDefaultPortals(): ErrTuple { +export function maybeInitDefaultPortals() { if (!activePortalMasterKey) { - return [null, "activePortalMasterKey not set"]; + throw new Error("activePortalMasterKey not set"); } let portalsToLoad = DEFAULT_PORTAL_LIST; @@ -33,8 +32,6 @@ export function maybeInitDefaultPortals(): ErrTuple { for (const portal of portalsToLoad) { addActivePortal(initPortal(portal)); } - - return [null, null]; } export function setActivePortalMasterKey(key: Uint8Array) {