fluencelabs/aqua-playground
1
0
Fork 0
mirror of https://github.com/fluencelabs/aqua-playground synced 2025-04-25 12:22:36 +00:00
Code Issues Projects Releases Wiki Activity

update avm

Browse Source
This commit is contained in:
DieMyst 2022-01-26 20:32:57 +03:00
parent 3b1c72fc24
commit c5c78e0caf
4 changed files with 34 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
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/avm": "0.20.0", "@fluencelabs/avm": "0.20.2",
"@fluencelabs/fluence": "0.18.0", "@fluencelabs/fluence": "0.18.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"
@ -780,9 +780,9 @@
"dev": true "dev": true
}, },
"node_modules/@fluencelabs/avm": { "node_modules/@fluencelabs/avm": {
"version": "0.20.0", "version": "0.20.2",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.2.tgz",
"integrity": "sha512-dDtXh9iJ4U/lZhdS36Dsef55fzeCYGSYVBey1mi+OHzyDtQoxxAkac9HeMlgWWQoZzy9i43JmX0t0iX7tBt+4A==", "integrity": "sha512-u438Gpw6KoEugXlMch0hOupRqGGeQIcjxDi3QAavbUb1csG2eKkk/iYD1ka9Qbc1hLnrCFXpD2tw/LwNEX3Aew==",
"bin": { "bin": {
"copy-avm": "dist/copyAvm.js" "copy-avm": "dist/copyAvm.js"
} }
@ -839,6 +839,14 @@
"resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.13.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.13.tgz",
"integrity": "sha512-2pci3T0sUHE08jwEs1r/vHKVT4XUh/A3j/QJ0eIhddsxyIjEksjdn05X7DF6STD14CF8GgBVOJEPgav8qaUMpA==" "integrity": "sha512-2pci3T0sUHE08jwEs1r/vHKVT4XUh/A3j/QJ0eIhddsxyIjEksjdn05X7DF6STD14CF8GgBVOJEPgav8qaUMpA=="
}, },
"node_modules/@fluencelabs/fluence/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==",
"bin": {
"copy-avm": "dist/copyAvm.js"
}
},
"node_modules/@istanbuljs/load-nyc-config": { "node_modules/@istanbuljs/load-nyc-config": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@ -9161,9 +9169,9 @@
"dev": true "dev": true
}, },
"@fluencelabs/avm": { "@fluencelabs/avm": {
"version": "0.20.0", "version": "0.20.2",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0.tgz", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.2.tgz",
"integrity": "sha512-dDtXh9iJ4U/lZhdS36Dsef55fzeCYGSYVBey1mi+OHzyDtQoxxAkac9HeMlgWWQoZzy9i43JmX0t0iX7tBt+4A==" "integrity": "sha512-u438Gpw6KoEugXlMch0hOupRqGGeQIcjxDi3QAavbUb1csG2eKkk/iYD1ka9Qbc1hLnrCFXpD2tw/LwNEX3Aew=="
}, },
"@fluencelabs/avm-runner-background": { "@fluencelabs/avm-runner-background": {
"version": "0.1.2", "version": "0.1.2",
@ -9204,6 +9212,13 @@
"rxjs": "^7.3.0", "rxjs": "^7.3.0",
"ts-pattern": "^3.3.3", "ts-pattern": "^3.3.3",
"uuid": "8.3.0" "uuid": "8.3.0"
},
"dependencies": {
"@fluencelabs/avm": {
"version": "0.20.0",
"resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0.tgz",
"integrity": "sha512-dDtXh9iJ4U/lZhdS36Dsef55fzeCYGSYVBey1mi+OHzyDtQoxxAkac9HeMlgWWQoZzy9i43JmX0t0iX7tBt+4A=="
}
} }
}, },
"@fluencelabs/fluence-network-environment": { "@fluencelabs/fluence-network-environment": {

2
package.json
View File

@ -40,7 +40,7 @@
"dependencies": { "dependencies": {
"@fluencelabs/aqua-dht-ts": "0.1.38", "@fluencelabs/aqua-dht-ts": "0.1.38",
"@fluencelabs/fluence": "0.18.0", "@fluencelabs/fluence": "0.18.0",
"@fluencelabs/avm": "0.20.0", "@fluencelabs/avm": "0.20.2",
"@fluencelabs/fluence-network-environment": "1.0.13", "@fluencelabs/fluence-network-environment": "1.0.13",
"deep-equal": "^2.0.5" "deep-equal": "^2.0.5"
}, },

4
src/__test__/examples.spec.ts
View File

@ -1,4 +1,4 @@
import { Fluence, FluencePeer } from '@fluencelabs/fluence'; import {Fluence, FluencePeer, setLogLevel} from '@fluencelabs/fluence';
import { registerPrintln } from '../compiled/examples/println'; import { registerPrintln } from '../compiled/examples/println';
import { callArrowCall } from '../examples/callArrowCall'; import { callArrowCall } from '../examples/callArrowCall';
import { dataAliasCall } from '../examples/dataAliasCall'; import { dataAliasCall } from '../examples/dataAliasCall';
@ -41,7 +41,7 @@ var peer2: FluencePeer;
const relays = config.relays const relays = config.relays
// setLogLevel('trace'); // setLogLevel('debug');
describe('Testing examples', () => { describe('Testing examples', () => {
beforeAll(async () => { beforeAll(async () => {

52
src/compiled/examples/foldJoin.ts
View File

@ -16,51 +16,17 @@ import {
// Services // Services
export interface Op2Def {
identity: (s: number, callParams: CallParams<'s'>) => void | Promise<void>;
}
export function registerOp2(service: Op2Def): void;
export function registerOp2(serviceId: string, service: Op2Def): void;
export function registerOp2(peer: FluencePeer, service: Op2Def): void;
export function registerOp2(peer: FluencePeer, serviceId: string, service: Op2Def): void;
export function registerOp2(...args: any) {
registerService(
args,
{
"defaultServiceId" : "op",
"functions" : [
{
"functionName" : "identity",
"argDefs" : [
{
"name" : "s",
"argType" : {
"tag" : "primitive"
}
}
],
"returnType" : {
"tag" : "void"
}
}
]
}
);
}
// Functions // Functions
export function getTwoResults( export function getTwoResults(
relay: string, node: string,
config?: {ttl?: number} config?: {ttl?: number}
): Promise<number[]>; ): Promise<number[]>;
export function getTwoResults( export function getTwoResults(
peer: FluencePeer, peer: FluencePeer,
relay: string, node: string,
config?: {ttl?: number} config?: {ttl?: number}
): Promise<number[]>; ): Promise<number[]>;
@ -72,7 +38,7 @@ export function getTwoResults(...args: any) {
(seq (seq
(seq (seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-) (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "relay") [] relay) (call %init_peer_id% ("getDataSrv" "node") [] node)
) )
(new $res (new $res
(seq (seq
@ -84,7 +50,7 @@ export function getTwoResults(...args: any) {
(seq (seq
(seq (seq
(seq (seq
(call relay ("kad" "neighborhood") [%init_peer_id% [] []] nodes) (call node ("kad" "neighborhood") [%init_peer_id% [] []] nodes)
(par (par
(fold nodes n (fold nodes n
(par (par
@ -93,7 +59,7 @@ export function getTwoResults(...args: any) {
(call n ("peer" "timestamp_sec") [] $res) (call n ("peer" "timestamp_sec") [] $res)
(null) (null)
) )
(call relay ("op" "noop") []) (call node ("op" "noop") [])
) )
(next n) (next n)
) )
@ -101,11 +67,11 @@ export function getTwoResults(...args: any) {
(null) (null)
) )
) )
(call relay ("op" "identity") [$res.$.[0]!]) (call node ("op" "identity") [$res.$.[0]!])
) )
(call relay ("op" "identity") [$res.$.[1]!]) (call node ("op" "identity") [$res.$.[1]!])
) )
(call relay ("op" "identity") [$res.$.[2]!]) (call node ("op" "identity") [$res.$.[2]!])
) )
(call -relay- ("op" "noop") []) (call -relay- ("op" "noop") [])
) )
@ -136,7 +102,7 @@ export function getTwoResults(...args: any) {
}, },
"argDefs" : [ "argDefs" : [
{ {
"name" : "relay", "name" : "node",
"argType" : { "argType" : {
"tag" : "primitive" "tag" : "primitive"
} }