Skip to content

Commit 2467e6e

Browse files
committed
Move getSuites to common helpers file.
1 parent 2e9740d commit 2467e6e

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,
@@ -101,7 +100,7 @@ async function _setup({
101100
// invalid cryptosuite name invalidCryptosuite
102101
credentials.set('invalid cryptosuite', await issueCloned(invalidCryptosuite({
103102
credential: structuredClone(_credential),
104-
..._getSuites({
103+
...getSuites({
105104
signer,
106105
suiteName,
107106
selectivePointers,
@@ -110,7 +109,7 @@ async function _setup({
110109
})));
111110
credentials.set('invalid VerificationMethod', await issueCloned(invalidVm({
112111
credential: structuredClone(_credential),
113-
..._getSuites({
112+
...getSuites({
114113
signer,
115114
suiteName,
116115
selectivePointers,
@@ -119,7 +118,7 @@ async function _setup({
119118
})));
120119
credentials.set('invalid Proof Type', await issueCloned(invalidProofType({
121120
credential: structuredClone(_credential),
122-
..._getSuites({
121+
...getSuites({
123122
signer,
124123
suiteName,
125124
selectivePointers,
@@ -128,30 +127,3 @@ async function _setup({
128127
})));
129128
return credentials;
130129
}
131-
132-
function _getSuites({
133-
signer,
134-
suiteName,
135-
mandatoryPointers,
136-
selectivePointers
137-
}) {
138-
const suites = {
139-
suite: new DataIntegrityProof({
140-
signer,
141-
cryptosuite: getSuite({
142-
suite: suiteName,
143-
mandatoryPointers
144-
})
145-
})
146-
};
147-
if(selectivePointers) {
148-
suites.selectiveSuite = new DataIntegrityProof({
149-
signer,
150-
cryptosuite: getSuite({
151-
suite: suiteName,
152-
selectivePointers
153-
})
154-
});
155-
}
156-
return suites;
157-
}

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)