Imported error classes from sdk

license-header.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2023, Built on KILT.
+ * Copyright (c) 2018-2024, Built on KILT.
  *
  * This source code is licensed under the BSD 4-Clause "Original" license
  * found in the LICENSE file in the root directory of this source tree.

src/messaging/CredentialApiMessageType.ts

@@ -21,6 +21,7 @@ import {
   isIConfirmPayment,
 } from '../utils/index.js'
 import * as MessageError from './Error.js'
+import { SDKErrors as SDKErrorMessage } from '@kiltprotocol/sdk-js'
 import type { IMessage, CredentialApiMessageBody } from '../types/index.js'
 import { verifyMessageEnvelope } from './MessageEnvelope.js'
 
@@ -52,7 +53,7 @@ export function assertKnownMessageBody(message: IMessage): void {
     Attestation.verifyDataStructure(message.body.content.attestation)
   } else if (isRejectAttestation(message)) {
     if (!isHex(message.body.content)) {
-      throw new MessageError.HashMalformedError()
+      throw new SDKErrorMessage.HashMalformedError()
     }
   } else if (isIRequestCredential(message)) {
     message.body.content.cTypes.forEach(({ cTypeHash, trustedAttesters, requiredProperties }) => {
@@ -66,7 +67,7 @@ export function assertKnownMessageBody(message: IMessage): void {
     message.body.content.forEach((presentation) => {
       Credential.verifyDataStructure(presentation)
       if (!Did.isDidSignature(presentation.claimerSignature)) {
-        throw new MessageError.SignatureMalformedError()
+        throw new SDKErrorMessage.SignatureMalformedError()
       }
     })
   } else if (isIRequestPayment(message) || isIConfirmPayment(message)) {

src/messaging/Error.ts

@@ -5,20 +5,15 @@
  * found in the LICENSE file in the root directory of this source tree.
  */
 
-export declare class MessageError extends Error {}
-export declare class HashMalformedError extends MessageError {
-  constructor(hash?: string, type?: string)
-}
+import { SDKErrors } from '@kiltprotocol/sdk-js'
 
-export declare class SignatureMalformedError extends MessageError {}
-export declare class UnknownMessageBodyTypeError extends MessageError {}
-export declare class DecodingMessageError extends MessageError {}
-export declare class CTypeUnknownPropertiesError extends MessageError {}
-export declare class InvalidDidFormatError extends MessageError {}
-export declare class KeyError extends MessageError {}
-export declare class DidError extends MessageError {
-  constructor(context?: string, type?: string)
-}
-export declare class IdentityMismatchError extends MessageError {
-  constructor(context?: string, type?: string)
+export class UnknownMessageBodyTypeError extends SDKErrors.SDKError {}
+export class DecodingMessageError extends SDKErrors.SDKError {}
+export class CTypeUnknownPropertiesError extends SDKErrors.SDKError {}
+export class KeyError extends SDKErrors.SDKError {}
+export class IdentityMismatchError extends SDKErrors.SDKError {
+  constructor(context?: string, type?: string) {
+    super(`Identity mismatch${context ? ` in context: ${context}` : ''}${type ? ` of type ${type}` : ''}`)
+    this.name = 'IdentityMismatchError'
+  }
 }

src/messaging/Message.test.ts

@@ -7,17 +7,10 @@
 
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 
-/**
- * Copyright (c) 2018-2024, BOTLabs GmbH.
- *
- * This source code is licensed under the BSD 4-Clause "Original" license
- * found in the LICENSE file in the root directory of this source tree.
- */
-
 import { u8aToHex } from '@polkadot/util'
 import { Attestation, CType, Claim, Credential, Quote } from '@kiltprotocol/core'
 import * as Did from '@kiltprotocol/did'
-import { init } from '@kiltprotocol/sdk-js'
+import { init, SDKErrors as SDKErrorMessage } from '@kiltprotocol/sdk-js'
 import * as MessageError from './Error'
 import { Crypto } from '@kiltprotocol/utils'
 import type {
@@ -714,7 +707,7 @@ describe('Error checking / Verification', () => {
   it('message envelope verifier should throw errors on faulty envelopes', () => {
     // @ts-ignore
     messageSubmitTerms.sender = 'this is not a sender did'
-    expect(() => verifyMessageEnvelope(messageSubmitTerms)).toThrowError(MessageError.InvalidDidFormatError)
+    expect(() => verifyMessageEnvelope(messageSubmitTerms)).toThrowError(SDKErrorMessage.InvalidDidFormatError)
     // @ts-ignore
     messageRequestAttestationForClaim.messageId = 12
     expect(() => verifyMessageEnvelope(messageRequestAttestationForClaim)).toThrowError(TypeError)
@@ -730,7 +723,7 @@ describe('Error checking / Verification', () => {
   })
   it('message body verifier should throw errors on faulty bodies', () => {
     submitTermsBody.content.delegationId = 'this is not a delegation id'
-    expect(() => assertKnownMessageBody(messageSubmitTerms)).toThrowError(MessageError.HashMalformedError)
+    expect(() => assertKnownMessageBody(messageSubmitTerms)).toThrowError(SDKErrorMessage.HashMalformedError)
 
     submitCredentialBody.content[0].claimerSignature = {
       signature: 'this is not the claimers signature',

src/messaging/MessageEnvelope.ts

@@ -8,6 +8,7 @@
 import { DecryptCallback, DidResolveKey, DidResourceUri, EncryptCallback } from '@kiltprotocol/types'
 import * as Did from '@kiltprotocol/did'
 import * as MessageError from './Error.js'
+import { SDKErrors as SDKErrorMessage } from '@kiltprotocol/sdk-js'
 import { hexToU8a, stringToU8a, u8aToHex, u8aToString } from '@polkadot/util'
 
 import type { IEncryptedMessage, IEncryptedMessageContents, IMessage } from '../types/index.js'
@@ -59,7 +60,7 @@ export async function decrypt(
 
   const { fragment } = Did.parse(receiverKeyUri)
   if (!fragment) {
-    throw new MessageError.DidError(`No fragment for the receiver key ID "${receiverKeyUri}"`)
+    throw new SDKErrorMessage.DidError(`No fragment for the receiver key ID "${receiverKeyUri}"`)
   }
 
   let data: Uint8Array

yarn.lock

@@ -4673,4 +4673,4 @@ zip-stream@^4.1.0:
   dependencies:
     archiver-utils "^3.0.4"
     compress-commons "^4.1.2"
-    readable-stream "^3.6.0"
+    readable-stream "^3.6.0"