Fix unit test

This commit is contained in:
Pavel Murygin 2022-01-26 16:04:35 +03:00
parent 3f2cc372c1
commit 46aa35ea75
3 changed files with 14 additions and 16 deletions

View File

@ -1,18 +1,18 @@
{
"name": "@fluencelabs/marine-js",
"version": "0.0.1-snapshot-001.0",
"version": "0.0.2-snapshot-4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@fluencelabs/marine-js",
"version": "0.0.1-snapshot-001.0",
"version": "0.0.2-snapshot-4",
"license": "Apache 2.0",
"bin": {
"copy-avm": "dist/copyAvm.js"
"copy-marine": "dist/copyMarine.js"
},
"devDependencies": {
"@fluencelabs/avm": "^0.20.0",
"@fluencelabs/avm": "0.20.0-marine-web-adapted.1",
"@types/jest": "^27.4.0",
"@types/node": "^14.0.0",
"@wasmer/wasi": "^0.12.0",
@ -582,9 +582,9 @@
"dev": true
},
"node_modules/@fluencelabs/avm": {
"version": "0.20.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0.tgz",
"integrity": "sha512-dDtXh9iJ4U/lZhdS36Dsef55fzeCYGSYVBey1mi+OHzyDtQoxxAkac9HeMlgWWQoZzy9i43JmX0t0iX7tBt+4A==",
"version": "0.20.0-marine-web-adapted.1",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0-marine-web-adapted.1.tgz",
"integrity": "sha512-VVo93xk2fb4RAYqkMp5lezIMl/iqVbYmkhSGCZegtXDvvMcES/0+HS0XIl6dtdw3PGoKe76HNBdRRU+CdoU7yg==",
"dev": true,
"bin": {
"copy-avm": "dist/copyAvm.js"
@ -4652,9 +4652,9 @@
"dev": true
},
"@fluencelabs/avm": {
"version": "0.20.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0.tgz",
"integrity": "sha512-dDtXh9iJ4U/lZhdS36Dsef55fzeCYGSYVBey1mi+OHzyDtQoxxAkac9HeMlgWWQoZzy9i43JmX0t0iX7tBt+4A==",
"version": "0.20.0-marine-web-adapted.1",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0-marine-web-adapted.1.tgz",
"integrity": "sha512-VVo93xk2fb4RAYqkMp5lezIMl/iqVbYmkhSGCZegtXDvvMcES/0+HS0XIl6dtdw3PGoKe76HNBdRRU+CdoU7yg==",
"dev": true
},
"@istanbuljs/load-nyc-config": {

View File

@ -23,7 +23,7 @@
"devDependencies": {
"@wasmer/wasi": "^0.12.0",
"@wasmer/wasmfs": "^0.12.0",
"@fluencelabs/avm": "^0.20.0",
"@fluencelabs/avm": "0.20.0-marine-web-adapted.1",
"@types/jest": "^27.4.0",
"@types/node": "^14.0.0",
"jest": "^27.2.4",

View File

@ -3,7 +3,7 @@ import fs from 'fs';
import path from 'path';
import { WASI } from '@wasmer/wasi';
import { WasmFs } from '@wasmer/wasmfs';
import nodeBindings from '@wasmer/wasi/lib/bindings/node';
import bindings from '@wasmer/wasi/lib/bindings/browser';
const createModule = async (path: string) => {
const file = fs.readFileSync(path);
@ -42,7 +42,7 @@ const _wasi = new WASI({
// Bindings that are used by the WASI Instance (fs, path, etc...)
bindings: {
...nodeBindings,
...bindings,
fs: _wasmFs.fs,
},
});
@ -50,8 +50,7 @@ const _wasi = new WASI({
describe('Tests', () => {
it('should work', async () => {
const fluencePath = eval('require').resolve(avmPackageName);
// const avmPath = path.join(path.dirname(fluencePath), defaultAvmFileName);
const avmPath = path.join(__dirname, '../', defaultAvmFileName);
const avmPath = path.join(path.dirname(fluencePath), defaultAvmFileName);
const controlModule = await createModule(path.join(__dirname, '../marine-js.wasm'));
const avmModule = await createModule(avmPath);
@ -81,7 +80,6 @@ describe('Tests', () => {
const params = { init_peer_id: vmPeerId, current_peer_id: vmPeerId };
const json = invokeJson(s, b(''), b(''), params, {});
console.log(json);
let res: any = marineInstance.call_module('avm', 'invoke', json);
res = JSON.parse(res);