Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
71f1d68
Refactored connections. Ephemeral networks work
coder11 Mar 31, 2023
8cb357d
Rearrange files in js-peer package
coder11 Mar 31, 2023
b788ebf
Better split stuff in interfaces package
coder11 Mar 31, 2023
e1169f9
Interface segregation principle :)
coder11 Mar 31, 2023
d0b4c00
IModule - > IStartable
coder11 Mar 31, 2023
ae255d7
Refactored configs a little
coder11 Apr 1, 2023
556e231
Extract JsService host
coder11 Apr 2, 2023
01c761d
Some fixes
coder11 Apr 2, 2023
36b5464
Fix smoke tests
coder11 Apr 2, 2023
38c2b26
cleaning up
coder11 Apr 2, 2023
e48606f
one more cleaning up
coder11 Apr 2, 2023
eadbbcc
Using NodeUtils only in node
coder11 Apr 3, 2023
59f6a15
Hack to make node utils work properly
coder11 Apr 3, 2023
47ff596
Fix marinejs tests in web
coder11 Apr 3, 2023
a9306cb
comment out sometimes failing test
coder11 Apr 3, 2023
72fc7f9
Merge branch 'master' into farewell
coder11 Apr 3, 2023
bb9d5e3
License headers
coder11 Apr 3, 2023
b6f6a58
Fix build
coder11 Apr 3, 2023
6239aeb
More build fix
coder11 Apr 3, 2023
4abdb59
Use aqua-playground branch
nahsi Apr 3, 2023
993fad5
Fix
nahsi Apr 3, 2023
b6dab27
Fix
nahsi Apr 3, 2023
7526786
Fix tests in node 17
coder11 Apr 3, 2023
beabd49
more attempts to fix tests
coder11 Apr 3, 2023
0c35e09
Comment out failing test
coder11 Apr 3, 2023
bcdfcb2
fix json syntax
coder11 Apr 3, 2023
45fc22c
Merge branch 'master' into farewell
coder11 Apr 3, 2023
febc17e
Update .github/workflows/e2e.yml
shamsartem Apr 3, 2023
a9037c7
Update packages/@tests/aqua/src/index.ts
shamsartem Apr 3, 2023
bb5c161
Update packages/@tests/aqua/src/index.ts
shamsartem Apr 3, 2023
9241d3e
Update packages/@tests/aqua/src/index.ts
shamsartem Apr 3, 2023
4c23a12
Update packages/@tests/aqua/src/index.ts
shamsartem Apr 3, 2023
c2cef64
Fix PR comments
coder11 Apr 3, 2023
ed9488f
fix one more comment
coder11 Apr 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
"node": ">=10",
"pnpm": ">=3"
},
"scripts": {
"simulate-cdn": "http-server -p 8765 ./packages/client/js-client.web.standalone/dist"
},
"author": "Fluence Labs",
"license": "Apache-2.0",
"devDependencies": {
Expand Down
17 changes: 9 additions & 8 deletions packages/@tests/aqua/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { fromByteArray } from 'base64-js';
import { Fluence } from '@fluencelabs/js-client.api';
import type { ClientConfig } from '@fluencelabs/js-client.api';
import { kras, randomKras } from '@fluencelabs/fluence-network-environment';
import { registerHelloWorld, helloTest, marineTest, resourceTest } from './_aqua/smoke_test.js';
import { wasm } from './wasmb64.js';
Expand All @@ -11,7 +12,9 @@ import { wasm } from './wasmb64.js';
// };

// Currently the tests executes some calls to registry. And they fail for a single local node setup. So we use kras instead.
const relay = randomKras();
// TODO DXJ-356: use local peers instead of kras
// const relay = randomKras();
const relay = kras[4];

function generateRandomUint8Array() {
const uint8Array = new Uint8Array(32);
Expand All @@ -21,7 +24,7 @@ function generateRandomUint8Array() {
return uint8Array;
}

const optsWithRandomKeyPair = () => {
const optsWithRandomKeyPair = (): ClientConfig => {
return {
keyPair: {
type: 'Ed25519',
Expand All @@ -37,6 +40,7 @@ export const runTest = async (): Promise<TestResult> => {
Fluence.onConnectionStateChange((state) => console.info('connection state changed: ', state));

console.log('connecting to Fluence Network...');
console.log('multiaddr: ', relay.multiaddr);
await Fluence.connect(relay, optsWithRandomKeyPair());

console.log('connected');
Expand Down Expand Up @@ -68,19 +72,16 @@ export const runTest = async (): Promise<TestResult> => {
const hello = await helloTest();
console.log('hello test finished, result: ', hello);

// TODO: some wired error shit about SharedArrayBuffer
// console.log('running marine test...');
// const marine = await marineTest(wasm);
// console.log('marine test finished, result: ', marine);
console.log('running marine test...');
const marine = await marineTest(wasm);
console.log('marine test finished, result: ', marine);

const returnVal = {
res,
hello,
// marine,
};
return { type: 'success', data: JSON.stringify(returnVal) };
} catch (err: any) {
return { type: 'failure', error: err.toString() };
} finally {
console.log('disconnecting from Fluence Network...');
await Fluence.disconnect();
Expand Down
19 changes: 0 additions & 19 deletions packages/@tests/marine/node/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions packages/@tests/marine/node/jest.config.js

This file was deleted.

19 changes: 0 additions & 19 deletions packages/@tests/marine/node/package.json.skip

This file was deleted.

54 changes: 0 additions & 54 deletions packages/@tests/marine/node/src/test.spec.ts

This file was deleted.

7 changes: 0 additions & 7 deletions packages/@tests/marine/node/tsconfig.json

This file was deleted.

22 changes: 0 additions & 22 deletions packages/@tests/marine/web/.gitignore

This file was deleted.

12 changes: 0 additions & 12 deletions packages/@tests/marine/web/index.html

This file was deleted.

9 changes: 0 additions & 9 deletions packages/@tests/marine/web/jest.config.js

This file was deleted.

37 changes: 0 additions & 37 deletions packages/@tests/marine/web/package.json.skip

This file was deleted.

56 changes: 0 additions & 56 deletions packages/@tests/marine/web/src/index.ts

This file was deleted.

Loading