Updates from code review.

Author: jameseaster

lib/verify.js

@@ -192,17 +192,6 @@ export async function verify({
   return result;
 }
 
-// removing this feature in the future, not the responsibility of vcb-verifier
-function _deprecatedExpirationCheck({result, checkExpiration, maxClockSkew}) {
-  if(!checkExpiration) {
-    return;
-  }
-  let vcs = result.presentation ?
-    result.presentation.verifiableCredential : result.credential;
-  vcs = Array.isArray(vcs) ? vcs : [vcs];
-  result.expired = vcs.some(vc => isExpired({credential: vc, maxClockSkew}));
-}
-
 export async function verifyVcb({text, barcode, req, getVerifyOptions} = {}) {
   try {
     const verifyOptions = await getVerifyOptions({barcode, text, req});
@@ -252,6 +241,17 @@ function _compareTime({t1, t2, maxClockSkew}) {
   return t1 < t2 ? -1 : 1;
 }
 
+// removing this feature in the future, not the responsibility of vcb-verifier
+function _deprecatedExpirationCheck({result, checkExpiration, maxClockSkew}) {
+  if(!checkExpiration) {
+    return;
+  }
+  let vcs = result.presentation ?
+    result.presentation.verifiableCredential : result.credential;
+  vcs = Array.isArray(vcs) ? vcs : [vcs];
+  result.expired = vcs.some(vc => isExpired({credential: vc, maxClockSkew}));
+}
+
 function _getCredentialFromExchange({exchange} = {}) {
   // assume single step
   const stepResults = exchange.variables?.results;

test/mocha/10-api.js

@@ -32,7 +32,7 @@ describe('http API', () => {
       }
       assertNoError(err);
       should.exist(result);
-      result.should.include.keys(['credential', 'verified' ]);
+      result.should.include.keys(['credential', 'verified']);
       result.verified.should.equal(true);
     });
 
@@ -55,7 +55,7 @@ describe('http API', () => {
       }
       assertNoError(err);
       should.exist(result);
-      result.should.include.keys(['credential', 'verified' ]);
+      result.should.include.keys(['credential', 'verified']);
       result.verified.should.equal(true);
     });
 
@@ -102,7 +102,7 @@ describe('http API', () => {
       }
       assertNoError(err);
       should.exist(result);
-      result.should.include.keys(['presentation', 'verified' ]);
+      result.should.include.keys(['presentation', 'verified']);
       result.verified.should.equal(true);
     });
 
@@ -129,7 +129,7 @@ describe('http API', () => {
       result.verified.should.equal(true);
     });
 
-    it('fails to verify a VCB barcode containing an enveloped VP' +
+    it('fails to verify a VCB barcode containing an enveloped VP ' +
       'with a VC with a bad signature', async () => {
       let err;
       let result;
@@ -149,7 +149,7 @@ describe('http API', () => {
       }
       assertNoError(err);
       should.exist(result);
-      result.should.include.keys(['presentation', 'verified', 'error' ]);
+      result.should.include.keys(['presentation', 'verified', 'error']);
       result.verified.should.equal(false);
       result.presentation.should.be.an('object');
       result.error.should.be.an('object');
@@ -177,7 +177,7 @@ describe('http API', () => {
       }
       assertNoError(err);
       should.exist(result);
-      result.should.include.keys(['credential', 'verified' ]);
+      result.should.include.keys(['credential', 'verified']);
       result.verified.should.equal(true);
     });
   });