Merge pull request #979 from input-output-hk/test/lw-9018-fix-unit-tests

LW-9018 fix unit tests

Author: mirceahasegan

packages/util/src/errors.ts

@@ -1,12 +1,10 @@
 import { CustomError } from 'ts-custom-error';
-import { toSerializableObject } from './serializableObject';
 
 export const formatErrorMessage = (reason: string, detail?: string) => reason + (detail ? ` (${detail})` : '');
 
 interface ErrorLike {
   message: string;
   stack: string;
-  data?: unknown;
 }
 
 interface WithInnerError {
@@ -66,10 +64,6 @@ export class ComposableError<InnerError = unknown> extends CustomError {
       [firstLineOfInnerErrorStack, ...innerErrorStack] = innerError.stack.split(ComposableError.stackDelimiter);
 
       message = `${message} due to\n ${firstLineOfInnerErrorStack}`;
-
-      if (innerError.data) {
-        innerError.data = toSerializableObject(innerError.data);
-      }
     }
 
     if (typeof innerError === 'string') message = `${message} due to\n ${innerError}`;

packages/util/src/serializableObject.ts

@@ -23,6 +23,12 @@ const defaultGetErrorPrototype: GetErrorPrototype = () => Error.prototype;
 const defaultTransformKey: TransformKey = (key) => key;
 const defaultTransformationTypeKey = '__type';
 
+const hasInnerError = (error: unknown): error is { innerError: unknown } =>
+  error !== null && typeof error === 'object' && 'innerError' in (error as never);
+
+const innerErrorHasData = (innerError: unknown): innerError is { data: unknown } =>
+  typeof innerError === 'object' && innerError !== null && 'data' in innerError;
+
 export const toSerializableObject = (obj: unknown, options: ToSerializableObjectOptions = {}): unknown => {
   if (PLAIN_TYPES.has(typeof obj)) return obj;
   const { transformationTypeKey = defaultTransformationTypeKey, serializeKey = defaultTransformKey } = options;
@@ -41,7 +47,11 @@ export const toSerializableObject = (obj: unknown, options: ToSerializableObject
       const value = Buffer.from(arr).toString('hex');
       return { [transformationTypeKey]: 'Buffer', value };
     }
+
     if (obj instanceof Error) {
+      if (hasInnerError(obj) && innerErrorHasData(obj.innerError)) {
+        obj.innerError.data = toSerializableObject(obj.innerError.data);
+      }
       return {
         [transformationTypeKey]: 'Error',
         value: serializeError(obj)

packages/util/test/serializableObject.test.ts

@@ -1,6 +1,15 @@
 import { CustomError } from 'ts-custom-error';
 import { FromSerializableObjectOptions, fromSerializableObject, toSerializableObject } from '../src';
 
+export class ErrorWithData extends CustomError {
+  innerError: { data: unknown };
+
+  constructor(data: unknown, message: string) {
+    super(message);
+    this.innerError = { data };
+  }
+}
+
 const serializeAndDeserialize = (obj: unknown, deserializeOptions?: FromSerializableObjectOptions) =>
   fromSerializableObject(JSON.parse(JSON.stringify(toSerializableObject(obj))), deserializeOptions);
 
@@ -49,6 +58,20 @@ describe('serializableObject', () => {
     expect(deserialized).toBeInstanceOf(CustomError);
   });
 
+  it('supports error types with string data', () => {
+    const err = new ErrorWithData('some-data', 'msg');
+    const deserialized = serializeAndDeserialize(err, { getErrorPrototype: () => CustomError.prototype });
+    expect(deserialized).toEqual(err);
+    expect(deserialized).toBeInstanceOf(CustomError);
+  });
+
+  it('supports error types with object data', () => {
+    const err = new ErrorWithData({ bigIntProp: 15n }, 'msg');
+    const deserialized = serializeAndDeserialize(err, { getErrorPrototype: () => CustomError.prototype });
+    expect(deserialized).toEqual(err);
+    expect(deserialized).toBeInstanceOf(CustomError);
+  });
+
   it('supports custom transformation discriminator key', () => {
     const customKeyOption = { transformationTypeKey: 'discriminator' };
     const obj = { bigint: 1n };

packages/wallet/test/services/WalletUtil.test.ts

@@ -263,8 +263,7 @@ describe('WalletUtil', () => {
         tx.body.certificates = [
           {
             __typename: Cardano.CertificateType.Registration,
-            // using foreign intentionally because registration is not signed so it should be accepted
-            stakeKeyHash: foreignRewardAccountHash
+            stakeKeyHash: mocks.stakeKeyHash
           } as Cardano.NewStakeAddressCertificate,
           {
             __typename: Cardano.CertificateType.Unregistration,