From cd0856876d1c24ab6c7e960c461332cbc5637481 Mon Sep 17 00:00:00 2001
From: Andrew Jones <ajones@digitalbazaar.com>
Date: Thu, 6 Jun 2024 19:44:35 +0000
Subject: [PATCH] Pass cryptosuite & key to di verify tests.

---
 tests/15-di-rdfc-verify.js    | 6 ++++++
 tests/vc-generator/helpers.js | 5 ++++-
 tests/vc-generator/index.js   | 8 ++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/15-di-rdfc-verify.js b/tests/15-di-rdfc-verify.js
index 1662069..4c678c8 100644
--- a/tests/15-di-rdfc-verify.js
+++ b/tests/15-di-rdfc-verify.js
@@ -6,7 +6,11 @@ import {
   checkDataIntegrityProofVerifyErrors
 } from 'data-integrity-test-suite-assertion';
 import {config} from './helpers.js';
+import {
+  cryptosuite as eddsaRdfc2022CryptoSuite
+} from '@digitalbazaar/eddsa-rdfc-2022-cryptosuite';
 import {endpoints} from 'vc-test-suite-implementations';
+import {getMultikey} from './vc-generator/helpers.js';
 
 // only use implementations with `eddsa-rdfc-2022` verifiers.
 const {tags} = config.suites['eddsa-rdfc-2022'];
@@ -17,6 +21,8 @@ const {match} = endpoints.filterByTag({
 // options for the DI Verifier Suite
 const testDataOptions = {
   suiteName: 'eddsa-rdfc-2022',
+  cryptosuite: eddsaRdfc2022CryptoSuite,
+  key: await getMultikey()
 };
 
 checkDataIntegrityProofVerifyErrors({
diff --git a/tests/vc-generator/helpers.js b/tests/vc-generator/helpers.js
index 0c00418..b8df840 100644
--- a/tests/vc-generator/helpers.js
+++ b/tests/vc-generator/helpers.js
@@ -6,7 +6,10 @@ import * as Ed25519Multikey from '@digitalbazaar/ed25519-multikey';
 import crypto from 'crypto';
 import {decodeSecretKeySeed} from 'bnid';
 
-export const getMultikey = async ({seedMultibase}) => {
+export const getMultikey = async ({
+  // all else fails use the test key seed
+  seedMultibase = 'z1AYMku6XEB5KV3XJbYzz9VejGJYRuqzu5wmq4JDRyUCjr8'
+} = {}) => {
   if(!seedMultibase) {
     throw new Error('seedMultibase required');
   }
diff --git a/tests/vc-generator/index.js b/tests/vc-generator/index.js
index f4c5771..92bd7cd 100644
--- a/tests/vc-generator/index.js
+++ b/tests/vc-generator/index.js
@@ -20,12 +20,8 @@ const vcCache = new Map([
  */
 export async function generateTestData() {
   const {signer, issuer} = await getMultikey({
-    seedMultibase: (
-      process.env?.KEY_SEED_DB ||
-      process.env?.CLIENT_SECRET_DB ||
-      // all else fails use the test key seed
-      'z1AYMku6XEB5KV3XJbYzz9VejGJYRuqzu5wmq4JDRyUCjr8'
-    )
+    seedMultibase: (process.env?.KEY_SEED_DB ||
+      process.env?.CLIENT_SECRET_DB)
   });
   const credential = klona(validVc);
   credential.issuer = issuer;