fix tests

This commit is contained in:
DieMyst
2022-04-11 10:51:59 +03:00
parent b271c49e0a
commit 17bc8026c7
4 changed files with 65 additions and 56 deletions

View File

@@ -26,5 +26,5 @@ func calc(log: string, []u32 -> ()) -> u32:
func calc2(log: string, []u32 -> ()) -> u32:
arr = [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]
num <- A.getJ((5-2) * 3 - 3 ** (A.getJ(5 + 5) - A.getJ(3 ** (3 - 1)))) -- 3
<- arr[num + num - A.getJ(num) - 3] -- should be 0
num <- A.getJ((5-2) * 3 - 3 ** (A.getJ(5 + 5) - A.getJ(3 ** (3 - 1)))) -- 6
<- arr[num + num - A.getJ(num) - 3] -- should be 3

109
package-lock.json generated
View File

@@ -18,9 +18,9 @@
"fldist": "dist/index.js"
},
"devDependencies": {
"@fluencelabs/aqua": "0.6.2-281",
"@fluencelabs/aqua": "0.7.1-295",
"@fluencelabs/aqua-dht": "0.2.5",
"@fluencelabs/aqua-lib": "0.4.0",
"@fluencelabs/aqua-lib": "0.4.3",
"@types/jest": "^27.0.2",
"jest": "^27.2.4",
"ts-jest": "^27.0.5",
@@ -696,14 +696,14 @@
"integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="
},
"node_modules/@fluencelabs/aqua": {
"version": "0.6.2-281",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.2-281.tgz",
"integrity": "sha512-iXlD6+V05tlnwhiXOwEjJ1noHB1dQr8AY1skwu40pXxeP+BX2NjrbSx28kByprfZvK3NykB0N7BNY6pbZpE7eQ==",
"version": "0.7.1-295",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.7.1-295.tgz",
"integrity": "sha512-dWqM0l1Tx9YHmjRQeqZ5qoI5gUED+RodLD/ZYkCrYoMCnMytasyfKK5NeMSpvLt0c4lTmus/ZlhnG0LozAccrg==",
"dev": true,
"dependencies": {
"@fluencelabs/aqua-ipfs": "0.5.2",
"@fluencelabs/aqua-lib": "0.4.0",
"@fluencelabs/fluence": "0.20.2",
"@fluencelabs/fluence": "0.21.8",
"@fluencelabs/fluence-network-environment": "1.0.13",
"ipfs-http-client": "50.1.2"
},
@@ -782,15 +782,15 @@
"dev": true
},
"node_modules/@fluencelabs/aqua-lib": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.4.0.tgz",
"integrity": "sha512-bad282cCZrE//I+Hzsl/vWgudwXuNiaqJOonv11xkgOBBvL7Gg3SIap8HioNvkaDxIvylVB+POjYJ7E5sGNoVQ==",
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.4.3.tgz",
"integrity": "sha512-IKhxn4UUWQnrxnZgLVXiO6O+49E+9TAN8RTfRGjJk02JJor854+4WbtfhaapOdx7R6SXq074PVFTbrfnFVhRcQ==",
"dev": true
},
"node_modules/@fluencelabs/aqua/node_modules/@chainsafe/libp2p-noise": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/@chainsafe/libp2p-noise/-/libp2p-noise-4.1.1.tgz",
"integrity": "sha512-/Fz86sZmnvRSf7FHxMPifzakxx9xK4KVYx6yi35KPZughop9ivJslUSCLhx/UqDHiuj3h9i04pVXET6nIjSJyQ==",
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/@chainsafe/libp2p-noise/-/libp2p-noise-4.1.2.tgz",
"integrity": "sha512-UvZLWvIS7bAz6M8XfsnC/NhT1c/lg8NNsME1hTvo21kRwyxNFpB8gEhId03Cb5B23oIaHhMySAHBcpuMiSxQ2w==",
"dev": true,
"dependencies": {
"@stablelib/chacha20poly1305": "^1.0.1",
@@ -831,28 +831,24 @@
"varint": "^6.0.0"
}
},
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/avm": {
"version": "0.20.8",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.8.tgz",
"integrity": "sha512-RF5Vb3USgr7gU0gcXCGYgN9rBXcucgwTgGeUjHOYWQIwuzD795DKjGPbgzfKWWCKFWjz5w/Gimi5beTDvbstOQ==",
"dev": true,
"bin": {
"copy-avm": "dist/copyAvm.js"
}
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.4.0.tgz",
"integrity": "sha512-bad282cCZrE//I+Hzsl/vWgudwXuNiaqJOonv11xkgOBBvL7Gg3SIap8HioNvkaDxIvylVB+POjYJ7E5sGNoVQ==",
"dev": true
},
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.20.2.tgz",
"integrity": "sha512-ZvMSwTqGRb2macWoGi+MVC0AwWhWacsVFRSnSp0cQT79So7o2U6+dRNv95V//ttPrC9zlElDehJ0JzY5uxzJLQ==",
"version": "0.21.8",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.21.8.tgz",
"integrity": "sha512-QeCYdPZhCsxZTxlMzXGOKPqP9rzkVh/FpNZaf60JcmMu07tMcpOxvhu26wDni2QugifRvh26/tkSQ6GN3ceg3A==",
"dev": true,
"dependencies": {
"@chainsafe/libp2p-noise": "^4.1.1",
"@fluencelabs/avm": "0.20.8",
"@fluencelabs/avm": "^0.21.3",
"@fluencelabs/avm-runner-background": "0.2.0",
"@fluencelabs/avm-runner-interface": "^0.2.0",
"@fluencelabs/marine-js": "0.1.0",
"async": "3.2.0",
"browser-or-node": "^2.0.0",
"bs58": "4.0.1",
"buffer": "^6.0.3",
"cids": "0.8.1",
@@ -866,6 +862,7 @@
"multiaddr": "^10.0.1",
"multiformats": "^9.6.4",
"peer-id": "=0.15.4",
"platform": "^1.3.6",
"rxjs": "^7.3.0",
"ts-pattern": "^3.3.3",
"uuid": "8.3.0"
@@ -969,9 +966,9 @@
}
},
"node_modules/@fluencelabs/aqua/node_modules/ipfs-utils/node_modules/any-signal": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/any-signal/-/any-signal-3.0.0.tgz",
"integrity": "sha512-l1H1GEkGGIXVGfCtvq8N68YI7gHajmfzRdKhmb8sGyAQpLCblirLa8eB09j4uKaiwe7vodAChocUf7AT3mYq5g==",
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/any-signal/-/any-signal-3.0.1.tgz",
"integrity": "sha512-xgZgJtKEa9YmDqXodIgl7Fl1C8yNXr8w6gXjqK3LW4GcEiYT+6AQfJSE/8SPsEpLLmcvbv8YU+qet94UewHxqg==",
"dev": true
},
"node_modules/@fluencelabs/aqua/node_modules/it-glob": {
@@ -8056,6 +8053,12 @@
"node": ">=8"
}
},
"node_modules/platform": {
"version": "1.3.6",
"resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
"integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
"dev": true
},
"node_modules/prelude-ls": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -9876,22 +9879,22 @@
}
},
"@fluencelabs/aqua": {
"version": "0.6.2-281",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.2-281.tgz",
"integrity": "sha512-iXlD6+V05tlnwhiXOwEjJ1noHB1dQr8AY1skwu40pXxeP+BX2NjrbSx28kByprfZvK3NykB0N7BNY6pbZpE7eQ==",
"version": "0.7.1-295",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.7.1-295.tgz",
"integrity": "sha512-dWqM0l1Tx9YHmjRQeqZ5qoI5gUED+RodLD/ZYkCrYoMCnMytasyfKK5NeMSpvLt0c4lTmus/ZlhnG0LozAccrg==",
"dev": true,
"requires": {
"@fluencelabs/aqua-ipfs": "0.5.2",
"@fluencelabs/aqua-lib": "0.4.0",
"@fluencelabs/fluence": "0.20.2",
"@fluencelabs/fluence": "0.21.8",
"@fluencelabs/fluence-network-environment": "1.0.13",
"ipfs-http-client": "50.1.2"
},
"dependencies": {
"@chainsafe/libp2p-noise": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/@chainsafe/libp2p-noise/-/libp2p-noise-4.1.1.tgz",
"integrity": "sha512-/Fz86sZmnvRSf7FHxMPifzakxx9xK4KVYx6yi35KPZughop9ivJslUSCLhx/UqDHiuj3h9i04pVXET6nIjSJyQ==",
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/@chainsafe/libp2p-noise/-/libp2p-noise-4.1.2.tgz",
"integrity": "sha512-UvZLWvIS7bAz6M8XfsnC/NhT1c/lg8NNsME1hTvo21kRwyxNFpB8gEhId03Cb5B23oIaHhMySAHBcpuMiSxQ2w==",
"dev": true,
"requires": {
"@stablelib/chacha20poly1305": "^1.0.1",
@@ -9934,25 +9937,24 @@
}
}
},
"@fluencelabs/avm": {
"version": "0.20.8",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.8.tgz",
"integrity": "sha512-RF5Vb3USgr7gU0gcXCGYgN9rBXcucgwTgGeUjHOYWQIwuzD795DKjGPbgzfKWWCKFWjz5w/Gimi5beTDvbstOQ==",
"@fluencelabs/aqua-lib": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.4.0.tgz",
"integrity": "sha512-bad282cCZrE//I+Hzsl/vWgudwXuNiaqJOonv11xkgOBBvL7Gg3SIap8HioNvkaDxIvylVB+POjYJ7E5sGNoVQ==",
"dev": true
},
"@fluencelabs/fluence": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.20.2.tgz",
"integrity": "sha512-ZvMSwTqGRb2macWoGi+MVC0AwWhWacsVFRSnSp0cQT79So7o2U6+dRNv95V//ttPrC9zlElDehJ0JzY5uxzJLQ==",
"version": "0.21.8",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.21.8.tgz",
"integrity": "sha512-QeCYdPZhCsxZTxlMzXGOKPqP9rzkVh/FpNZaf60JcmMu07tMcpOxvhu26wDni2QugifRvh26/tkSQ6GN3ceg3A==",
"dev": true,
"requires": {
"@chainsafe/libp2p-noise": "^4.1.1",
"@fluencelabs/avm": "0.20.8",
"@fluencelabs/avm": "^0.21.3",
"@fluencelabs/avm-runner-background": "0.2.0",
"@fluencelabs/avm-runner-interface": "^0.2.0",
"@fluencelabs/marine-js": "0.1.0",
"async": "3.2.0",
"browser-or-node": "^2.0.0",
"bs58": "4.0.1",
"buffer": "^6.0.3",
"cids": "0.8.1",
@@ -9966,6 +9968,7 @@
"multiaddr": "^10.0.1",
"multiformats": "^9.6.4",
"peer-id": "=0.15.4",
"platform": "^1.3.6",
"rxjs": "^7.3.0",
"ts-pattern": "^3.3.3",
"uuid": "8.3.0"
@@ -10048,9 +10051,9 @@
},
"dependencies": {
"any-signal": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/any-signal/-/any-signal-3.0.0.tgz",
"integrity": "sha512-l1H1GEkGGIXVGfCtvq8N68YI7gHajmfzRdKhmb8sGyAQpLCblirLa8eB09j4uKaiwe7vodAChocUf7AT3mYq5g==",
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/any-signal/-/any-signal-3.0.1.tgz",
"integrity": "sha512-xgZgJtKEa9YmDqXodIgl7Fl1C8yNXr8w6gXjqK3LW4GcEiYT+6AQfJSE/8SPsEpLLmcvbv8YU+qet94UewHxqg==",
"dev": true
}
}
@@ -10345,9 +10348,9 @@
}
},
"@fluencelabs/aqua-lib": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.4.0.tgz",
"integrity": "sha512-bad282cCZrE//I+Hzsl/vWgudwXuNiaqJOonv11xkgOBBvL7Gg3SIap8HioNvkaDxIvylVB+POjYJ7E5sGNoVQ==",
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.4.3.tgz",
"integrity": "sha512-IKhxn4UUWQnrxnZgLVXiO6O+49E+9TAN8RTfRGjJk02JJor854+4WbtfhaapOdx7R6SXq074PVFTbrfnFVhRcQ==",
"dev": true
},
"@fluencelabs/avm": {
@@ -15894,6 +15897,12 @@
"find-up": "^4.0.0"
}
},
"platform": {
"version": "1.3.6",
"resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
"integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
"dev": true
},
"prelude-ls": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",

View File

@@ -29,9 +29,9 @@
"do": "aqua dist deploy --addr /dns4/kras-04.fluence.dev/tcp/19001/wss/p2p/12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi --config-path deploy.json --service tsOracle"
},
"devDependencies": {
"@fluencelabs/aqua": "0.6.2-281",
"@fluencelabs/aqua": "0.7.1-295",
"@fluencelabs/aqua-dht": "0.2.5",
"@fluencelabs/aqua-lib": "0.4.0",
"@fluencelabs/aqua-lib": "0.4.3",
"@types/jest": "^27.0.2",
"jest": "^27.2.4",
"ts-jest": "^27.0.5",

View File

@@ -233,7 +233,7 @@ describe('Testing examples', () => {
it('math.aqua test 2', async () => {
let res = await mathTest2Call();
expect(res).toEqual(-5);
expect(res).toEqual(3);
});
it('foldJoin.aqua', async () => {
@@ -243,7 +243,7 @@ describe('Testing examples', () => {
it('funcs.aqua', async () => {
let result = await funcsCall();
expect(result).toEqual([13, 6, 0]);
expect(result).toEqual([13, 6, 3]);
}, 7000);
it('option.aqua', async () => {