fluencelabs/aqua-playground
1
0
Fork 0
mirror of https://github.com/fluencelabs/aqua-playground synced 2025-03-15 19:40:57 +00:00
Code Issues Projects Releases Wiki Activity

fix aqua run integration tests, update deps

Browse Source
This commit is contained in:
DieMyst 2022-02-10 11:51:41 +03:00
parent c90575afae
commit 321d311c07
3 changed files with 82 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
package-lock.json generated
View File

@ -10,8 +10,8 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fluencelabs/aqua-dht-ts": "0.1.38", "@fluencelabs/aqua-dht-ts": "0.1.38",
"@fluencelabs/avm": "0.20.2", "@fluencelabs/avm": "0.20.3",
"@fluencelabs/fluence": "0.19.0", "@fluencelabs/fluence": "0.19.1",
"@fluencelabs/fluence-network-environment": "1.0.13", "@fluencelabs/fluence-network-environment": "1.0.13",
"deep-equal": "^2.0.5" "deep-equal": "^2.0.5"
}, },
@ -19,9 +19,9 @@
"fldist": "dist/index.js" "fldist": "dist/index.js"
}, },
"devDependencies": { "devDependencies": {
"@fluencelabs/aqua": "0.6.0-272", "@fluencelabs/aqua": "0.6.0-274",
"@fluencelabs/aqua-dht": "0.2.4", "@fluencelabs/aqua-dht": "0.2.5",
"@fluencelabs/aqua-lib": "0.3.2", "@fluencelabs/aqua-lib": "0.4.0",
"@types/jest": "^27.0.2", "@types/jest": "^27.0.2",
"jest": "^27.2.4", "jest": "^27.2.4",
"ts-jest": "^27.0.5", "ts-jest": "^27.0.5",
@ -697,15 +697,15 @@
"integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==" "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="
}, },
"node_modules/@fluencelabs/aqua": { "node_modules/@fluencelabs/aqua": {
"version": "0.6.0-272", "version": "0.6.0-274",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.0-272.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.0-274.tgz",
"integrity": "sha512-4BogO/mYzrLceTLb3GlSRtCxzl+aD5dU/Ky5XjhD5eFAFf23NhW5L2aDou1DN8cVEdzKIz7Y5Nmmul6Lc2LMIA==", "integrity": "sha512-c/ufNzUHaznq3nYtUewA422//OHOAvO224wBr/fL54t5t4gt8pTf58mE4/e1sd6YQjv6Umnt7XPjwiVgFzGarA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@fluencelabs/aqua-ipfs": "0.5.2", "@fluencelabs/aqua-ipfs": "0.5.2",
"@fluencelabs/aqua-lib": "0.3.2", "@fluencelabs/aqua-lib": "0.3.2",
"@fluencelabs/avm": "0.20.2", "@fluencelabs/avm": "0.20.3",
"@fluencelabs/fluence": "0.19.0", "@fluencelabs/fluence": "0.19.1",
"ipfs-http-client": "50.1.2" "ipfs-http-client": "50.1.2"
}, },
"bin": { "bin": {
@ -714,9 +714,9 @@
} }
}, },
"node_modules/@fluencelabs/aqua-dht": { "node_modules/@fluencelabs/aqua-dht": {
"version": "0.2.4", "version": "0.2.5",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-dht/-/aqua-dht-0.2.4.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-dht/-/aqua-dht-0.2.5.tgz",
"integrity": "sha512-tTBjtgSO6VuEExPAJGLrRt65+DQuaopjuXJmD/GSqQcOPXJB8szA+qrsyjV/7qRpBgRFIjQaX8GGfKkF++peCQ==", "integrity": "sha512-8jWUCeAftRtafqD6MgC7vkCnLOD6pwJspGHykPbXpg2pKbwANAAzAb/w8XbIScBzbIonZ5N7FfSVlTet383A3w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@fluencelabs/aqua-lib": "^0.1.14" "@fluencelabs/aqua-lib": "^0.1.14"
@ -783,15 +783,21 @@
"dev": true "dev": true
}, },
"node_modules/@fluencelabs/aqua-lib": { "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/aqua-lib": {
"version": "0.3.2", "version": "0.3.2",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz",
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==", "integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==",
"dev": true "dev": true
}, },
"node_modules/@fluencelabs/avm": { "node_modules/@fluencelabs/avm": {
"version": "0.20.2", "version": "0.20.3",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.3.tgz",
"integrity": "sha512-u438Gpw6KoEugXlMch0hOupRqGGeQIcjxDi3QAavbUb1csG2eKkk/iYD1ka9Qbc1hLnrCFXpD2tw/LwNEX3Aew==", "integrity": "sha512-tkUccevqVDhffKAPxaMocv/Uk99ywebPWp1rp53KkR+jb20qvDYJyOI7xCfHRAWa/gNVuOf/luEIwlu9D7cCGA==",
"bin": { "bin": {
"copy-avm": "dist/copyAvm.js" "copy-avm": "dist/copyAvm.js"
} }
@ -815,9 +821,9 @@
"integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ==" "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ=="
}, },
"node_modules/@fluencelabs/fluence": { "node_modules/@fluencelabs/fluence": {
"version": "0.19.0", "version": "0.19.1",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.19.0.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.19.1.tgz",
"integrity": "sha512-LZ8Ze6w+rSEDm8mXEqaDwYOUcPEkdGum+5VH8t4UIHT/1sgBZ/AeINrMoS4q/7r8sZORu0WwbdxvyrNFV9bBPw==", "integrity": "sha512-8htyVZRMuo8KewppF7vbw5Dx7GMZSCTgePVzPdcm+bxh/W03pwfWMd5FBgiMPKaRrsT0nBYMLNoC1GKMNYjCmw==",
"dependencies": { "dependencies": {
"@chainsafe/libp2p-noise": "^4.1.1", "@chainsafe/libp2p-noise": "^4.1.1",
"@fluencelabs/avm": "0.20.0", "@fluencelabs/avm": "0.20.0",
@ -9462,22 +9468,30 @@
} }
}, },
"@fluencelabs/aqua": { "@fluencelabs/aqua": {
"version": "0.6.0-272", "version": "0.6.0-274",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.0-272.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.0-274.tgz",
"integrity": "sha512-4BogO/mYzrLceTLb3GlSRtCxzl+aD5dU/Ky5XjhD5eFAFf23NhW5L2aDou1DN8cVEdzKIz7Y5Nmmul6Lc2LMIA==", "integrity": "sha512-c/ufNzUHaznq3nYtUewA422//OHOAvO224wBr/fL54t5t4gt8pTf58mE4/e1sd6YQjv6Umnt7XPjwiVgFzGarA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@fluencelabs/aqua-ipfs": "0.5.2", "@fluencelabs/aqua-ipfs": "0.5.2",
"@fluencelabs/aqua-lib": "0.3.2", "@fluencelabs/aqua-lib": "0.3.2",
"@fluencelabs/avm": "0.20.2", "@fluencelabs/avm": "0.20.3",
"@fluencelabs/fluence": "0.19.0", "@fluencelabs/fluence": "0.19.1",
"ipfs-http-client": "50.1.2" "ipfs-http-client": "50.1.2"
},
"dependencies": {
"@fluencelabs/aqua-lib": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz",
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==",
"dev": true
}
} }
}, },
"@fluencelabs/aqua-dht": { "@fluencelabs/aqua-dht": {
"version": "0.2.4", "version": "0.2.5",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-dht/-/aqua-dht-0.2.4.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-dht/-/aqua-dht-0.2.5.tgz",
"integrity": "sha512-tTBjtgSO6VuEExPAJGLrRt65+DQuaopjuXJmD/GSqQcOPXJB8szA+qrsyjV/7qRpBgRFIjQaX8GGfKkF++peCQ==", "integrity": "sha512-8jWUCeAftRtafqD6MgC7vkCnLOD6pwJspGHykPbXpg2pKbwANAAzAb/w8XbIScBzbIonZ5N7FfSVlTet383A3w==",
"dev": true, "dev": true,
"requires": { "requires": {
"@fluencelabs/aqua-lib": "^0.1.14" "@fluencelabs/aqua-lib": "^0.1.14"
@ -9550,15 +9564,15 @@
} }
}, },
"@fluencelabs/aqua-lib": { "@fluencelabs/aqua-lib": {
"version": "0.3.2", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.4.0.tgz",
"integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==", "integrity": "sha512-bad282cCZrE//I+Hzsl/vWgudwXuNiaqJOonv11xkgOBBvL7Gg3SIap8HioNvkaDxIvylVB+POjYJ7E5sGNoVQ==",
"dev": true "dev": true
}, },
"@fluencelabs/avm": { "@fluencelabs/avm": {
"version": "0.20.2", "version": "0.20.3",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.2.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.3.tgz",
"integrity": "sha512-u438Gpw6KoEugXlMch0hOupRqGGeQIcjxDi3QAavbUb1csG2eKkk/iYD1ka9Qbc1hLnrCFXpD2tw/LwNEX3Aew==" "integrity": "sha512-tkUccevqVDhffKAPxaMocv/Uk99ywebPWp1rp53KkR+jb20qvDYJyOI7xCfHRAWa/gNVuOf/luEIwlu9D7cCGA=="
}, },
"@fluencelabs/avm-runner-background": { "@fluencelabs/avm-runner-background": {
"version": "0.1.2", "version": "0.1.2",
@ -9576,9 +9590,9 @@
"integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ==" "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ=="
}, },
"@fluencelabs/fluence": { "@fluencelabs/fluence": {
"version": "0.19.0", "version": "0.19.1",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.19.0.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.19.1.tgz",
"integrity": "sha512-LZ8Ze6w+rSEDm8mXEqaDwYOUcPEkdGum+5VH8t4UIHT/1sgBZ/AeINrMoS4q/7r8sZORu0WwbdxvyrNFV9bBPw==", "integrity": "sha512-8htyVZRMuo8KewppF7vbw5Dx7GMZSCTgePVzPdcm+bxh/W03pwfWMd5FBgiMPKaRrsT0nBYMLNoC1GKMNYjCmw==",
"requires": { "requires": {
"@chainsafe/libp2p-noise": "^4.1.1", "@chainsafe/libp2p-noise": "^4.1.1",
"@fluencelabs/avm": "0.20.0", "@fluencelabs/avm": "0.20.0",

10
package.json
View File

@ -29,9 +29,9 @@
"do": "aqua dist deploy --addr /dns4/kras-04.fluence.dev/tcp/19001/wss/p2p/12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi --data-path deploy.json --service tsOracle" "do": "aqua dist deploy --addr /dns4/kras-04.fluence.dev/tcp/19001/wss/p2p/12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi --data-path deploy.json --service tsOracle"
}, },
"devDependencies": { "devDependencies": {
"@fluencelabs/aqua": "0.6.0-272", "@fluencelabs/aqua": "0.6.0-274",
"@fluencelabs/aqua-dht": "0.2.4", "@fluencelabs/aqua-dht": "0.2.5",
"@fluencelabs/aqua-lib": "0.3.2", "@fluencelabs/aqua-lib": "0.4.0",
"@types/jest": "^27.0.2", "@types/jest": "^27.0.2",
"jest": "^27.2.4", "jest": "^27.2.4",
"ts-jest": "^27.0.5", "ts-jest": "^27.0.5",
@ -40,8 +40,8 @@
}, },
"dependencies": { "dependencies": {
"@fluencelabs/aqua-dht-ts": "0.1.38", "@fluencelabs/aqua-dht-ts": "0.1.38",
"@fluencelabs/avm": "0.20.2", "@fluencelabs/avm": "0.20.3",
"@fluencelabs/fluence": "0.19.0", "@fluencelabs/fluence": "0.19.1",
"@fluencelabs/fluence-network-environment": "1.0.13", "@fluencelabs/fluence-network-environment": "1.0.13",
"deep-equal": "^2.0.5" "deep-equal": "^2.0.5"
}, },

41
src/__test__/run.spec.ts
View File

@ -15,8 +15,6 @@ describe('Testing run command', () => {
const listBlueprintsCall = `npm run aqua listBlueprints -- --addr ${addr}` const listBlueprintsCall = `npm run aqua listBlueprints -- --addr ${addr}`
const listModulesCall = `npm run aqua listModules -- --addr ${addr}` const listModulesCall = `npm run aqua listModules -- --addr ${addr}`
const listInterfacesCall = `npm run aqua listInterfaces -- --addr ${addr}` const listInterfacesCall = `npm run aqua listInterfaces -- --addr ${addr}`
const getInterfaceCall = `npm run aqua getInterface -- --addr ${addr}`
const getModuleInterfaceCall = `npm run aqua getModuleInterface -- --addr ${addr}`
it('run simple command', (done) => { it('run simple command', (done) => {
exec(call, (error, stdout, stderr) => { exec(call, (error, stdout, stderr) => {
@ -42,49 +40,64 @@ describe('Testing run command', () => {
}); });
}, 16000); }, 16000);
it.skip('run listBlueprints', (done) => { it('run listBlueprints', (done) => {
exec(listBlueprintsCall, (error, stdout, stderr) => { exec(listBlueprintsCall, (error, stdout, stderr) => {
if (error) { if (error) {
console.error(`error: ${error.message}`); console.error(`error: ${error.message}`);
} else if (stderr) { } else if (stderr) {
console.error(`stderr: ${stderr}`); console.error(`stderr: ${stderr}`);
} else { } else {
let arr = stdout.split("\n").slice(2) try {
const result = JSON.parse(arr.join("")); let arr = stdout.split("\n").slice(5)
console.log(arr)
const result = JSON.parse(arr.join(""));
expect(Array.isArray(result)).toBeTruthy(); expect(Array.isArray(result)).toBeTruthy();
} catch (e) {
console.error(e)
}
} }
done(); done();
}); });
}, 16000); }, 16000);
it.skip('run listModules', (done) => { it('run listModules', (done) => {
exec(listModulesCall, (error, stdout, stderr) => { exec(listModulesCall, (error, stdout, stderr) => {
if (error) { if (error) {
console.error(`error: ${error.message}`); console.error(`error: ${error.message}`);
} else if (stderr) { } else if (stderr) {
console.error(`stderr: ${stderr}`); console.error(`stderr: ${stderr}`);
} else { } else {
let arr = stdout.split("\n").slice(2) try {
const result = JSON.parse(arr.join("")); let arr = stdout.split("\n").slice(5)
console.log(arr)
const result = JSON.parse(arr.join(""));
expect(Array.isArray(result)).toBeTruthy(); expect(Array.isArray(result)).toBeTruthy();
} catch (e) {
console.error(e)
}
} }
done(); done();
}); });
}, 16000); }, 16000);
it.skip('run listInterfaces', (done) => { it('run listInterfaces', (done) => {
exec(listInterfacesCall, (error, stdout, stderr) => { exec(listInterfacesCall, (error, stdout, stderr) => {
if (error) { if (error) {
console.error(`error: ${error.message}`); console.error(`error: ${error.message}`);
} else if (stderr) { } else if (stderr) {
console.error(`stderr: ${stderr}`); console.error(`stderr: ${stderr}`);
} else { } else {
let arr = stdout.split("\n").slice(2) try {
const result = JSON.parse(arr.join("")); let arr = stdout.split("\n").slice(5)
console.log(arr)
const result = JSON.parse(arr.join(""));
expect(Array.isArray(result)).toBeTruthy(); expect(Array.isArray(result)).toBeTruthy();
} catch (e) {
console.error(e)
}
} }
done(); done();
}); });