fix: integrate new error handling in hdnode

vechain · Oct 27, 2023 · 4c238d2 · 4c238d2
1 parent f40033f
commit 4c238d2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/packages/core/src/hdnode/hdnode.ts b/packages/core/src/hdnode/hdnode.ts
@@ -1,6 +1,5 @@
 import { ethers } from 'ethers';
 import {
-    ERRORS,
     MNEMONIC_WORDLIST_ALLOWED_SIZES,
     VET_DERIVATION_PATH,
     X_PRIV_PREFIX,
@@ -11,6 +10,7 @@ import { address } from '../address';
 import { sha256 } from '../hash';
 import { secp256k1 } from '../secp256k1';
 import { type WordlistSizeType } from '../mnemonic';
+import { buildError, HDNODE } from '@vechain-sdk/errors';
 
 /**
  * Generates an HDNode instance using mnemonic words.
@@ -26,7 +26,10 @@ function fromMnemonic(words: string[], path = VET_DERIVATION_PATH): IHDNode {
             words.length as WordlistSizeType
         )
     ) {
-        throw new Error(ERRORS.HDNODE.INVALID_MNEMONICS);
+        throw buildError(
+            HDNODE.INVALID_HDNODE_MNEMONICS,
+            'Invalid mnemonic size. It must be 12, 15, 18, 21, or 24.'
+        );
     }
     // normalize words to lowercase
     const joinedWords = words.join(' ').toLowerCase();
@@ -48,11 +51,17 @@ function fromMnemonic(words: string[], path = VET_DERIVATION_PATH): IHDNode {
 function fromPublicKey(publicKey: Buffer, chainCode: Buffer): IHDNode {
     // Invalid public key
     if (publicKey.length !== 65)
-        throw new Error(ERRORS.HDNODE.INVALID_PUBLICKEY);
+        throw buildError(
+            HDNODE.INVALID_HDNODE_PUBLIC_KEY,
+            'Invalid public key. Length must be 65 bytes.'
+        );
 
     // Invalid chain code
     if (chainCode.length !== 32)
-        throw new Error(ERRORS.HDNODE.INVALID_CHAINCODE);
+        throw buildError(
+            HDNODE.INVALID_HDNODE_CHAIN_CODE,
+            'Invalid chain code. Length must be 32 bytes.'
+        );
 
     const compressed = secp256k1.extendedPublicKeyToArray(publicKey, true);
     const key = Buffer.concat([
@@ -80,11 +89,17 @@ function fromPublicKey(publicKey: Buffer, chainCode: Buffer): IHDNode {
 function fromPrivateKey(privateKey: Buffer, chainCode: Buffer): IHDNode {
     // Invalid private key
     if (privateKey.length !== 32)
-        throw new Error(ERRORS.HDNODE.INVALID_PRIVATEKEY);
+        throw buildError(
+            HDNODE.INVALID_HDNODE_PRIVATE_KEY,
+            'Invalid private key. Length must be 32 bytes.'
+        );
 
     // Invalid chain code
     if (chainCode.length !== 32)
-        throw new Error(ERRORS.HDNODE.INVALID_CHAINCODE);
+        throw buildError(
+            HDNODE.INVALID_HDNODE_CHAIN_CODE,
+            'Invalid chain code. Length must be 32 bytes.'
+        );
 
     const key = Buffer.concat([
         X_PRIV_PREFIX,

diff --git a/packages/core/tests/hdnode/hdnode.test.ts b/packages/core/tests/hdnode/hdnode.test.ts
@@ -1,6 +1,5 @@
 import { describe, expect, test } from '@jest/globals';
 import {
-    ERRORS,
     HDNode,
     type WordlistSizeType,
     ZERO_BUFFER,
@@ -9,6 +8,12 @@ import {
     secp256k1
 } from '../../src';
 import { addresses, words, wrongWords } from './fixture';
+import {
+    InvalidHDNodeChaincodeError,
+    InvalidHDNodeMnemonicsError,
+    InvalidHDNodePrivateKeyError,
+    InvalidHDNodePublicKeyError
+} from '@vechain-sdk/errors';
 
 /**
  * Mnemonic tests
@@ -116,8 +121,8 @@ describe('Hdnode', () => {
      * Test invalid mnemonic
      */
     test('Invalid mnemonic', () => {
-        expect(() => HDNode.fromMnemonic(wrongWords)).toThrow(
-            ERRORS.HDNODE.INVALID_MNEMONICS
+        expect(() => HDNode.fromMnemonic(wrongWords)).toThrowError(
+            InvalidHDNodeMnemonicsError
         );
     });
 
@@ -127,7 +132,7 @@ describe('Hdnode', () => {
     test('Invalid private key', () => {
         expect(() =>
             HDNode.fromPrivateKey(ZERO_BUFFER(31), ZERO_BUFFER(32))
-        ).toThrow(ERRORS.HDNODE.INVALID_PRIVATEKEY);
+        ).toThrowError(InvalidHDNodePrivateKeyError);
     });
 
     /**
@@ -136,7 +141,7 @@ describe('Hdnode', () => {
     test('Invalid public key', () => {
         expect(() =>
             HDNode.fromPublicKey(ZERO_BUFFER(31), ZERO_BUFFER(32))
-        ).toThrow(ERRORS.HDNODE.INVALID_PUBLICKEY);
+        ).toThrowError(InvalidHDNodePublicKeyError);
     });
 
     /**
@@ -145,7 +150,7 @@ describe('Hdnode', () => {
     test('Invalid chain code private key', () => {
         expect(() =>
             HDNode.fromPrivateKey(ZERO_BUFFER(32), ZERO_BUFFER(31))
-        ).toThrow(ERRORS.HDNODE.INVALID_CHAINCODE);
+        ).toThrowError(InvalidHDNodeChaincodeError);
     });
 
     /**
@@ -154,6 +159,6 @@ describe('Hdnode', () => {
     test('Invalid chain code public key', () => {
         expect(() =>
             HDNode.fromPublicKey(ZERO_BUFFER(65), ZERO_BUFFER(31))
-        ).toThrow(ERRORS.HDNODE.INVALID_CHAINCODE);
+        ).toThrowError(InvalidHDNodeChaincodeError);
     });
 });