Skip to content

Commit c45177f

Browse files
committed
Fix signature validation tests
1 parent 53a1173 commit c45177f

File tree

8 files changed

+28
-29
lines changed

8 files changed

+28
-29
lines changed

packages/sdk/jest.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const config: Config.InitialOptions = {
1111
'@streamr/test-utils/setupCustomMatchers',
1212
],
1313
moduleNameMapper: {
14+
"^@/createSignatureValidationWorker$": "<rootDir>/src/_jest/createSignatureValidationWorker.ts",
1415
"^@/(.*)$": "<rootDir>/src/_nodejs/$1",
1516
},
1617
transform: {

packages/sdk/rollup.config.mts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ function workerNodejs(): RollupOptions {
216216
context: 'globalThis',
217217
output: {
218218
format: 'es',
219-
file: './dist/workers/SignatureValidationWorker.node.js',
219+
file: './dist/workers/SignatureValidationWorker.node.mjs',
220220
sourcemap: true,
221221
},
222222
plugins: [
@@ -229,7 +229,7 @@ function workerNodejs(): RollupOptions {
229229
}),
230230
cjs(),
231231
],
232-
external: [],
232+
external: [/node_modules/, /@streamr\//],
233233
onwarn,
234234
}
235235
}
@@ -243,7 +243,7 @@ function workerBrowser(): RollupOptions {
243243
context: 'self',
244244
output: {
245245
format: 'es',
246-
file: './dist/workers/SignatureValidationWorker.browser.js',
246+
file: './dist/workers/SignatureValidationWorker.browser.mjs',
247247
sourcemap: true,
248248
},
249249
plugins: [

packages/sdk/src/_browser/createSignatureValidationWorker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Worker from 'web-worker'
55

66
export function createSignatureValidationWorker(): InstanceType<typeof Worker> {
77
return new Worker(
8-
new URL('./workers/SignatureValidationWorker.browser.js', import.meta.url),
8+
new URL('./workers/SignatureValidationWorker.browser.mjs', import.meta.url),
99
{ type: 'module' }
1010
)
1111
}

packages/sdk/src/_browser/exposeWorkerApi.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Jest-specific signature validation worker factory.
3+
*/
4+
import Worker from 'web-worker'
5+
6+
export function createSignatureValidationWorker(): InstanceType<typeof Worker> {
7+
return new Worker(
8+
new URL('../../dist/workers/SignatureValidationWorker.node.mjs', import.meta.url),
9+
{ type: 'module' }
10+
)
11+
}

packages/sdk/src/_nodejs/createSignatureValidationWorker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Worker from 'web-worker'
55

66
export function createSignatureValidationWorker(): InstanceType<typeof Worker> {
77
return new Worker(
8-
new URL('./workers/SignatureValidationWorker.node.js', import.meta.url),
8+
new URL('./workers/SignatureValidationWorker.node.mjs', import.meta.url),
99
{ type: 'module' }
1010
)
1111
}

packages/sdk/src/_nodejs/exposeWorkerApi.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
import { exposeWorkerApi } from '@/exposeWorkerApi'
2-
import { validateSignatureData, SignatureValidationResult, SignatureValidationData } from './signatureValidationUtils'
1+
import { expose } from 'comlink'
2+
import {
3+
validateSignatureData,
4+
SignatureValidationResult,
5+
SignatureValidationData,
6+
} from './signatureValidationUtils'
37

48
const workerApi = {
5-
validateSignature: async (data: SignatureValidationData): Promise<SignatureValidationResult> => {
9+
validateSignature: async (
10+
data: SignatureValidationData
11+
): Promise<SignatureValidationResult> => {
612
return validateSignatureData(data)
7-
}
13+
},
814
}
915

1016
export type SignatureValidationWorkerApi = typeof workerApi
1117

12-
exposeWorkerApi(workerApi)
18+
expose(workerApi)

0 commit comments

Comments
 (0)