From d88761907a5bc82bea4d381b6b63d8ab3fba8e3d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 2 Sep 2023 18:08:09 -0500 Subject: [PATCH] verifySignature: set verifiedSymbol to false on failure, DRY return values --- event.test.ts | 7 ++++--- event.ts | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/event.test.ts b/event.test.ts index ca19e8c..8e937e0 100644 --- a/event.test.ts +++ b/event.test.ts @@ -7,6 +7,7 @@ import { verifySignature, getSignature, Kind, + verifiedSymbol, } from './event.ts' import { getPublicKey } from './keys.ts' @@ -236,7 +237,7 @@ describe('Event', () => { it('should return false for an invalid event signature', () => { const privateKey = 'd217c1ff2f8a65c3e3a1740db3b9f58b8c848bb45e26d00ed4714e4a0f4ceecf' - const event = finishEvent( + const { [verifiedSymbol]: _, ...event } = finishEvent( { kind: Kind.Text, tags: [], @@ -260,7 +261,7 @@ describe('Event', () => { const privateKey2 = '5b4a34f4e4b23c63ad55a35e3f84a3b53d96dbf266edf521a8358f71d19cbf67' const publicKey2 = getPublicKey(privateKey2) - const event = finishEvent( + const { [verifiedSymbol]: _, ...event } = finishEvent( { kind: Kind.Text, tags: [], @@ -282,7 +283,7 @@ describe('Event', () => { it('should return false for an invalid event id', () => { const privateKey = 'd217c1ff2f8a65c3e3a1740db3b9f58b8c848bb45e26d00ed4714e4a0f4ceecf' - const event = finishEvent( + const { [verifiedSymbol]: _, ...event } = finishEvent( { kind: 1, tags: [], diff --git a/event.ts b/event.ts index 3fe6c62..6ddaf11 100644 --- a/event.ts +++ b/event.ts @@ -119,14 +119,13 @@ export function verifySignature(event: Event): event is Ver const hash = getEventHash(event) if (hash !== event.id) { - return false + return (event[verifiedSymbol] = false) } try { - event[verifiedSymbol] = schnorr.verify(event.sig, hash, event.pubkey) - return event[verifiedSymbol] + return (event[verifiedSymbol] = schnorr.verify(event.sig, hash, event.pubkey)) } catch (err) { - return false + return (event[verifiedSymbol] = false) } }