Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit 98462bf

Browse files
author
Akim
authored
chore: Review fixes at #378 (#383)
* Review fixes * remove logs * Fixes * Todo to remove prefix later * Refactor service signatures * Fixes * Update lock file * Fix lockfile * Update deps * More fixes and renames * Fix compiler * Peer refactoring and cutting onConnectionChange API * Revert deleted API
1 parent f4a550d commit 98462bf

File tree

34 files changed

+2403
-575
lines changed

34 files changed

+2403
-575
lines changed

packages/@tests/aqua/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"base64-js": "1.5.1"
2121
},
2222
"devDependencies": {
23-
"@fluencelabs/aqua-api": "0.12.4-main-cee4448-2196-1",
23+
"@fluencelabs/aqua-api": "0.13.0",
2424
"@fluencelabs/aqua-lib": "0.6.0",
2525
"@fluencelabs/aqua-to-js": "workspace:*",
2626
"@fluencelabs/js-client": "workspace:*",
27-
"@fluencelabs/registry": "0.8.8-1",
27+
"@fluencelabs/registry": "0.9.0",
2828
"@fluencelabs/trust-graph": "3.1.2",
2929
"ts-node": "10.9.1"
3030
}

packages/@tests/aqua/src/index.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616

1717
import { Fluence, type ClientConfig } from "@fluencelabs/js-client";
18-
import { fromByteArray } from "base64-js";
1918

2019
import { test as particleTest } from "./_aqua/finalize_particle.js";
2120
import {
@@ -56,10 +55,6 @@ export type TestResult =
5655

5756
export const runTest = async (): Promise<TestResult> => {
5857
try {
59-
Fluence.onConnectionStateChange((state) => {
60-
console.info("connection state changed: ", state);
61-
});
62-
6358
console.log("connecting to Fluence Network...");
6459
console.log("multiaddr: ", relay.multiaddr);
6560

@@ -82,7 +77,6 @@ export const runTest = async (): Promise<TestResult> => {
8277
const client = Fluence.getClient();
8378

8479
console.log("my peer id: ", client.getPeerId());
85-
console.log("my sk id: ", fromByteArray(client.getPeerSecretKey()));
8680

8781
console.log("running hello test...");
8882
const hello = await helloTest();

packages/core/aqua-to-js/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"ts-pattern": "5.0.5"
1919
},
2020
"devDependencies": {
21-
"@fluencelabs/aqua-api": "0.12.4-main-cee4448-2196-1",
21+
"@fluencelabs/aqua-api": "0.13.0",
2222
"@fluencelabs/aqua-lib": "0.7.3",
2323
"@fluencelabs/interfaces": "workspace:*",
2424
"@fluencelabs/js-client": "workspace:^",
25-
"@fluencelabs/registry": "0.8.7",
25+
"@fluencelabs/registry": "0.9.0",
2626
"@fluencelabs/spell": "0.5.20",
2727
"@fluencelabs/trust-graph": "0.4.7",
2828
"vitest": "0.34.6",

packages/core/aqua-to-js/src/generate/__test__/__snapshots__/generate.snap.d.ts

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,51 @@ import {
1717
v5_registerService as registerService$$
1818
} from '@fluencelabs/js-client';
1919

20+
// Services
21+
export interface SrvDef {
22+
create: (wasm_b64_content: string, callParams: ParticleContext$$) => { error: string | null; service_id: string | null; success: boolean; } | Promise<{ error: string | null; service_id: string | null; success: boolean; }>;
23+
list: (callParams: ParticleContext$$) => string[] | Promise<string[]>;
24+
remove: (service_id: string, callParams: ParticleContext$$) => { error: string | null; success: boolean; } | Promise<{ error: string | null; success: boolean; }>;
25+
}
26+
export function registerSrv(service: SrvDef): void;
27+
export function registerSrv(serviceId: string, service: SrvDef): void;
28+
export function registerSrv(peer: IFluenceClient$$, service: SrvDef): void;
29+
export function registerSrv(peer: IFluenceClient$$, serviceId: string, service: SrvDef): void;
30+
export interface CalcServiceDef {
31+
divide: (num: number, callParams: ParticleContext$$) => number | Promise<number>;
32+
clear_state: (callParams: ParticleContext$$) => void | Promise<void>;
33+
test_logs: (callParams: ParticleContext$$) => void | Promise<void>;
34+
multiply: (num: number, callParams: ParticleContext$$) => number | Promise<number>;
35+
add: (num: number, callParams: ParticleContext$$) => number | Promise<number>;
36+
state: (callParams: ParticleContext$$) => number | Promise<number>;
37+
subtract: (num: number, callParams: ParticleContext$$) => number | Promise<number>;
38+
}
39+
export function registerCalcService(serviceId: string, service: CalcServiceDef): void;
40+
export function registerCalcService(peer: IFluenceClient$$, serviceId: string, service: CalcServiceDef): void;
41+
export interface HelloWorldDef {
42+
hello: (str: string, callParams: ParticleContext$$) => string | Promise<string>;
43+
}
44+
export function registerHelloWorld(service: HelloWorldDef): void;
45+
export function registerHelloWorld(serviceId: string, service: HelloWorldDef): void;
46+
export function registerHelloWorld(peer: IFluenceClient$$, service: HelloWorldDef): void;
47+
export function registerHelloWorld(peer: IFluenceClient$$, serviceId: string, service: HelloWorldDef): void;
48+
49+
// Functions
50+
export type ResourceTestResultType = [string | null, string[]]
51+
52+
export type ResourceTestParams = [label: string, config?: {ttl?: number}] | [peer: IFluenceClient$$, label: string, config?: {ttl?: number}];
53+
54+
export type ResourceTestResult = Promise<ResourceTestResultType>;
55+
56+
export type HelloTestParams = [config?: {ttl?: number}] | [peer: IFluenceClient$$, config?: {ttl?: number}];
57+
58+
export type HelloTestResult = Promise<string>;
59+
60+
export type Demo_calculationParams = [service_id: string, config?: {ttl?: number}] | [peer: IFluenceClient$$, service_id: string, config?: {ttl?: number}];
61+
62+
export type Demo_calculationResult = Promise<number>;
63+
64+
export type MarineTestParams = [wasm64: string, config?: {ttl?: number}] | [peer: IFluenceClient$$, wasm64: string, config?: {ttl?: number}];
65+
66+
export type MarineTestResult = Promise<number>;
2067

0 commit comments

Comments
 (0)