update tests

This commit is contained in:
DieMyst 2022-03-14 12:14:06 +03:00
parent 44eb526e06
commit a70036277a
4 changed files with 22 additions and 21 deletions

View File

@ -2,7 +2,7 @@ module Closure declares *
import "@fluencelabs/aqua-lib/builtin.aqua" import "@fluencelabs/aqua-lib/builtin.aqua"
export LocalSrv, closureIn, closureOut, closureBig export LocalSrv, closureIn, closureOut, closureBig, closureOut2
service MyOp("op"): service MyOp("op"):
identity(s: string) -> string identity(s: string) -> string
@ -32,15 +32,15 @@ func closureOut(peer2: string) -> Info:
p2Id <- closure("on") p2Id <- closure("on")
<- p2Id <- p2Id
-- func closureOut2(peer2: string) -> Info: func closureOut2(peer2: string) -> Info:
-- closure = func (s: string) -> Info: closure = func (s: string) -> Info:
-- if s == "in": if s == "in":
-- LocalSrv.inside() LocalSrv.inside()
-- p2Id <- Peer.identify() p2Id <- Peer.identify()
-- <- p2Id <- p2Id
-- on peer2: on peer2:
-- p2Id <- closure("on") p2Id <- closure("on")
-- <- p2Id <- p2Id
func closureBig(peer1: string, peer2: string) -> string, string: func closureBig(peer1: string, peer2: string) -> string, string:

14
package-lock.json generated
View File

@ -10,7 +10,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fluencelabs/aqua-dht-ts": "0.1.38", "@fluencelabs/aqua-dht-ts": "0.1.38",
"@fluencelabs/fluence": "0.21.1", "@fluencelabs/fluence": "0.0.1-fix-recursive-632.0",
"@fluencelabs/fluence-network-environment": "1.0.13", "@fluencelabs/fluence-network-environment": "1.0.13",
"deep-equal": "^2.0.5" "deep-equal": "^2.0.5"
}, },
@ -1225,9 +1225,9 @@
"integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ==" "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ=="
}, },
"node_modules/@fluencelabs/fluence": { "node_modules/@fluencelabs/fluence": {
"version": "0.21.1", "version": "0.0.1-fix-recursive-632.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.21.1.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.0.1-fix-recursive-632.0.tgz",
"integrity": "sha512-gBphyaAaSFo8W8DXsDTg0PBDYIq7+rgPMCEjLC2R8OSV4YF8sCdPZc/laqm9rDeeSP6++MJq4dQ5dj3aE5Kqbw==", "integrity": "sha512-y1PgST/PCh1DxZ5lMcw/euaDOkwa0+HM8LUbfte29bjPvTopHD6zzWN87Znwv3d65WDSFqKpINrTPBIemyKaoQ==",
"dependencies": { "dependencies": {
"@chainsafe/libp2p-noise": "^4.1.1", "@chainsafe/libp2p-noise": "^4.1.1",
"@fluencelabs/avm": "^0.21.3", "@fluencelabs/avm": "^0.21.3",
@ -10371,9 +10371,9 @@
"integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ==" "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ=="
}, },
"@fluencelabs/fluence": { "@fluencelabs/fluence": {
"version": "0.21.1", "version": "0.0.1-fix-recursive-632.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.21.1.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.0.1-fix-recursive-632.0.tgz",
"integrity": "sha512-gBphyaAaSFo8W8DXsDTg0PBDYIq7+rgPMCEjLC2R8OSV4YF8sCdPZc/laqm9rDeeSP6++MJq4dQ5dj3aE5Kqbw==", "integrity": "sha512-y1PgST/PCh1DxZ5lMcw/euaDOkwa0+HM8LUbfte29bjPvTopHD6zzWN87Znwv3d65WDSFqKpINrTPBIemyKaoQ==",
"requires": { "requires": {
"@chainsafe/libp2p-noise": "^4.1.1", "@chainsafe/libp2p-noise": "^4.1.1",
"@fluencelabs/avm": "^0.21.3", "@fluencelabs/avm": "^0.21.3",

View File

@ -255,7 +255,7 @@ describe('Testing examples', () => {
let closuresResult = await closuresCall(); let closuresResult = await closuresCall();
let res1 = config.externalAddressesRelay2 let res1 = config.externalAddressesRelay2
let res2 = ["in", config.externalAddressesRelay2[0]] let res2 = ["in", config.externalAddressesRelay2[0]]
expect(closuresResult).toEqual(["in", res1, res2]); expect(closuresResult).toEqual(["in", res1, res1, res2]);
}); });
it('assignment.aqua', async () => { it('assignment.aqua', async () => {

View File

@ -1,10 +1,10 @@
import { Fluence } from '@fluencelabs/fluence'; import { Fluence } from '@fluencelabs/fluence';
import { closureIn, closureOut, closureBig, registerLocalSrv } from '../compiled/examples/closures'; import {closureIn, closureOut, closureBig, registerLocalSrv, closureOut2} from '../compiled/examples/closures';
import { config } from '../config' import { config } from '../config'
const relays = config.relays const relays = config.relays
export async function closuresCall(): Promise<[string, string[], [string, string]]> { export async function closuresCall(): Promise<[string, string[], string[], [string, string]]> {
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId; const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
const selfPeerId = Fluence.getPeer().getStatus().peerId; const selfPeerId = Fluence.getPeer().getStatus().peerId;
@ -12,7 +12,8 @@ export async function closuresCall(): Promise<[string, string[], [string, string
const resIn = await closureIn(relays[4].peerId, {ttl: 15000}) const resIn = await closureIn(relays[4].peerId, {ttl: 15000})
const resOut = await closureOut(relays[5].peerId, {ttl: 15000}) const resOut = await closureOut(relays[5].peerId, {ttl: 15000})
const resOut2 = await closureOut2(relays[5].peerId, {ttl: 15000})
const resBig = await closureBig(relays[4].peerId, relays[5].peerId, {ttl: 15000}) const resBig = await closureBig(relays[4].peerId, relays[5].peerId, {ttl: 15000})
return [resIn, resOut.external_addresses, resBig] return [resIn, resOut.external_addresses, resOut2.external_addresses, resBig]
} }