Skip to content

refactor: remove redundant test helpers, and use them more #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lenkan merged 4 commits into from
Aug 29, 2025
Merged

refactor: remove redundant test helpers, and use them more #336

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d235e6
refactor: remove redundent test helpers, and use getOrCreateClient ev…
iFergal Jul 2, 2025
fe377a9
chore: lock 0.2.0 vLEI server
iFergal Jul 2, 2025
2c064c7
chore: audit fix
iFergal Jul 2, 2025
d211027
refactor: prettier run
iFergal Jul 2, 2025
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
2 changes: 1 addition & 1 deletion docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ x-python-env: &python-env

services:
vlei-server:
image: gleif/vlei
image: gleif/vlei:0.2.0
Comment thread
lenkan marked this conversation as resolved.
environment:
<<: *python-env
command: vLEI-server -s ./schema/acdc -c ./samples/acdc/ -o ./samples/oobis/
Expand Down
43 changes: 6 additions & 37 deletions test-integration/challenge.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,17 @@
import { assert, test } from 'vitest';
import signify, { Serder } from 'signify-ts';
import { resolveEnvironment } from './utils/resolve-env.ts';
import { Serder } from 'signify-ts';
import {
assertOperations,
getOrCreateClients,
resolveOobi,
waitOperation,
} from './utils/test-util.ts';

const { url, bootUrl } = resolveEnvironment();

test('challenge', async () => {
await signify.ready();
const bran1 = signify.randomPasscode();
const bran2 = signify.randomPasscode();
const client1 = new signify.SignifyClient(
url,
bran1,
signify.Tier.low,
bootUrl
);
const client2 = new signify.SignifyClient(
url,
bran2,
signify.Tier.low,
bootUrl
);
await client1.boot();
await client2.boot();
await client1.connect();
await client2.connect();
const state1 = await client1.state();
const state2 = await client2.state();
console.log(
'Client 1 connected. Client AID:',
state1.controller.state.i,
'Agent AID: ',
state1.agent.i
);
console.log(
'Client 2 connected. Client AID:',
state2.controller.state.i,
'Agent AID: ',
state2.agent.i
);
const [
client1,
client2
] = await getOrCreateClients(2);

// Generate challenge words
const challenge1_small = await client1.challenges().generate(128);
Expand Down
43 changes: 5 additions & 38 deletions test-integration/delegation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,19 @@
import { assert, test } from 'vitest';
import signify from 'signify-ts';
import { resolveEnvironment } from './utils/resolve-env.ts';
import {
assertOperations,
getOrCreateClients,
getOrCreateContact,
resolveOobi,
waitOperation,
} from './utils/test-util.ts';
import { retry } from './utils/retry.ts';
import { step } from './utils/test-step.ts';

const { url, bootUrl } = resolveEnvironment();

test('delegation', async () => {
await signify.ready();
// Boot two clients
const bran1 = signify.randomPasscode();
const bran2 = signify.randomPasscode();
const client1 = new signify.SignifyClient(
url,
bran1,
signify.Tier.low,
bootUrl
);
const client2 = new signify.SignifyClient(
url,
bran2,
signify.Tier.low,
bootUrl
);
await client1.boot();
await client2.boot();
await client1.connect();
await client2.connect();
const state1 = await client1.state();
const state2 = await client2.state();
console.log(
'Client 1 connected. Client AID:',
state1.controller.state.i,
'Agent AID: ',
state1.agent.i
);
console.log(
'Client 2 connected. Client AID:',
state2.controller.state.i,
'Agent AID: ',
state2.agent.i
);
const [
client1,
client2
] = await getOrCreateClients(2);

// Client 1 create delegator AID
const icpResult1 = await client1.identifiers().create('delegator', {
Expand Down
25 changes: 3 additions & 22 deletions test-integration/externalModule.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,16 @@
import { assert, test } from 'vitest';
import signify from 'signify-ts';
import { BIP39Shim } from './modules/bip39_shim.ts';
import { resolveEnvironment } from './utils/resolve-env.ts';
import { assertOperations, waitOperation } from './utils/test-util.ts';

const { url, bootUrl } = resolveEnvironment();
import { assertOperations, getOrCreateClient, waitOperation } from './utils/test-util.ts';

test('bip39_shim', async () => {
await signify.ready();
const bran1 = signify.randomPasscode();
const externalModule: signify.ExternalModule = {
type: 'bip39_shim',
name: 'bip39_shim',
module: BIP39Shim,
};
const client1 = new signify.SignifyClient(
url,
bran1,
signify.Tier.low,
bootUrl,
[externalModule]
);
await client1.boot();
await client1.connect();
const state1 = await client1.state();
console.log(
'Client 1 connected. Client AID:',
state1.controller.state.i,
'Agent AID: ',
state1.agent.i
);
const client1 = await getOrCreateClient(undefined, [externalModule]);

const words = new BIP39Shim(0, {}).generateMnemonic(256);
const icpResult = await client1.identifiers().create('aid1', {
algo: signify.Algos.extern,
Expand Down
2 changes: 0 additions & 2 deletions test-integration/multisig-join.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import signify, { Serder, SignifyClient } from 'signify-ts';
import {
getOrCreateClient,
getOrCreateIdentifier,
} from './utils/test-setup.ts';
import {
markNotification,
waitForNotifications,
waitOperation,
Expand Down
18 changes: 2 additions & 16 deletions test-integration/randy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
import { assert, test } from 'vitest';
import signify from 'signify-ts';
import { resolveEnvironment } from './utils/resolve-env.ts';
import { assertOperations, waitOperation } from './utils/test-util.ts';

const { url, bootUrl } = resolveEnvironment();
import { assertOperations, getOrCreateClient, waitOperation } from './utils/test-util.ts';

test('randy', async () => {
await signify.ready();
// Boot client
const bran1 = signify.randomPasscode();
const client1 = new signify.SignifyClient(
url,
bran1,
signify.Tier.low,
bootUrl
);
await client1.boot();
await client1.connect();
await client1.state();
const client1 = await getOrCreateClient();

let icpResult = await client1
.identifiers()
Expand Down
24 changes: 2 additions & 22 deletions test-integration/salty.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,9 @@
import { assert, test } from 'vitest';
import signify from 'signify-ts';
import { resolveEnvironment } from './utils/resolve-env.ts';
import { assertOperations, waitOperation } from './utils/test-util.ts';

const { url, bootUrl } = resolveEnvironment();
import { assertOperations, getOrCreateClient, waitOperation } from './utils/test-util.ts';

test('salty', async () => {
await signify.ready();
// Boot client
const bran1 = signify.randomPasscode();
const client1 = new signify.SignifyClient(
url,
bran1,
signify.Tier.low,
bootUrl
);
await client1.boot();
await client1.connect();
const state1 = await client1.state();
console.log(
'Client 1 connected. Client AID:',
state1.controller.state.i,
'Agent AID: ',
state1.agent.i
);
const client1 = await getOrCreateClient();

let icpResult = await client1
.identifiers()
Expand Down
153 changes: 0 additions & 153 deletions test-integration/utils/test-setup.ts
View file
Open in desktop

This file was deleted.

Loading
Loading