update complex test, many inner calls

This commit is contained in:
DieMyst
2021-05-04 18:49:59 +03:00
parent c99c876e09
commit 873cd537b2
17 changed files with 352 additions and 309 deletions

View File

@ -3,10 +3,23 @@ import "println.aqua"
import "builtin.aqua"
import "func.aqua"
service TestS("some-id"):
t: string -> string
-- just a lot of imports and calls
func doStuff(a: string) -> string:
str <- TestSrv.str()
par Println.print(str)
func doStuff(a: string, b: string, c: bool, d: bool, e: []string, g: []string, str: string) -> []string:
stream: *string
stream <- TestS.t(str)
par Println.print(a)
par on a:
Peer.identify()
<- str
on a:
on b:
if c:
if d:
for eEl <- e:
for gEl <- g:
stream <- TestS.t(gEl)
stream <- TestS.t(eEl)
stream <- TestS.t(eEl)
<- stream

View File

@ -20,24 +20,18 @@ export async function id(client: FluenceClient): Promise<void> {
`
(xor
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("op" "identity") [])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('errorHandlingSrv', 'error', (args) => {

View File

@ -21,26 +21,20 @@ export async function print(client: FluenceClient, str: string): Promise<void> {
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "str") [] str)
)
(call %init_peer_id% ("println-service-id" "print") [str])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'str', () => {return str;});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -70,24 +64,18 @@ export async function id(client: FluenceClient): Promise<void> {
`
(xor
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("op" "identity") [])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -122,46 +110,49 @@ export async function passFunctionAsArg(client: FluenceClient, node: string, str
(seq
(seq
(seq
(seq
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "node") [] node)
)
(call %init_peer_id% ("getDataSrv" "str") [] str)
)
(call relay ("op" "identity") [])
(call -relay- ("op" "identity") [])
)
(xor
(seq
(seq
(seq
(seq
(call node ("peer" "identify") [])
(call -relay- ("op" "identity") [])
)
(call relay ("op" "identity") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "c") [str] init_call_res)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call relay ("op" "identity") [])
)
(call -relay- ("op" "identity") [])
)
(call node ("peer" "identify") [])
)
(call relay ("op" "identity") [])
(seq
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
)
(call -relay- ("op" "identity") [])
)
(call %init_peer_id% ("println-service-id" "print") [init_call_res])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'node', () => {return node;});
h.on('getDataSrv', 'str', () => {return str;});
h.on('callbackSrv', 'c', (args) => {return c(args[0]);});

View File

@ -22,28 +22,28 @@ export async function helloWorld(client: FluenceClient, name: string): Promise<s
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "name") [] name)
)
(call %init_peer_id% ("service-id" "addNameToHello") [name] res)
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'name', () => {return name;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
@ -78,26 +78,20 @@ export async function print(client: FluenceClient, str: string): Promise<void> {
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "str") [] str)
)
(call %init_peer_id% ("println-service-id" "print") [str])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'str', () => {return str;});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -127,24 +121,18 @@ export async function id(client: FluenceClient): Promise<void> {
`
(xor
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("op" "identity") [])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -175,26 +163,26 @@ export async function testFunc(client: FluenceClient): Promise<string> {
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("test-service-id" "str") [] res)
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
@ -219,9 +207,9 @@ export async function testFunc(client: FluenceClient): Promise<string> {
export async function doStuff(client: FluenceClient, a: string): Promise<string> {
export async function doStuff(client: FluenceClient, a: string, b: string, c: boolean, d: boolean, e: string[], g: string[]): Promise<string[]> {
let request;
const promise = new Promise<string>((resolve, reject) => {
const promise = new Promise<string[]>((resolve, reject) => {
request = new RequestFlowBuilder()
.disableInjections()
.withRawScript(
@ -230,44 +218,117 @@ export async function doStuff(client: FluenceClient, a: string): Promise<string>
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(seq
(seq
(seq
(seq
(seq
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "a") [] a)
)
(call %init_peer_id% ("getDataSrv" "b") [] b)
)
(call %init_peer_id% ("getDataSrv" "c") [] c)
)
(call %init_peer_id% ("getDataSrv" "d") [] d)
)
(call %init_peer_id% ("getDataSrv" "e") [] e)
)
(call %init_peer_id% ("getDataSrv" "g") [] g)
)
(par
(par
(call %init_peer_id% ("test-service-id" "str") [] str)
(call %init_peer_id% ("println-service-id" "print") [str])
(call %init_peer_id% ("test-service-id" "str") [] $stream)
(call %init_peer_id% ("println-service-id" "print") [a])
)
(seq
(seq
(seq
(call relay ("op" "identity") [])
(call -relay- ("op" "identity") [])
(xor
(call a ("peer" "identify") [])
(seq
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call relay ("op" "identity") [])
)
)
(call -relay- ("op" "identity") [])
)
(call %init_peer_id% ("op" "identity") [])
)
)
)
(call %init_peer_id% ("callbackSrv" "response") [str])
(call -relay- ("op" "identity") [])
)
(xor
(xor
(match c true
(match d true
(fold e eEl
(seq
(seq
(fold g gEl
(seq
(seq
(call b ("some-id" "t") [gEl] $stream)
(call b ("some-id" "t") [eEl] $stream)
)
(next gEl)
)
)
(call b ("some-id" "t") [eEl] $stream)
)
(next eEl)
)
)
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(seq
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
(call -relay- ("op" "identity") [])
)
)
(seq
(seq
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
(call -relay- ("op" "identity") [])
)
)
)
(call -relay- ("op" "identity") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [$stream])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
)
)
(seq
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 5])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'a', () => {return a;});
h.on('getDataSrv', 'b', () => {return b;});
h.on('getDataSrv', 'c', () => {return c;});
h.on('getDataSrv', 'd', () => {return d;});
h.on('getDataSrv', 'e', () => {return e;});
h.on('getDataSrv', 'g', () => {return g;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
resolve(res);

View File

@ -21,26 +21,20 @@ export async function print(client: FluenceClient, str: string): Promise<void> {
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "str") [] str)
)
(call %init_peer_id% ("println-service-id" "print") [str])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'str', () => {return str;});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -71,37 +65,37 @@ export async function callConstant(client: FluenceClient, cb: (arg0: string) =>
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("test" "getNum") [] n)
)
(xor
(match n 1
(xor
(call %init_peer_id% ("callbackSrv" "cb") ["non-default string"])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(seq
(seq
(call relay ("op" "identity") [])
(call -relay- ("op" "identity") [])
(xor
(call %init_peer_id% ("callbackSrv" "cb") ["non-default string"])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
(call relay ("op" "identity") [])
)
(call -relay- ("op" "identity") [])
)
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('callbackSrv', 'cb', (args) => {cb(args[0]); return {};});
h.onEvent('errorHandlingSrv', 'error', (args) => {

View File

@ -21,26 +21,26 @@ export async function getAliasedData(client: FluenceClient): Promise<string> {
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("somesrv" "get") [] res)
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res.$.peerId!])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;

View File

@ -21,26 +21,20 @@ export async function print(client: FluenceClient, str: string): Promise<void> {
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "str") [] str)
)
(call %init_peer_id% ("println-service-id" "print") [str])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'str', () => {return str;});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -70,24 +64,18 @@ export async function id(client: FluenceClient): Promise<void> {
`
(xor
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("op" "identity") [])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -118,7 +106,7 @@ export async function iterateAndPrint(client: FluenceClient, strings: string[]):
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "strings") [] strings)
)
(fold strings s
@ -128,21 +116,15 @@ export async function iterateAndPrint(client: FluenceClient, strings: string[]):
)
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'strings', () => {return strings;});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -173,7 +155,7 @@ export async function iterateAndPrintParallel(client: FluenceClient, nodes: stri
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "nodes") [] nodes)
)
(fold nodes s
@ -181,16 +163,25 @@ export async function iterateAndPrintParallel(client: FluenceClient, nodes: stri
(seq
(seq
(seq
(call -relay- ("op" "identity") [])
(xor
(seq
(seq
(call relay ("op" "identity") [])
(call s ("peer" "identify") [] ads)
(call -relay- ("op" "identity") [])
)
(call relay ("op" "identity") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "c") [ads])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call relay ("op" "identity") [])
)
(seq
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
)
(call -relay- ("op" "identity") [])
)
(call %init_peer_id% ("op" "identity") [])
)
@ -198,21 +189,15 @@ export async function iterateAndPrintParallel(client: FluenceClient, nodes: stri
)
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'nodes', () => {return nodes;});
h.on('callbackSrv', 'c', (args) => {c(args[0]); return {};});

View File

@ -21,26 +21,26 @@ export async function testFunc(client: FluenceClient): Promise<string> {
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("test-service-id" "str") [] res)
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;

View File

@ -22,28 +22,28 @@ export async function helloWorld(client: FluenceClient, name: string): Promise<s
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "name") [] name)
)
(call %init_peer_id% ("service-id" "addNameToHello") [name] res)
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'name', () => {return name;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;

View File

@ -21,26 +21,20 @@ export async function print(client: FluenceClient, str: string): Promise<void> {
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "str") [] str)
)
(call %init_peer_id% ("println-service-id" "print") [str])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'str', () => {return str;});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -71,7 +65,7 @@ export async function ifElseCall(client: FluenceClient, condition: boolean): Pro
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "condition") [] condition)
)
(xor
@ -81,21 +75,15 @@ export async function ifElseCall(client: FluenceClient, condition: boolean): Pro
(call %init_peer_id% ("println-service-id" "print") ["it is false"])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'condition', () => {return condition;});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -126,7 +114,7 @@ export async function ifElseNumCall(client: FluenceClient, condition: number): P
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "condition") [] condition)
)
(xor
@ -136,21 +124,15 @@ export async function ifElseNumCall(client: FluenceClient, condition: number): P
(call %init_peer_id% ("println-service-id" "print") ["it is not 1"])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'condition', () => {return condition;});
h.onEvent('errorHandlingSrv', 'error', (args) => {

View File

@ -20,24 +20,18 @@ export async function id(client: FluenceClient): Promise<void> {
`
(xor
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("op" "identity") [])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -71,32 +65,41 @@ export async function getPeerExternalAddresses(client: FluenceClient, otherNodeP
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "otherNodePeerId") [] otherNodePeerId)
)
(call relay ("op" "identity") [])
(call -relay- ("op" "identity") [])
)
(xor
(call otherNodePeerId ("peer" "identify") [] res)
(seq
(seq
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call relay ("op" "identity") [])
(call -relay- ("op" "identity") [])
)
)
)
(call -relay- ("op" "identity") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res.$.external_addresses!])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'otherNodePeerId', () => {return otherNodePeerId;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;
@ -137,38 +140,50 @@ export async function getDistantAddresses(client: FluenceClient, target: string,
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "target") [] target)
)
(call %init_peer_id% ("getDataSrv" "viaNode") [] viaNode)
)
(call relay ("op" "identity") [])
(call -relay- ("op" "identity") [])
)
(call viaNode ("op" "identity") [])
)
(xor
(call target ("peer" "identify") [] res)
(seq
(seq
(seq
(call viaNode ("op" "identity") [])
(call -relay- ("op" "identity") [])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call -relay- ("op" "identity") [])
)
)
)
(call viaNode ("op" "identity") [])
)
(call relay ("op" "identity") [])
(call -relay- ("op" "identity") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [res.$.external_addresses!])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'target', () => {return target;});
h.on('getDataSrv', 'viaNode', () => {return viaNode;});
h.onEvent('callbackSrv', 'response', (args) => {

View File

@ -20,24 +20,18 @@ export async function id(client: FluenceClient): Promise<void> {
`
(xor
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("op" "identity") [])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.onEvent('errorHandlingSrv', 'error', (args) => {
@ -68,7 +62,7 @@ export async function parFunc(client: FluenceClient, node: string, c: (arg0: {ex
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "node") [] node)
)
(par
@ -77,16 +71,25 @@ export async function parFunc(client: FluenceClient, node: string, c: (arg0: {ex
(seq
(seq
(seq
(call -relay- ("op" "identity") [])
(xor
(seq
(seq
(call relay ("op" "identity") [])
(call node ("peer" "identify") [] t)
(call -relay- ("op" "identity") [])
)
(call relay ("op" "identity") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "c") [t])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call relay ("op" "identity") [])
)
(seq
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
)
(call -relay- ("op" "identity") [])
)
(call %init_peer_id% ("op" "identity") [])
)
@ -94,21 +97,15 @@ export async function parFunc(client: FluenceClient, node: string, c: (arg0: {ex
(call %init_peer_id% ("parservice-id" "call") [] x)
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'node', () => {return node;});
h.on('callbackSrv', 'c', (args) => {c(args[0]); return {};});

View File

@ -21,26 +21,20 @@ export async function print(client: FluenceClient, str: string): Promise<void> {
(xor
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "str") [] str)
)
(call %init_peer_id% ("println-service-id" "print") [str])
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'str', () => {return str;});
h.onEvent('errorHandlingSrv', 'error', (args) => {

View File

@ -24,7 +24,7 @@ export async function checkStreams(client: FluenceClient, ch: string[]): Promise
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "ch") [] ch)
)
(call %init_peer_id% ("stringer-id" "returnString") ["first"] $stream)
@ -38,23 +38,23 @@ export async function checkStreams(client: FluenceClient, ch: string[]): Promise
)
)
)
(xor
(call %init_peer_id% ("callbackSrv" "response") [$stream])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'ch', () => {return ch;});
h.onEvent('callbackSrv', 'response', (args) => {
const [res] = args;

View File

@ -26,7 +26,7 @@ export async function topologyTest(client: FluenceClient, me: string, myRelay: s
(seq
(seq
(seq
(call %init_peer_id% ("getDataSrv" "relay") [] relay)
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call %init_peer_id% ("getDataSrv" "me") [] me)
)
(call %init_peer_id% ("getDataSrv" "myRelay") [] myRelay)
@ -41,14 +41,23 @@ export async function topologyTest(client: FluenceClient, me: string, myRelay: s
(seq
(seq
(seq
(call relay ("op" "identity") [])
(call -relay- ("op" "identity") [])
(call friendRelay ("op" "identity") [])
)
(xor
(call friend ("testo" "getString") ["friends string via"] str2)
(seq
(seq
(call friendRelay ("op" "identity") [])
(call -relay- ("op" "identity") [])
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
)
(call friendRelay ("op" "identity") [])
)
(call relay ("op" "identity") [])
(call -relay- ("op" "identity") [])
)
(call %init_peer_id% ("op" "identity") [])
)
@ -57,23 +66,23 @@ export async function topologyTest(client: FluenceClient, me: string, myRelay: s
)
(call %init_peer_id% ("lp" "print") [str2])
)
(xor
(call %init_peer_id% ("callbackSrv" "response") ["finish"])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
(seq
(call relay ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
(call -relay- ("op" "identity") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
)
)
`,
)
.configHandler((h) => {
h.on('getDataSrv', 'relay', () => {
h.on('getDataSrv', '-relay-', () => {
return client.relayPeerId!;
});
h.on('getRelayService', 'hasRelay', () => {// Not Used
return client.relayPeerId !== undefined;
});
h.on('getDataSrv', 'me', () => {return me;});
h.on('getDataSrv', 'myRelay', () => {return myRelay;});
h.on('getDataSrv', 'friend', () => {return friend;});

View File

@ -1,6 +1,14 @@
import {FluenceClient} from "@fluencelabs/fluence";
import {FluenceClient, registerServiceFunction} from "@fluencelabs/fluence";
import {doStuff} from "./compiled/complex";
import {testNet} from "@fluencelabs/fluence-network-environment";
export async function complexCall(client: FluenceClient) {
return await doStuff(client, client.relayPeerId!)
registerServiceFunction(client, "some-id", "t", (args: any[], _) => {
return args[0]
})
let peer2 = testNet[0]
return await doStuff(client, client.relayPeerId!, client.selfPeerId, true, true, ["1", "2"], ["3", "4"])
}

View File

@ -98,7 +98,7 @@ const main = async () => {
checkCall("dataAliasCall", dataAliasResult, "peer id str", cb)
checkCall("complexCall", complexCallResult, "some str", cb)
checkCall("complexCall", complexCallResult, ["some str", "3", "1", "4", "1", "1", "3", "2", "4", "2", "2"], cb)
checkCall("constantCall", constantCallResult, "non-default string", cb)