Skip to content

Commit ec3a22a

Browse files
dajiajidajiaji
committed
Remove isDenoV1.
1 parent 09b40df commit ec3a22a

File tree

1 file changed

+12
-39
lines changed

1 file changed

+12
-39
lines changed

‎packages/core/test/conformance.test.ts‎

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { afterAll, beforeAll, describe, it } from "@std/testing/bdd";
22

3-
import { isDeno, isDenoV1 } from "@hpke/common";
3+
import { isDeno } from "@hpke/common";
44

55
import type { ConformanceTester } from "./conformanceTester.ts";
66
import type { TestVector } from "./testVector.ts";
@@ -30,9 +30,6 @@ describe("RFC9180 conformance", () => {
3030
it("should match demonstrated values", async () => {
3131
for (const v of testVectors) {
3232
if (v.mode === 0 && v.kem_id === 0x0010 && v.aead_id <= 0x0002) {
33-
if (isDenoV1()) {
34-
continue;
35-
}
3633
await tester.test(v);
3734
}
3835
}
@@ -66,7 +63,7 @@ describe("RFC9180 conformance", () => {
6663
// it("should match demonstrated values", async () => {
6764
// for (const v of testVectors) {
6865
// if (v.mode === 0 && v.kem_id < 0x0020 && v.aead_id === 0x0003) {
69-
// if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
66+
// if (v.kem_id === 0x0012 && isDeno()) {
7067
// continue;
7168
// }
7269
// await tester.test(v);
@@ -79,7 +76,7 @@ describe("RFC9180 conformance", () => {
7976
it("should match demonstrated values", async () => {
8077
for (const v of testVectors) {
8178
if (v.mode === 0 && v.kem_id < 0x0020 && v.aead_id === 0xFFFF) {
82-
if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
79+
if (v.kem_id === 0x0012 && isDeno()) {
8380
continue;
8481
}
8582
await tester.test(v);
@@ -92,9 +89,6 @@ describe("RFC9180 conformance", () => {
9289
it("should match demonstrated values", async () => {
9390
for (const v of testVectors) {
9491
if (v.mode === 0 && v.kem_id === 0x0020 && v.aead_id <= 0x0002) {
95-
if (isDenoV1()) {
96-
continue;
97-
}
9892
await tester.test(v);
9993
}
10094
}
@@ -115,9 +109,6 @@ describe("RFC9180 conformance", () => {
115109
it("should match demonstrated values", async () => {
116110
for (const v of testVectors) {
117111
if (v.mode === 0 && v.kem_id === 0x0020 && v.aead_id === 0xFFFF) {
118-
if (isDenoV1()) {
119-
continue;
120-
}
121112
await tester.test(v);
122113
}
123114
}
@@ -164,7 +155,7 @@ describe("RFC9180 conformance", () => {
164155
it("should match demonstrated values", async () => {
165156
for (const v of testVectors) {
166157
if (v.mode === 1 && v.kem_id < 0x0020 && v.aead_id <= 0x0002) {
167-
if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
158+
if (v.kem_id === 0x0012 && isDeno()) {
168159
continue;
169160
}
170161
await tester.test(v);
@@ -177,7 +168,7 @@ describe("RFC9180 conformance", () => {
177168
// it("should match demonstrated values", async () => {
178169
// for (const v of testVectors) {
179170
// if (v.mode === 1 && v.kem_id < 0x0020 && v.aead_id === 0x0003) {
180-
// if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
171+
// if (v.kem_id === 0x0012 && isDeno()) {
181172
// continue;
182173
// }
183174
// await tester.test(v);
@@ -190,7 +181,7 @@ describe("RFC9180 conformance", () => {
190181
it("should match demonstrated values", async () => {
191182
for (const v of testVectors) {
192183
if (v.mode === 1 && v.kem_id < 0x0020 && v.aead_id === 0xFFFF) {
193-
if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
184+
if (v.kem_id === 0x0012 && isDeno()) {
194185
continue;
195186
}
196187
await tester.test(v);
@@ -203,9 +194,6 @@ describe("RFC9180 conformance", () => {
203194
it("should match demonstrated values", async () => {
204195
for (const v of testVectors) {
205196
if (v.mode === 1 && v.kem_id === 0x0020 && v.aead_id <= 0x0002) {
206-
if (isDenoV1()) {
207-
continue;
208-
}
209197
await tester.test(v);
210198
}
211199
}
@@ -226,9 +214,6 @@ describe("RFC9180 conformance", () => {
226214
it("should match demonstrated values", async () => {
227215
for (const v of testVectors) {
228216
if (v.mode === 1 && v.kem_id === 0x0020 && v.aead_id === 0xFFFF) {
229-
if (isDenoV1()) {
230-
continue;
231-
}
232217
await tester.test(v);
233218
}
234219
}
@@ -275,7 +260,7 @@ describe("RFC9180 conformance", () => {
275260
it("should match demonstrated values", async () => {
276261
for (const v of testVectors) {
277262
if (v.mode === 2 && v.kem_id < 0x0020 && v.aead_id <= 0x0002) {
278-
if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
263+
if (v.kem_id === 0x0012 && isDeno()) {
279264
continue;
280265
}
281266
await tester.test(v);
@@ -288,7 +273,7 @@ describe("RFC9180 conformance", () => {
288273
// it("should match demonstrated values", async () => {
289274
// for (const v of testVectors) {
290275
// if (v.mode === 2 && v.kem_id < 0x0020 && v.aead_id === 0x0003) {
291-
// if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
276+
// if (v.kem_id === 0x0012 && isDeno()) {
292277
// continue;
293278
// }
294279
// await tester.test(v);
@@ -301,7 +286,7 @@ describe("RFC9180 conformance", () => {
301286
it("should match demonstrated values", async () => {
302287
for (const v of testVectors) {
303288
if (v.mode === 2 && v.kem_id < 0x0020 && v.aead_id === 0xFFFF) {
304-
if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
289+
if (v.kem_id === 0x0012 && isDeno()) {
305290
continue;
306291
}
307292
await tester.test(v);
@@ -314,9 +299,6 @@ describe("RFC9180 conformance", () => {
314299
it("should match demonstrated values", async () => {
315300
for (const v of testVectors) {
316301
if (v.mode === 2 && v.kem_id === 0x0020 && v.aead_id <= 0x0002) {
317-
if (isDenoV1()) {
318-
continue;
319-
}
320302
await tester.test(v);
321303
}
322304
}
@@ -337,9 +319,6 @@ describe("RFC9180 conformance", () => {
337319
it("should match demonstrated values", async () => {
338320
for (const v of testVectors) {
339321
if (v.mode === 2 && v.kem_id === 0x0020 && v.aead_id === 0xFFFF) {
340-
if (isDenoV1()) {
341-
continue;
342-
}
343322
await tester.test(v);
344323
}
345324
}
@@ -386,7 +365,7 @@ describe("RFC9180 conformance", () => {
386365
it("should match demonstrated values", async () => {
387366
for (const v of testVectors) {
388367
if (v.mode === 3 && v.kem_id < 0x0020 && v.aead_id <= 0x0002) {
389-
if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
368+
if (v.kem_id === 0x0012 && isDeno()) {
390369
continue;
391370
}
392371
await tester.test(v);
@@ -399,7 +378,7 @@ describe("RFC9180 conformance", () => {
399378
// it("should match demonstrated values", async () => {
400379
// for (const v of testVectors) {
401380
// if (v.mode === 3 && v.kem_id < 0x0020 && v.aead_id === 0x0003) {
402-
// if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
381+
// if (v.kem_id === 0x0012 && isDeno()) {
403382
// continue;
404383
// }
405384
// await tester.test(v);
@@ -412,7 +391,7 @@ describe("RFC9180 conformance", () => {
412391
it("should match demonstrated values", async () => {
413392
for (const v of testVectors) {
414393
if (v.mode === 3 && v.kem_id < 0x0020 && v.aead_id === 0xFFFF) {
415-
if (isDenoV1() || (v.kem_id === 0x0012 && isDeno())) {
394+
if (v.kem_id === 0x0012 && isDeno()) {
416395
continue;
417396
}
418397
await tester.test(v);
@@ -425,9 +404,6 @@ describe("RFC9180 conformance", () => {
425404
it("should match demonstrated values", async () => {
426405
for (const v of testVectors) {
427406
if (v.mode === 3 && v.kem_id === 0x0020 && v.aead_id <= 0x0002) {
428-
if (isDenoV1()) {
429-
continue;
430-
}
431407
await tester.test(v);
432408
}
433409
}
@@ -448,9 +424,6 @@ describe("RFC9180 conformance", () => {
448424
it("should match demonstrated values", async () => {
449425
for (const v of testVectors) {
450426
if (v.mode === 3 && v.kem_id === 0x0020 && v.aead_id === 0xFFFF) {
451-
if (isDenoV1()) {
452-
continue;
453-
}
454427
await tester.test(v);
455428
}
456429
}

0 commit comments

Comments
 (0)