From 2bcd0f7e4f84bf7573822dd93ed360bc440a3641 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Wed, 26 Apr 2023 14:40:27 +0200 Subject: [PATCH 1/2] fix: drop error boolean on server errors --- packages/interface/src/lib.ts | 1 - packages/server/src/server.js | 8 -------- 2 files changed, 9 deletions(-) diff --git a/packages/interface/src/lib.ts b/packages/interface/src/lib.ts index 817c801b..b6a3e992 100644 --- a/packages/interface/src/lib.ts +++ b/packages/interface/src/lib.ts @@ -765,7 +765,6 @@ export type ExecuteInvocation< export interface Failure extends Error {} export interface HandlerNotFound extends RangeError { - error: true capability: Capability name: 'HandlerNotFound' } diff --git a/packages/server/src/server.js b/packages/server/src/server.js index 1c8f4ce6..002eea5e 100644 --- a/packages/server/src/server.js +++ b/packages/server/src/server.js @@ -169,8 +169,6 @@ export class HandlerNotFound extends RangeError { */ constructor(capability) { super() - /** @type {true} */ - this.error = true this.capability = capability } /** @type {'HandlerNotFound'} */ @@ -183,7 +181,6 @@ export class HandlerNotFound extends RangeError { toJSON() { return { name: this.name, - error: this.error, capability: { can: this.capability.can, with: this.capability.with, @@ -203,8 +200,6 @@ class HandlerExecutionError extends Failure { super() this.capability = capability this.cause = cause - /** @type { true } */ - this.error = true } /** @type {'HandlerExecutionError'} */ @@ -217,7 +212,6 @@ class HandlerExecutionError extends Failure { toJSON() { return { name: this.name, - error: this.error, capability: { can: this.capability.can, with: this.capability.with, @@ -241,7 +235,6 @@ class InvocationCapabilityError extends Error { constructor(caps) { super() /** @type {true} */ - this.error = true this.caps = caps } get name() { @@ -253,7 +246,6 @@ class InvocationCapabilityError extends Error { toJSON() { return { name: this.name, - error: this.error, message: this.message, capabilities: this.caps, } From c3f797c1d72cbd9b0bb7be34c6ee28aa52a56b77 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Wed, 26 Apr 2023 14:52:54 +0200 Subject: [PATCH 2/2] fix: tests --- packages/server/test/server.spec.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/server/test/server.spec.js b/packages/server/test/server.spec.js index 8451d356..3c1b5f05 100644 --- a/packages/server/test/server.spec.js +++ b/packages/server/test/server.spec.js @@ -205,7 +205,6 @@ test('unknown handler', async () => { assert.containSubset(error, { out: { error: { - error: true, name: 'HandlerNotFound', message: `service does not implement {can: "access/register"} handler`, capability: { @@ -230,7 +229,6 @@ test('unknown handler', async () => { assert.containSubset(error2, { out: { error: { - error: true, name: 'HandlerNotFound', message: `service does not implement {can: "test/boom"} handler`, capability: { @@ -279,7 +277,6 @@ test('execution error', async () => { issuer: w3.verifier, out: { error: { - error: true, name: 'HandlerExecutionError', message: `service handler {can: "test/boom"} error: Boom`, capability: {