quantus/wasm
1
0
Fork 0
Code Issues 1 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump deps & adjust test output (#341)

Browse Source
This commit is contained in:
Jaco
2022-05-10 09:23:47 +02:00
committed by GitHub
parent 0355bb4769
commit 13826c371e
11 changed files with 81 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -32,7 +32,7 @@
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@polkadot/dev": "^0.66.18",
"@polkadot/dev": "^0.66.19",
"fflate": "^0.7.3",
"override-require": "^1.1.1"
},

5
packages/wasm-crypto-init/src/detectOther.ts
View File

@@ -1,6 +1,7 @@
// Copyright 2017-2022 @polkadot/wasm-crypto-init authors & contributors
// SPDX-License-Identifier: Apache-2.0
// Empty template, auto-generated by @polkadot/dev
import { packageInfo as asmInfo } from '@polkadot/wasm-data-asmjs/packageInfo';
import { packageInfo as wasmInfo } from '@polkadot/wasm-data-wasm/packageInfo';
export default [];
export default [asmInfo, wasmInfo];

4
packages/wasm-crypto/package.json
View File

@@ -32,9 +32,7 @@
"main": "index.js",
"dependencies": {
"@babel/runtime": "^7.17.9",
"@polkadot/wasm-crypto-init": "6.0.2-8",
"@polkadot/wasm-data-asmjs": "6.0.2-8",
"@polkadot/wasm-data-wasm": "6.0.2-8"
"@polkadot/wasm-crypto-init": "6.0.2-8"
},
"devDependencies": {
"@polkadot/util": "^9.1.1",

2
packages/wasm-crypto/src/bridge.ts
View File

@@ -15,6 +15,7 @@ type PopFirst<T extends unknown[]> =
interface Bridge {
cachegetInt32: Int32Array | null;
cachegetUint8: Uint8Array | null;
type: 'asm' | 'wasm';
wasm: WasmCryptoInstance | null;
wasmPromise: CreatePromise | null;
}
@@ -22,6 +23,7 @@ interface Bridge {
export const __bridge: Bridge = {
cachegetInt32: null,
cachegetUint8: null,
type: 'wasm',
wasm: null,
wasmPromise: null
};

3
packages/wasm-crypto/src/bundle.ts
View File

@@ -1,10 +1,11 @@
// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
// SPDX-License-Identifier: Apache-2.0
import { allocString, allocU8a, getWasm, resultString, resultU8a, withWasm } from './bridge';
import { __bridge, allocString, allocU8a, getWasm, resultString, resultU8a, withWasm } from './bridge';
import { initWasm } from './init';
export { packageInfo } from './packageInfo';
export { __bridge };
export const bip39Generate = withWasm((wasm, words: 12 | 15 | 18 | 21 | 24): string => {
wasm.ext_bip39_generate(8, words);

4
packages/wasm-crypto/src/detectOther.ts
View File

@@ -2,7 +2,5 @@
// SPDX-License-Identifier: Apache-2.0
import { packageInfo as initInfo } from '@polkadot/wasm-crypto-init/packageInfo';
import { packageInfo as asmInfo } from '@polkadot/wasm-data-asmjs/packageInfo';
import { packageInfo as wasmInfo } from '@polkadot/wasm-data-wasm/packageInfo';
export default [initInfo, asmInfo, wasmInfo];
export default [initInfo];

3
packages/wasm-crypto/src/init.ts
View File

@@ -13,7 +13,8 @@ export async function initWasm (initOverride?: (wbg: WebAssembly.ModuleImports)
__bridge.wasmPromise = (initOverride || init)(wbg);
}
const { wasm } = await __bridge.wasmPromise;
const { type, wasm } = await __bridge.wasmPromise;
__bridge.type = type;
__bridge.wasm = wasm as WasmCryptoInstance;
}

16
packages/wasm-crypto/test/all/index.cjs
View File

@@ -21,8 +21,12 @@ const tests = {
...hashing
};
function beforeAll () {
return wasm.waitReady();
async function beforeAll () {
const result = await wasm.waitReady();
console.log(`*** waitReady()=${result} for ${wasm.__bridge.type}`);
return result;
}
function runAll (name) {
@@ -30,16 +34,18 @@ function runAll (name) {
let count = 0;
Object.keys(tests).forEach((name) => {
const timerId = `\t${name}`;
count++;
try {
console.time(name);
console.time(timerId);
console.log();
console.log(name);
console.log(timerId);
tests[name](wasm);
console.timeEnd(name);
console.timeEnd(timerId);
} catch (error) {
console.error();
console.error(error);

6
packages/wasm-crypto/test/jest.spec.js
View File

@@ -5,11 +5,11 @@
* @jest-environment jsdom
*/
import { beforeAll, tests, wasm } from './all/index.cjs';
import { beforeAll as beforeAllFn, tests, wasm } from './all/index.cjs';
describe('wasm-crypto', () => {
beforeEach(async () => {
await beforeAll();
beforeAll(async () => {
await beforeAllFn();
});
Object.keys(tests).forEach((name) => {

4
packages/wasm-crypto/tsconfig.build.json
View File

@@ -6,8 +6,6 @@
"rootDir": "./src"
},
"references": [
{ "path": "../wasm-crypto-init/tsconfig.build.json" },
{ "path": "../wasm-data-asmjs/tsconfig.build.json" },
{ "path": "../wasm-data-wasm/tsconfig.build.json" }
{ "path": "../wasm-crypto-init/tsconfig.build.json" }
]
}

110
yarn.lock
View File

@@ -1923,9 +1923,9 @@ __metadata:
languageName: node
linkType: hard
"@polkadot/dev@npm:^0.66.18":
version: 0.66.18
resolution: "@polkadot/dev@npm:0.66.18"
"@polkadot/dev@npm:^0.66.19":
version: 0.66.19
resolution: "@polkadot/dev@npm:0.66.19"
dependencies:
"@babel/cli": ^7.17.10
"@babel/core": ^7.17.10
@@ -1949,8 +1949,8 @@ __metadata:
"@rollup/plugin-json": ^4.1.0
"@rollup/plugin-node-resolve": ^13.3.0
"@rushstack/eslint-patch": ^1.1.3
"@typescript-eslint/eslint-plugin": 5.22.0
"@typescript-eslint/parser": 5.22.0
"@typescript-eslint/eslint-plugin": 5.23.0
"@typescript-eslint/parser": 5.23.0
"@vue/component-compiler-utils": ^3.3.0
babel-jest: ^28.1.0
babel-plugin-module-extension-resolver: ^1.0.0-rc.2
@@ -2012,7 +2012,7 @@ __metadata:
polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs
polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs
polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs
checksum: e648ce70fdeda262b68a955c9405759a4f20d5a2d397ce65d5382ace9fb573568281eab9863278676324b8fb069a35ce61483d5db177de97e189c8b313d3c9c0
checksum: d3829dcf7eb41e93bc2cf1f80f7fb814546ca9c6822619fe815bc91089b694f7a15fea49694c16968090a6b70b909551363a0e69baeefd82a6ee67d6218a6a1e
languageName: node
linkType: hard
@@ -2052,8 +2052,6 @@ __metadata:
"@babel/runtime": ^7.17.9
"@polkadot/util": ^9.1.1
"@polkadot/wasm-crypto-init": 6.0.2-8
"@polkadot/wasm-data-asmjs": 6.0.2-8
"@polkadot/wasm-data-wasm": 6.0.2-8
"@polkadot/x-randomvalues": ^9.1.1
peerDependencies:
"@polkadot/util": "*"
@@ -2469,13 +2467,13 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/eslint-plugin@npm:5.22.0":
version: 5.22.0
resolution: "@typescript-eslint/eslint-plugin@npm:5.22.0"
"@typescript-eslint/eslint-plugin@npm:5.23.0":
version: 5.23.0
resolution: "@typescript-eslint/eslint-plugin@npm:5.23.0"
dependencies:
"@typescript-eslint/scope-manager": 5.22.0
"@typescript-eslint/type-utils": 5.22.0
"@typescript-eslint/utils": 5.22.0
"@typescript-eslint/scope-manager": 5.23.0
"@typescript-eslint/type-utils": 5.23.0
"@typescript-eslint/utils": 5.23.0
debug: ^4.3.2
functional-red-black-tree: ^1.0.1
ignore: ^5.1.8
@@ -2488,42 +2486,42 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 3b083f7003f091c3ef7b3970dca9cfd507ab8c52a9b8a52259c630010adf765e9766f0e6fd9c901fc0e807319a4e8c003e12287b1f12a4b9eb4d7222e8d6db83
checksum: 19ee37c0be172469968f61d156d6ce36a975ab72ccbb8f702eb4573c94d1cf9247ff32352ed85eda5e7b2eaace567d5c66b32846f042f9711349213496ec37d4
languageName: node
linkType: hard
"@typescript-eslint/parser@npm:5.22.0":
version: 5.22.0
resolution: "@typescript-eslint/parser@npm:5.22.0"
"@typescript-eslint/parser@npm:5.23.0":
version: 5.23.0
resolution: "@typescript-eslint/parser@npm:5.23.0"
dependencies:
"@typescript-eslint/scope-manager": 5.22.0
"@typescript-eslint/types": 5.22.0
"@typescript-eslint/typescript-estree": 5.22.0
"@typescript-eslint/scope-manager": 5.23.0
"@typescript-eslint/types": 5.23.0
"@typescript-eslint/typescript-estree": 5.23.0
debug: ^4.3.2
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 28a7d4b73154fc97336be9a4efd5ffdc659f748232c82479909e86ed87ed8a78d23280b3aaf532ca4e735caaffac43d9576e6af2dfd11865e30a9d70c8a3f275
checksum: b65a732b0be06ac9e4b13df78c466517e33fd382985c5d85b6d51cfa295cdf3351594cc2f95dda41d57abb6115e3b8df815fbbb7793aa0c4eddbac11077b90a8
languageName: node
linkType: hard
"@typescript-eslint/scope-manager@npm:5.22.0":
version: 5.22.0
resolution: "@typescript-eslint/scope-manager@npm:5.22.0"
"@typescript-eslint/scope-manager@npm:5.23.0":
version: 5.23.0
resolution: "@typescript-eslint/scope-manager@npm:5.23.0"
dependencies:
"@typescript-eslint/types": 5.22.0
"@typescript-eslint/visitor-keys": 5.22.0
checksum: ebf2ad44f4e5a4dfd55225419804f81f68056086c20f1549adbcca4236634eac3aae461e30d6cab6539ce6f42346ed6e1fbbb2710d2cc058a3283ef91a0fe174
"@typescript-eslint/types": 5.23.0
"@typescript-eslint/visitor-keys": 5.23.0
checksum: cd3dda0b18d6730e34784fc63135fc9fe31673898d3e0868cd765ad78855351f285fe577297193cf179b3ce918c3d44453de85159a925f5c02d12a5626e787d8
languageName: node
linkType: hard
"@typescript-eslint/type-utils@npm:5.22.0":
version: 5.22.0
resolution: "@typescript-eslint/type-utils@npm:5.22.0"
"@typescript-eslint/type-utils@npm:5.23.0":
version: 5.23.0
resolution: "@typescript-eslint/type-utils@npm:5.23.0"
dependencies:
"@typescript-eslint/utils": 5.22.0
"@typescript-eslint/utils": 5.23.0
debug: ^4.3.2
tsutils: ^3.21.0
peerDependencies:
@@ -2531,7 +2529,7 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 7128085bfbeca3a9646a795a34730cdfeca110bc00240569f6a7b3dc0854680afa56e015715675a78198b414de869339bd6036cc33cb14903919780a60321a95
checksum: 88bf7c7a08c11f2a02a05fe331750c569bfc2b4759e0dea6ec72ffd1597624a01100965052a5fede1e3f25ea8ef503bd424e03c9805f0a1af223f28b4fd74946
languageName: node
linkType: hard
@@ -2542,19 +2540,19 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/types@npm:5.22.0":
version: 5.22.0
resolution: "@typescript-eslint/types@npm:5.22.0"
checksum: 74f822c5a3b96bba05229eea4ed370c4bd48b17f475c37f08d6ba708adf65c3aa026bb544f1d0308c96e043b30015e396fd53b1e8e4e9fbb6dc9c92d2ccc0a15
"@typescript-eslint/types@npm:5.23.0":
version: 5.23.0
resolution: "@typescript-eslint/types@npm:5.23.0"
checksum: 96ae3e80cfae7b34f2846db692c31fb1804bf9651bce1d29f2eb8ae4c763d22f3283adc02dedeebd7cf70e4d8be54ec7f6ca593e03cdca26c791207e7556c2c1
languageName: node
linkType: hard
"@typescript-eslint/typescript-estree@npm:5.22.0":
version: 5.22.0
resolution: "@typescript-eslint/typescript-estree@npm:5.22.0"
"@typescript-eslint/typescript-estree@npm:5.23.0":
version: 5.23.0
resolution: "@typescript-eslint/typescript-estree@npm:5.23.0"
dependencies:
"@typescript-eslint/types": 5.22.0
"@typescript-eslint/visitor-keys": 5.22.0
"@typescript-eslint/types": 5.23.0
"@typescript-eslint/visitor-keys": 5.23.0
debug: ^4.3.2
globby: ^11.0.4
is-glob: ^4.0.3
@@ -2563,7 +2561,7 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 2797a79d7d32a9a547b7f1de77a353d8e8c8519791f865f5e061bfc4918d12cdaddec51afa015f5aac5d068ef525c92bd65afc83b84dc9e52e697303acf0873a
checksum: 8d85bb1cd777e93cc7322ae8fea25f9b924def02494cdb8395c1d5d17b5fd3ac9bc969418a1d20a5dc28c2cdd85da20e13527e28b595c06ff6f84cd22a78d73f
languageName: node
linkType: hard
@@ -2585,19 +2583,19 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/utils@npm:5.22.0":
version: 5.22.0
resolution: "@typescript-eslint/utils@npm:5.22.0"
"@typescript-eslint/utils@npm:5.23.0":
version: 5.23.0
resolution: "@typescript-eslint/utils@npm:5.23.0"
dependencies:
"@types/json-schema": ^7.0.9
"@typescript-eslint/scope-manager": 5.22.0
"@typescript-eslint/types": 5.22.0
"@typescript-eslint/typescript-estree": 5.22.0
"@typescript-eslint/scope-manager": 5.23.0
"@typescript-eslint/types": 5.23.0
"@typescript-eslint/typescript-estree": 5.23.0
eslint-scope: ^5.1.1
eslint-utils: ^3.0.0
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
checksum: 5019485e76d754a7a60c042545fd884dc666fddf9d4223ff706bbf0c275f19ea25a6b210fb5cf7ed368b019fe538fd854a925e9c6f12007d51b1731a29d95cc1
checksum: 72207399f29856b601148fe1aff07049021fad8e780ee6e896279d2291806d4608f1c28ddc5c3c5616ce94f25dcbcd26f295669e524fc1c4b4db810569c90f85
languageName: node
linkType: hard
@@ -2611,13 +2609,13 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/visitor-keys@npm:5.22.0":
version: 5.22.0
resolution: "@typescript-eslint/visitor-keys@npm:5.22.0"
"@typescript-eslint/visitor-keys@npm:5.23.0":
version: 5.23.0
resolution: "@typescript-eslint/visitor-keys@npm:5.23.0"
dependencies:
"@typescript-eslint/types": 5.22.0
"@typescript-eslint/types": 5.23.0
eslint-visitor-keys: ^3.0.0
checksum: d30dfa98dcce75da49a6a204a0132d42e63228c35681cb9b3643e47a0a24a633e259832d48d101265bd85b8eb5a9f2b4858f9447646c1d3df6a2ac54258dfe8f
checksum: 322e10d52a985e8a90d3612bb9d09a87dc64fc4cb1248484f1a9a7a98f65d3ef65a465ce868773a4939e35fa3b726ad609dac5a168efd7eaca4b06df33e965e3
languageName: node
linkType: hard
@@ -8503,7 +8501,7 @@ resolve@^2.0.0-next.3:
resolution: "root-workspace-0b6124@workspace:."
dependencies:
"@babel/core": ^7.17.10
"@polkadot/dev": ^0.66.18
"@polkadot/dev": ^0.66.19
fflate: ^0.7.3
override-require: ^1.1.1
languageName: unknown