From 8ac278edd4e101925b67f65a72abafdb70aedf4f Mon Sep 17 00:00:00 2001 From: Neal Date: Mon, 1 Apr 2024 15:51:45 -0500 Subject: [PATCH 1/5] updates --- packages/credentials/tests/verifiable-credential.spec.ts | 6 +++++- web5-spec | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/credentials/tests/verifiable-credential.spec.ts b/packages/credentials/tests/verifiable-credential.spec.ts index 356b33546..930290446 100644 --- a/packages/credentials/tests/verifiable-credential.spec.ts +++ b/packages/credentials/tests/verifiable-credential.spec.ts @@ -600,7 +600,7 @@ describe('Verifiable Credential Tests', async() => { const vectors = CredentialsVerifyTestVector.vectors; for (const vector of vectors) { - const { input, errors } = vector; + const { input, errors, errorMessage } = vector; if (errors) { let errorOccurred = false; @@ -609,6 +609,10 @@ describe('Verifiable Credential Tests', async() => { } catch (e: any) { errorOccurred = true; expect(e.message).to.not.be.null; + + if(errorMessage) { + expect(e.message).to.equal(errorMessage['web5-js']) + } } if (!errorOccurred) { throw new Error('Verification should have failed but didn\'t.'); diff --git a/web5-spec b/web5-spec index 1f0c51f52..8d6bd666e 160000 --- a/web5-spec +++ b/web5-spec @@ -1 +1 @@ -Subproject commit 1f0c51f52e27bde2947aadadd5d6e10238c8698e +Subproject commit 8d6bd666e19d56eef4c17b1c8c4bf206052cf6fb From a23b1a68f303a6f6f0d027b3d8330b728aaa75b2 Mon Sep 17 00:00:00 2001 From: Neal Date: Mon, 1 Apr 2024 15:59:31 -0500 Subject: [PATCH 2/5] fix lint --- packages/credentials/tests/verifiable-credential.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/credentials/tests/verifiable-credential.spec.ts b/packages/credentials/tests/verifiable-credential.spec.ts index 930290446..6fd35f0a0 100644 --- a/packages/credentials/tests/verifiable-credential.spec.ts +++ b/packages/credentials/tests/verifiable-credential.spec.ts @@ -611,7 +611,7 @@ describe('Verifiable Credential Tests', async() => { expect(e.message).to.not.be.null; if(errorMessage) { - expect(e.message).to.equal(errorMessage['web5-js']) + expect(e.message).to.equal(errorMessage['web5-js']); } } if (!errorOccurred) { From 5a50cde42a5107d9bb1547d51eff52d02a33ee29 Mon Sep 17 00:00:00 2001 From: Neal Date: Mon, 1 Apr 2024 17:03:44 -0500 Subject: [PATCH 3/5] updates --- packages/credentials/tests/verifiable-credential.spec.ts | 6 +----- web5-spec | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/credentials/tests/verifiable-credential.spec.ts b/packages/credentials/tests/verifiable-credential.spec.ts index 6fd35f0a0..356b33546 100644 --- a/packages/credentials/tests/verifiable-credential.spec.ts +++ b/packages/credentials/tests/verifiable-credential.spec.ts @@ -600,7 +600,7 @@ describe('Verifiable Credential Tests', async() => { const vectors = CredentialsVerifyTestVector.vectors; for (const vector of vectors) { - const { input, errors, errorMessage } = vector; + const { input, errors } = vector; if (errors) { let errorOccurred = false; @@ -609,10 +609,6 @@ describe('Verifiable Credential Tests', async() => { } catch (e: any) { errorOccurred = true; expect(e.message).to.not.be.null; - - if(errorMessage) { - expect(e.message).to.equal(errorMessage['web5-js']); - } } if (!errorOccurred) { throw new Error('Verification should have failed but didn\'t.'); diff --git a/web5-spec b/web5-spec index 8d6bd666e..671fc2907 160000 --- a/web5-spec +++ b/web5-spec @@ -1 +1 @@ -Subproject commit 8d6bd666e19d56eef4c17b1c8c4bf206052cf6fb +Subproject commit 671fc29071dc68a8584b06c8edd9d10cb68aa4cd From d4b70bf16ae6c9af70fb935f2bd6aadfa06e1bda Mon Sep 17 00:00:00 2001 From: Neal Date: Mon, 1 Apr 2024 18:24:32 -0500 Subject: [PATCH 4/5] update --- packages/credentials/tests/jwt.spec.ts | 6 +----- web5-spec | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/credentials/tests/jwt.spec.ts b/packages/credentials/tests/jwt.spec.ts index 23320aa3e..34074393d 100644 --- a/packages/credentials/tests/jwt.spec.ts +++ b/packages/credentials/tests/jwt.spec.ts @@ -208,7 +208,7 @@ describe('Jwt', () => { const vectors = JwtVerifyTestVector.vectors; for (const vector of vectors) { - const { input, errors, errorMessage } = vector; + const { input, errors } = vector; if (errors) { let errorOccurred = false; @@ -216,10 +216,6 @@ describe('Jwt', () => { await VerifiableCredential.verify({ vcJwt: input }); } catch (e: any) { errorOccurred = true; - expect(e.message).to.not.be.null; - if(errorMessage && errorMessage['web5-js']) { - expect(e.message).to.include(errorMessage['web5-js']); - } } if (!errorOccurred) { throw new Error('Verification should have failed but didn\'t.'); diff --git a/web5-spec b/web5-spec index 671fc2907..a5360ac49 160000 --- a/web5-spec +++ b/web5-spec @@ -1 +1 @@ -Subproject commit 671fc29071dc68a8584b06c8edd9d10cb68aa4cd +Subproject commit a5360ac499b1b84413b40e26d0d6fe9e58cb62f2 From 0a4e64de9329c7d39b92c97304e44898a9d520a2 Mon Sep 17 00:00:00 2001 From: Neal Date: Mon, 1 Apr 2024 18:59:40 -0500 Subject: [PATCH 5/5] update hash --- web5-spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web5-spec b/web5-spec index a5360ac49..270966f0f 160000 --- a/web5-spec +++ b/web5-spec @@ -1 +1 @@ -Subproject commit a5360ac499b1b84413b40e26d0d6fe9e58cb62f2 +Subproject commit 270966f0ffab6c8834ab83aeb61855d212b12723