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

@ -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)
)
(call %init_peer_id% ("callbackSrv" "response") [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)
)
(call %init_peer_id% ("callbackSrv" "response") [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)
(call %init_peer_id% ("getDataSrv" "a") [] a)
)
(par
(par
(call %init_peer_id% ("test-service-id" "str") [] str)
(call %init_peer_id% ("println-service-id" "print") [str])
)
(seq
(seq
(seq
(call relay ("op" "identity") [])
(call a ("peer" "identify") [])
(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") [] $stream)
(call %init_peer_id% ("println-service-id" "print") [a])
)
(seq
(seq
(seq
(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 %init_peer_id% ("op" "identity") [])
)
)
(call relay ("op" "identity") [])
)
(call %init_peer_id% ("op" "identity") [])
(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
(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])
)
(call %init_peer_id% ("callbackSrv" "response") [str])
)
(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% 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);