update aqua, add module, add listBlueprints tu run specs

This commit is contained in:
DieMyst 2022-01-25 14:32:56 +03:00
parent 585ee666ef
commit 8cc33b2daf
5 changed files with 46 additions and 101 deletions

View File

@ -1,10 +1,14 @@
module FoldJoin
import "@fluencelabs/aqua-lib/builtin.aqua"
export getTwoResults
service Op2("op"):
identity(s: u64)
func getTwoResults(relay: string) -> []u64:
on relay:
func getTwoResults(node: string) -> []u64:
on node:
nodes <- Kademlia.neighborhood(%init_peer_id%, nil, nil)
res: *u64
for n <- nodes par:

View File

@ -4,4 +4,4 @@ export someFunc
func someFunc(cb: []string -> ()):
ifaces: *string
cb(ifaces)
cb(ifaces)

106
package-lock.json generated
View File

@ -19,7 +19,7 @@
"fldist": "dist/index.js"
},
"devDependencies": {
"@fluencelabs/aqua": "0.5.2-257",
"@fluencelabs/aqua": "0.5.3-260",
"@fluencelabs/aqua-dht": "0.2.4",
"@fluencelabs/aqua-lib": "0.3.2",
"@types/jest": "^27.0.2",
@ -689,14 +689,14 @@
"integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="
},
"node_modules/@fluencelabs/aqua": {
"version": "0.5.2-257",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.5.2-257.tgz",
"integrity": "sha512-JxNbyLTWwyt2rI4EThYwz7kgaxiulnUveDahb79C85ZPQyzFLIadRe2dwlWcSi0H+H/nhTVT/3L9XE7n9RSpfw==",
"version": "0.5.3-260",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.5.3-260.tgz",
"integrity": "sha512-VHDpUEpiuJ8FGTrY61uoLyUietwej0K1sC1VkysvNEtLU8o0jh4nBwKP3vyNkw30N4n9u3qjN8zcF1FRNxHYfg==",
"dev": true,
"dependencies": {
"@fluencelabs/aqua-ipfs": "0.5.2",
"@fluencelabs/aqua-lib": "0.2.1",
"@fluencelabs/fluence": "0.15.2",
"@fluencelabs/aqua-lib": "0.3.2",
"@fluencelabs/fluence": "0.18.0",
"ipfs-http-client": "50.1.2"
},
"bin": {
@ -779,47 +779,6 @@
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==",
"dev": true
},
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.2.1.tgz",
"integrity": "sha512-uLP9mbgFHR1Q1FYhehasNxNBlTclBsjNI9MvIPF8oXtVJtnvPi+R4rGGTOHtRJukunxhpAV/svWQU9a2BRyDmQ==",
"dev": true
},
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/avm": {
"version": "0.16.0-restriction-operator.9",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.16.0-restriction-operator.9.tgz",
"integrity": "sha512-34vJqo8TIho5H2+WhEAJOa6WxAPiS+c7Z3WKmRZVi+GAsZN3Hv2NiuiCFNFBmPRoD+juzHe4Dmv5cF7HZc6O6w==",
"dev": true,
"dependencies": {
"base64-js": "1.5.1"
}
},
"node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": {
"version": "0.15.2",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.15.2.tgz",
"integrity": "sha512-RWGh70XkqcJusaqB4TR0tVBSVkzlMU9krwALQmgilLTxaSBMPtB6xMt13ceEJ/G6BwsLZWdgY2Wy6GvdSheKaw==",
"dev": true,
"dependencies": {
"@chainsafe/libp2p-noise": "4.0.0",
"@fluencelabs/avm": "0.16.0-restriction-operator.9",
"async": "3.2.0",
"base64-js": "1.5.1",
"bs58": "4.0.1",
"cids": "0.8.1",
"it-length-prefixed": "3.0.1",
"it-pipe": "1.1.0",
"libp2p": "0.32.3",
"libp2p-crypto": "0.19.7",
"libp2p-mplex": "0.10.4",
"libp2p-websockets": "0.16.1",
"loglevel": "1.7.0",
"multiaddr": "10.0.0",
"peer-id": "0.15.3",
"rxjs": "^7.3.0",
"ts-pattern": "^3.3.3",
"uuid": "8.3.0"
}
},
"node_modules/@fluencelabs/avm": {
"version": "0.20.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0.tgz",
@ -9109,58 +9068,15 @@
}
},
"@fluencelabs/aqua": {
"version": "0.5.2-257",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.5.2-257.tgz",
"integrity": "sha512-JxNbyLTWwyt2rI4EThYwz7kgaxiulnUveDahb79C85ZPQyzFLIadRe2dwlWcSi0H+H/nhTVT/3L9XE7n9RSpfw==",
"version": "0.5.3-260",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.5.3-260.tgz",
"integrity": "sha512-VHDpUEpiuJ8FGTrY61uoLyUietwej0K1sC1VkysvNEtLU8o0jh4nBwKP3vyNkw30N4n9u3qjN8zcF1FRNxHYfg==",
"dev": true,
"requires": {
"@fluencelabs/aqua-ipfs": "0.5.2",
"@fluencelabs/aqua-lib": "0.2.1",
"@fluencelabs/fluence": "0.15.2",
"@fluencelabs/aqua-lib": "0.3.2",
"@fluencelabs/fluence": "0.18.0",
"ipfs-http-client": "50.1.2"
},
"dependencies": {
"@fluencelabs/aqua-lib": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.2.1.tgz",
"integrity": "sha512-uLP9mbgFHR1Q1FYhehasNxNBlTclBsjNI9MvIPF8oXtVJtnvPi+R4rGGTOHtRJukunxhpAV/svWQU9a2BRyDmQ==",
"dev": true
},
"@fluencelabs/avm": {
"version": "0.16.0-restriction-operator.9",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.16.0-restriction-operator.9.tgz",
"integrity": "sha512-34vJqo8TIho5H2+WhEAJOa6WxAPiS+c7Z3WKmRZVi+GAsZN3Hv2NiuiCFNFBmPRoD+juzHe4Dmv5cF7HZc6O6w==",
"dev": true,
"requires": {
"base64-js": "1.5.1"
}
},
"@fluencelabs/fluence": {
"version": "0.15.2",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.15.2.tgz",
"integrity": "sha512-RWGh70XkqcJusaqB4TR0tVBSVkzlMU9krwALQmgilLTxaSBMPtB6xMt13ceEJ/G6BwsLZWdgY2Wy6GvdSheKaw==",
"dev": true,
"requires": {
"@chainsafe/libp2p-noise": "4.0.0",
"@fluencelabs/avm": "0.16.0-restriction-operator.9",
"async": "3.2.0",
"base64-js": "1.5.1",
"bs58": "4.0.1",
"cids": "0.8.1",
"it-length-prefixed": "3.0.1",
"it-pipe": "1.1.0",
"libp2p": "0.32.3",
"libp2p-crypto": "0.19.7",
"libp2p-mplex": "0.10.4",
"libp2p-websockets": "0.16.1",
"loglevel": "1.7.0",
"multiaddr": "10.0.0",
"peer-id": "0.15.3",
"rxjs": "^7.3.0",
"ts-pattern": "^3.3.3",
"uuid": "8.3.0"
}
}
}
},
"@fluencelabs/aqua-dht": {

View File

@ -28,7 +28,7 @@
"aqua": "aqua"
},
"devDependencies": {
"@fluencelabs/aqua": "0.5.2-257",
"@fluencelabs/aqua": "0.5.3-260",
"@fluencelabs/aqua-dht": "0.2.4",
"@fluencelabs/aqua-lib": "0.3.2",
"@types/jest": "^27.0.2",

View File

@ -6,12 +6,13 @@ const exec = util.promisify(require('child_process').exec);
describe('Testing run command', () => {
const addr = krasnodar[2].multiaddr
const nodeId = krasnodar[3].peerId
const addr = krasnodar[4].multiaddr
const nodeId = krasnodar[5].peerId
const message = "hello"
const message2 = "aaa"
const func = `\"call(\\\"${message}\\\", \\\"${message2}\\\", \\\"${nodeId}\\\")\"`
const call = `npm run aqua run -- --addr ${addr} -i cli-run-aqua/caller.aqua -m node_modules/ --func ${func}`
const listModulesCall = `npm run aqua listBlueprints -- --addr ${addr}`
it('run simple command', (done) => {
exec(call, (error, stdout, stderr) => {
@ -36,4 +37,28 @@ describe('Testing run command', () => {
done();
});
}, 16000);
it.skip('run listBlueprints', (done) => {
exec(listModulesCall, (error, stdout, stderr) => {
if (error) {
console.error(`error: ${error.message}`);
} else if (stderr) {
console.error(`stderr: ${stderr}`);
} else {
// get element before last in output
const result = stdout;
console.log(result);
const toCheck = [message, message2].join(',');
const res = result.includes(message) && result.includes(message2);
if (res) {
console.log('Test passed.');
} else {
console.log(`Incorrect message returned. Returned: ${result}. Expected: ${toCheck}`);
}
expect(res).toBeTruthy();
}
done();
});
}, 16000);
})