refactoring test, update client and aqua, use krasnodar

This commit is contained in:
DieMyst 2022-02-23 09:56:04 +03:00
parent 321d311c07
commit 48c10bcc6c
53 changed files with 1042 additions and 199 deletions

View File

@ -1,8 +1,5 @@
import "@fluencelabs/aqua-lib/builtin.aqua"
service CustomId("cid"):
id(s: string) -> string
func viaArr(node_id: string, viaAr: []string) -> Info:
on node_id via viaAr:
p <- Peer.identify()

976
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -14,7 +14,7 @@ import { returnNilCall, returnNoneCall, streamCall } from '../examples/streamCal
import {topologyBug205Call, topologyBug394Call, topologyBug427Call, topologyCall} from '../examples/topologyCall';
import { foldJoinCall } from '../examples/foldJoinCall';
import { registerHandlers, returnNull, returnOptionalCall, useOptionalCall } from '../examples/useOptionalCall';
import { viaCall } from '../examples/viaCall';
import {viaArrCall, viaOptCall, viaOptNullCall, viaStreamCall} from '../examples/viaCall';
import { nestedFuncsCall } from '../examples/nestedFuncsCall';
import { assignmentCall } from '../examples/assignment';
import { tryCatchCall } from '../examples/tryCatchCall';
@ -206,7 +206,10 @@ describe('Testing examples', () => {
});
it('via.aqua', async () => {
let [res1, res2, res3, res4] = await viaCall();
let res1 = await viaArrCall();
let res2 = await viaOptCall();
let res3 = await viaOptNullCall();
let res4 = await viaStreamCall();
expect(res1).toEqual(res2);
expect(res2).toEqual(res3);
expect(res3).toEqual(res4);

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -58,17 +58,17 @@ export function put_value(...args: any) {
(xor
(seq
(seq
(seq
(call n ("peer" "timestamp_sec") [] t)
(call n ("aqua-dht" "register_key") [initial_peer t false 0])
)
(call n ("aqua-dht" "put_value") [initial_peer value t [] [] 0])
(call n ("peer" "timestamp_sec") [] t)
(call n ("aqua-dht" "register_key") [initial_peer t false 0])
)
(call -relay- ("op" "noop") [])
(call n ("aqua-dht" "put_value") [initial_peer value t [] [] 0])
)
(null)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
(next n)
)

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-SNAPSHOT
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -137,7 +137,7 @@ export function closureIn(...args: any) {
}
export type ClosureOutResult = { external_addresses: string[]; }
export type ClosureOutResult = { air_version: string; external_addresses: string[]; node_version: string; }
export function closureOut(
peer2: string,
config?: {ttl?: number}

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -49,14 +49,14 @@ export function registerCoService(...args: any) {
export function coFunc(
node: string,
c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
config?: {ttl?: number}
): Promise<void>;
export function coFunc(
peer: FluencePeer,
node: string,
c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
config?: {ttl?: number}
): Promise<void>;

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -17,7 +17,7 @@ import {
// Services
export interface ReturnDef {
run: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>;
run: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise<void>;
}
export function registerReturn(service: ReturnDef): void;
export function registerReturn(serviceId: string, service: ReturnDef): void;

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -82,14 +82,14 @@ export function iterateAndPrint(...args: any) {
export function iterateAndPrintParallel(
nodes: string[],
c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
config?: {ttl?: number}
): Promise<void>;
export function iterateAndPrintParallel(
peer: FluencePeer,
nodes: string[],
c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
config?: {ttl?: number}
): Promise<void>;
@ -114,11 +114,20 @@ export function iterateAndPrintParallel(...args: any) {
(call -relay- ("op" "noop") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "c") [ads])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
(seq
(call %init_peer_id% ("callbackSrv" "c") [ads])
(call -relay- ("op" "noop") [])
)
(seq
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
(call -relay- ("op" "noop") [])
)
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
)
(next s)

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -55,18 +55,15 @@ export function getTwoResults(...args: any) {
(fold nodes n
(par
(seq
(seq
(xor
(xor
(xor
(call n ("peer" "timestamp_sec") [] $res)
(null)
)
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call n ("peer" "timestamp_sec") [] $res)
(null)
)
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
(call -relay- ("op" "noop") [])
)
(call node ("op" "noop") [])
)

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -204,14 +204,14 @@ export function joinIdx(
idx: number,
nodes: string[],
config?: {ttl?: number}
): Promise<{ external_addresses: string[]; }[]>;
): Promise<{ air_version: string; external_addresses: string[]; node_version: string; }[]>;
export function joinIdx(
peer: FluencePeer,
idx: number,
nodes: string[],
config?: {ttl?: number}
): Promise<{ external_addresses: string[]; }[]>;
): Promise<{ air_version: string; external_addresses: string[]; node_version: string; }[]>;
export function joinIdx(...args: any) {
@ -235,17 +235,20 @@ export function joinIdx(...args: any) {
(par
(seq
(seq
(call -relay- ("op" "noop") [])
(xor
(seq
(call node ("peer" "identify") [] $infos)
(ap node $nodes2)
)
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
(seq
(call -relay- ("op" "noop") [])
(xor
(seq
(call node ("peer" "identify") [] $infos)
(ap node $nodes2)
)
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
)
(call -relay- ("op" "noop") [])
)
(call %init_peer_id% ("op" "noop") [])
)

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -49,14 +49,14 @@ export function registerParService(...args: any) {
export function parFunc(
node: string,
c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
config?: {ttl?: number}
): Promise<void>;
export function parFunc(
peer: FluencePeer,
node: string,
c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
config?: {ttl?: number}
): Promise<void>;
@ -81,11 +81,20 @@ export function parFunc(...args: any) {
(call -relay- ("op" "noop") [])
)
(xor
(call %init_peer_id% ("callbackSrv" "c") [t])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
(seq
(call %init_peer_id% ("callbackSrv" "c") [t])
(call -relay- ("op" "noop") [])
)
(seq
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
(call -relay- ("op" "noop") [])
)
)
)
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
)
)
)
)

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-SNAPSHOT
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -190,14 +190,17 @@ export function topologyBug427(...args: any) {
(par
(seq
(seq
(call -relay- ("op" "noop") [])
(xor
(call peer ("op" "identity") ["some string"] $results)
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
(seq
(call -relay- ("op" "noop") [])
(xor
(call peer ("op" "identity") ["some string"] $results)
(seq
(call -relay- ("op" "noop") [])
(call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
)
)
)
(call -relay- ("op" "noop") [])
)
(call %init_peer_id% ("op" "noop") [])
)

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';

View File

@ -3,7 +3,7 @@
* This file is auto-generated. Do not edit manually: changes may be erased.
* Generated by Aqua compiler: https://github.com/fluencelabs/aqua/.
* If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
* Aqua version: 0.6.0-263
* Aqua version: 0.6.1-279
*
*/
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
@ -52,7 +52,7 @@ export function registerCustomId(...args: any) {
// Functions
export type ViaArrResult = { external_addresses: string[]; }
export type ViaArrResult = { air_version: string; external_addresses: string[]; node_version: string; }
export function viaArr(
node_id: string,
viaAr: string[],
@ -161,7 +161,7 @@ export function viaArr(...args: any) {
}
export type ViaStreamResult = { external_addresses: string[]; }
export type ViaStreamResult = { air_version: string; external_addresses: string[]; node_version: string; }
export function viaStream(
node_id: string,
viaStr: string[],
@ -278,7 +278,7 @@ export function viaStream(...args: any) {
}
export type ViaOptResult = { external_addresses: string[]; }
export type ViaOptResult = { air_version: string; external_addresses: string[]; node_version: string; }
export function viaOpt(
relay: string,
node_id: string,

View File

@ -22,4 +22,4 @@ export const testNetConfig = {
tryCatchError: "Local service error, ret_code is 1, error message is '\"Service with id 'unex' not found (function getStr)\"'"
}
export const config = testNetConfig
export const config = krasnodarConfig

View File

@ -4,19 +4,34 @@ import { config } from '../config';
const relays = config.relays
export async function viaCall(): Promise<string[][]> {
export async function viaArrCall(): Promise<string[]> {
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
registerCustomId({
id: (args0) => {
return args0;
},
});
let res = await viaArr(relays[4].peerId, [relays[2].peerId, relays[1].peerId]);
return res.external_addresses;
}
export async function viaOptCall(): Promise<string[]> {
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
let res2 = await viaOpt(relayPeerId, relays[4].peerId, relays[2].peerId);
return res2.external_addresses;
}
export async function viaOptNullCall(): Promise<string[]> {
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
let res3 = await viaOpt(relayPeerId, relays[4].peerId, relays[2].peerId || null);
return res3.external_addresses;
}
export async function viaStreamCall(): Promise<string[]> {
const relayPeerId = Fluence.getPeer().getStatus().relayPeerId;
let res4 = await viaStream(relays[4].peerId, [relays[2].peerId, relays[1].peerId]);
return [res.external_addresses, res2.external_addresses, res3.external_addresses, res4.external_addresses];
return res4.external_addresses;
}