Skip to content

Commit a57915d

Browse files
committed
Move getSuites to common helpers file.
1 parent c5547c2 commit a57915d

File tree

2 files changed

+40
-32
lines changed

2 files changed

+40
-32
lines changed

tests/suites/conformance.js

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import {
77
generators,
88
issueCloned
99
} from 'data-integrity-test-suite-assertion';
10-
import {DataIntegrityProof} from '@digitalbazaar/data-integrity';
1110
import {getMultiKey} from '../vc-generator/key-gen.js';
12-
import {getSuite} from '../vc-generator/cryptosuites.js';
11+
import {getSuites} from './helpers.js';
1312

1413
export function conformanceSuite({
1514
verifiers,
@@ -95,7 +94,7 @@ async function _setup({
9594
// invalid cryptosuite name invalidCryptosuite
9695
credentials.set('invalid cryptosuite', await issueCloned(invalidCryptosuite({
9796
credential: structuredClone(_credential),
98-
..._getSuites({
97+
...getSuites({
9998
signer,
10099
suiteName,
101100
selectivePointers,
@@ -104,7 +103,7 @@ async function _setup({
104103
})));
105104
credentials.set('invalid VerificationMethod', await issueCloned(invalidVm({
106105
credential: structuredClone(_credential),
107-
..._getSuites({
106+
...getSuites({
108107
signer,
109108
suiteName,
110109
selectivePointers,
@@ -113,7 +112,7 @@ async function _setup({
113112
})));
114113
credentials.set('invalid Proof Type', await issueCloned(invalidProofType({
115114
credential: structuredClone(_credential),
116-
..._getSuites({
115+
...getSuites({
117116
signer,
118117
suiteName,
119118
selectivePointers,
@@ -122,30 +121,3 @@ async function _setup({
122121
})));
123122
return credentials;
124123
}
125-
126-
function _getSuites({
127-
signer,
128-
suiteName,
129-
mandatoryPointers,
130-
selectivePointers
131-
}) {
132-
const suites = {
133-
suite: new DataIntegrityProof({
134-
signer,
135-
cryptosuite: getSuite({
136-
suite: suiteName,
137-
mandatoryPointers
138-
})
139-
})
140-
};
141-
if(selectivePointers) {
142-
suites.selectiveSuite = new DataIntegrityProof({
143-
signer,
144-
cryptosuite: getSuite({
145-
suite: suiteName,
146-
selectivePointers
147-
})
148-
});
149-
}
150-
return suites;
151-
}

tests/suites/helpers.js

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*!
2+
* Copyright 2024 Digital Bazaar, Inc.
3+
* SPDX-License-Identifier: BSD-3-Clause
4+
*/
5+
6+
import {DataIntegrityProof} from '@digitalbazaar/data-integrity';
7+
import {getSuite} from '../vc-generator/cryptosuites.js';
8+
9+
// FIXME:an existing function in data integrity test suite assertion
10+
// does something similar to this function, but is not currently exported
11+
export function getSuites({
12+
signer,
13+
suiteName,
14+
mandatoryPointers,
15+
selectivePointers
16+
}) {
17+
const suites = {
18+
suite: new DataIntegrityProof({
19+
signer,
20+
cryptosuite: getSuite({
21+
suite: suiteName,
22+
mandatoryPointers
23+
})
24+
})
25+
};
26+
if(selectivePointers) {
27+
suites.selectiveSuite = new DataIntegrityProof({
28+
signer,
29+
cryptosuite: getSuite({
30+
suite: suiteName,
31+
selectivePointers
32+
})
33+
});
34+
}
35+
return suites;
36+
}

0 commit comments

Comments
 (0)