Merge pull-request #45

tkhq · Jul 25, 2024 · bd88ec0 · bd88ec0
2 parents 29f5a45 + c01a4fa
commit bd88ec0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/auth/index.html b/auth/index.html
@@ -216,7 +216,7 @@ <h2>Message log</h2>
       var uint8arrayFromHexString = function(hexString, length) {
         var hexRegex = /^[0-9A-Fa-f]+$/;
         if (!hexString || hexString.length % 2 != 0 || !hexRegex.test(hexString)) {
-          throw new Error('cannot create uint8array from invalid hex string: "' + hexString + '"');
+          throw new Error('cannot create uint8array from invalid hex string');
         }
         var buffer = new Uint8Array(hexString.match(/../g).map((h) => parseInt(h, 16)));
         if (!length) {

diff --git a/auth/index.test.js b/auth/index.test.js
@@ -165,19 +165,19 @@ describe("TKHQ", () => {
     // Error case: bad value
     expect(() => {
       TKHQ.uint8arrayFromHexString({});
-    }).toThrow('cannot create uint8array from invalid hex string: "[object Object]"');
+    }).toThrow('cannot create uint8array from invalid hex string');
     // Error case: empty string
     expect(() => {
       TKHQ.uint8arrayFromHexString("");
-    }).toThrow('cannot create uint8array from invalid hex string: ""');
+    }).toThrow('cannot create uint8array from invalid hex string');
     // Error case: odd number of characters
     expect(() => {
       TKHQ.uint8arrayFromHexString("123");
-    }).toThrow('cannot create uint8array from invalid hex string: "123"');
+    }).toThrow('cannot create uint8array from invalid hex string');
     // Error case: bad characters outside of hex range
     expect(() => {
       TKHQ.uint8arrayFromHexString("oops");
-    }).toThrow('cannot create uint8array from invalid hex string: "oops"');
+    }).toThrow('cannot create uint8array from invalid hex string');
     // Happy path: if length parameter is included, pad the resulting buffer
     expect(TKHQ.uint8arrayFromHexString("01", 2).toString()).toEqual("0,1");
     // Happy path: if length parameter is omitted, do not pad the resulting buffer

diff --git a/export/index.template.html b/export/index.template.html
@@ -235,7 +235,7 @@ <h2>Message log</h2>
        function uint8arrayFromHexString(hexString) {
         var hexRegex = /^[0-9A-Fa-f]+$/;
         if (!hexString || hexString.length % 2 != 0 || !hexRegex.test(hexString)) {
-          throw new Error('cannot create uint8array from invalid hex string: "' + hexString + '"');
+          throw new Error('cannot create uint8array from invalid hex string');
         }
         return new Uint8Array(hexString.match(/../g).map(h=>parseInt(h,16)));
       }

diff --git a/export/index.test.js b/export/index.test.js
@@ -141,19 +141,19 @@ describe("TKHQ", () => {
     // Error case: bad value
     expect(() => {
       TKHQ.uint8arrayFromHexString({});
-    }).toThrow('cannot create uint8array from invalid hex string: "[object Object]"');
+    }).toThrow('cannot create uint8array from invalid hex string');
     // Error case: empty string
     expect(() => {
       TKHQ.uint8arrayFromHexString("");
-    }).toThrow('cannot create uint8array from invalid hex string: ""');
+    }).toThrow('cannot create uint8array from invalid hex string');
     // Error case: odd number of characters
     expect(() => {
       TKHQ.uint8arrayFromHexString("123");
-    }).toThrow('cannot create uint8array from invalid hex string: "123"');
+    }).toThrow('cannot create uint8array from invalid hex string');
     // Error case: bad characters outside of hex range
     expect(() => {
       TKHQ.uint8arrayFromHexString("oops");
-    }).toThrow('cannot create uint8array from invalid hex string: "oops"');
+    }).toThrow('cannot create uint8array from invalid hex string');
   })
 
   it("logs messages and sends messages up", async () => {
@@ -227,11 +227,11 @@ describe("TKHQ", () => {
     // Invalid hex-encoding for signature
     await expect(
       TKHQ.verifyEnclaveSignature(null, "", "04d32d8e0fe5a401a717971fabfabe02ddb6bea39b72a18a415fc0273579b394650aae97f75b0462ffa8880a1899c7a930569974519685a995d2e74e372e105bf4")
-    ).rejects.toThrow('cannot create uint8array from invalid hex string: ""');
+    ).rejects.toThrow('cannot create uint8array from invalid hex string');
 
     // Invalid hex-encoding for public key
     await expect(
       TKHQ.verifyEnclaveSignature(null, "30440220773382ac39085f58a584fd5ad8c8b91b50993ad480af2c5eaefe0b09447b6dca02205201c8e20a92bce524caac08a956b0c2e7447de9c68f91ab1e09fd58988041b5", "")
-    ).rejects.toThrow('cannot create uint8array from invalid hex string: ""');
+    ).rejects.toThrow('cannot create uint8array from invalid hex string');
   })
 });
diff --git a/import/index.template.html b/import/index.template.html
@@ -114,7 +114,7 @@
       function uint8arrayFromHexString(hexString) {
         var hexRegex = /^[0-9A-Fa-f]+$/;
         if (!hexString || hexString.length % 2 != 0 || !hexRegex.test(hexString)) {
-          throw new Error('cannot create uint8array from invalid hex string: "' + hexString + '"');
+          throw new Error('cannot create uint8array from invalid hex string');
         }
         return new Uint8Array(hexString.match(/../g).map(h=>parseInt(h,16)));
       }

diff --git a/import/index.test.js b/import/index.test.js
@@ -167,12 +167,12 @@ describe("TKHQ", () => {
     // Invalid hex-encoding for signature
     await expect(
       TKHQ.verifyEnclaveSignature(null, "", "04d32d8e0fe5a401a717971fabfabe02ddb6bea39b72a18a415fc0273579b394650aae97f75b0462ffa8880a1899c7a930569974519685a995d2e74e372e105bf4")
-    ).rejects.toThrow('cannot create uint8array from invalid hex string: ""');
+    ).rejects.toThrow('cannot create uint8array from invalid hex string');
 
     // Invalid hex-encoding for public key
     await expect(
       TKHQ.verifyEnclaveSignature(null, "30440220773382ac39085f58a584fd5ad8c8b91b50993ad480af2c5eaefe0b09447b6dca02205201c8e20a92bce524caac08a956b0c2e7447de9c68f91ab1e09fd58988041b5", "")
-    ).rejects.toThrow('cannot create uint8array from invalid hex string: ""');
+    ).rejects.toThrow('cannot create uint8array from invalid hex string');
   })
 
   it("validates styles", async () => {

diff --git a/import/standalone.template.html b/import/standalone.template.html
@@ -166,7 +166,7 @@ <h2>Message log</h2>
       function uint8arrayFromHexString(hexString) {
         var hexRegex = /^[0-9A-Fa-f]+$/;
         if (!hexString || hexString.length % 2 != 0 || !hexRegex.test(hexString)) {
-          throw new Error('cannot create uint8array from invalid hex string: "' + hexString + '"');
+          throw new Error('cannot create uint8array from invalid hex string');
         }
         return new Uint8Array(hexString.match(/../g).map(h=>parseInt(h,16)));
       }