Skip to content
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.

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

Fix/test del rot multisig more #267

Merged
merged 51 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
532d5b6
testing delegation and deployed services
2byrds May 29, 2024
50c5fd6
tested delegation endpoint
2byrds Jun 4, 2024
17037bc
successful single and multisig delegation
2byrds Jun 6, 2024
a6b77c8
fixed local test-setup run with latest keria
2byrds Jun 6, 2024
931c934
fixed salty log event ked/serder creation
2byrds Jun 8, 2024
b1db802
with keripy multiplexor parser using local=True, getting to delegatee…
2byrds Jun 11, 2024
1b86f43
small salty test fixes and updates del-multisig to notify
2byrds Jun 13, 2024
493eb6c
fixes for keripy/keria updates to exn w/ rp field
2byrds Jun 13, 2024
df700ac
del multisig w/o witnesses success
2byrds Jun 13, 2024
2cf38cf
added back witnesses for delegated multisig successful integration test
2byrds Jun 13, 2024
6ead09e
multisig-vlei-issuance successful integration test
2byrds Jun 13, 2024
badc2b4
updated digest in test per Serder changes
2byrds Jun 14, 2024
2c889ea
revert local test changes
2byrds Jun 14, 2024
619e76b
remove comments, etc
2byrds Jun 14, 2024
d6062c8
small fix depending on env
2byrds Jun 14, 2024
d8fb5b9
prettier
2byrds Jun 14, 2024
23158fa
making multisig methods available for other tests
2byrds Jun 14, 2024
aa6ca23
fix docker digest
2byrds Jun 14, 2024
eda9bad
fix docker keria health check
2byrds Jun 14, 2024
b7de398
prettier and audit fix
2byrds Jun 14, 2024
ba44f33
some test utility consolidation but a new issue should be created
2byrds Jun 14, 2024
c5968a8
prettier
2byrds Jun 14, 2024
63c473d
fix syntax
2byrds Jun 14, 2024
723c60a
prettier
2byrds Jun 16, 2024
aed163c
Fix naming
2byrds Jun 17, 2024
4bb8503
prettier
2byrds Jun 17, 2024
44d9078
Merge branch 'WebOfTrust:main' into fix/test_del_rot_multisig_more
2byrds Jun 21, 2024
d3def41
updated docker-compose.yaml with entrypoint override for keria
2byrds Jun 22, 2024
444a6f7
restoring original keria docker-compose version string
2byrds Jul 16, 2024
139d028
simplify admitSingleSig call
2byrds Jul 16, 2024
19240dd
bump version to 0.3.0 to signal breaking change with previous 0.1.x k…
2byrds Jul 16, 2024
e884277
fixed ixn url
2byrds Jul 16, 2024
3368475
merged latest
2byrds Jul 16, 2024
545abe5
prettier
2byrds Jul 16, 2024
d467f59
fix npm audit issue with mermaid-js with override
2byrds Jul 16, 2024
114a2b1
restore eslint, etc
2byrds Jul 16, 2024
76fd97d
using constants
2byrds Jul 17, 2024
682ebcc
revert package-lock.json to original with minimal audit fixes
2byrds Jul 17, 2024
bd43e40
specify the keria version
2byrds Jul 17, 2024
8b6acf8
adding test coverage for delegation approval
2byrds Jul 17, 2024
8600ead
unit test coverage for delegation approval
2byrds Jul 17, 2024
cd5325f
prettier
2byrds Jul 17, 2024
edf3012
reverting to 127.0.0.1 oobis for test value in local mode
2byrds Jul 26, 2024
80cc196
per review, delegating test - remove credential related code
2byrds Jul 26, 2024
f6c7696
per review, added check of body for delegation approval
2byrds Jul 26, 2024
de4a29d
per review, removing comments
2byrds Jul 26, 2024
af3bffa
per review, avoid testing changing id
2byrds Jul 26, 2024
4e067a7
per review, fixing warnings in delegation test
2byrds Jul 26, 2024
830728b
per review, consolidated waitAndMarkNotification functions
2byrds Jul 26, 2024
5841484
prettier
2byrds Jul 26, 2024
fe262d4
small fixes from checks
2byrds Jul 26, 2024
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 .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest']
keria-version: ['0.1.3']
keria-version: ['0.2.0-dev3']
node-version: ['20']
env:
KERIA_IMAGE_TAG: ${{ matrix.keria-version }}
Expand Down
24 changes: 13 additions & 11 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,27 @@ services:
- 7723:7723

keria:
image: ${KERIA_IMAGE:-weboftrust/keria}:${KERIA_IMAGE_TAG:-0.1.3}
image: ${KERIA_IMAGE:-weboftrust/keria}:${KERIA_IMAGE_TAG:-0.2.0-dev3}
environment:
- KERI_AGENT_CORS=1
- KERI_URL=http://keria:3902
- PYTHONUNBUFFERED=1
- PYTHONIOENCODING=UTF-8
volumes:
- ./config/keria.json:/keria/config/keri/cf/keria.json
entrypoint: keria
command:
- start
- --config-dir
- /keria/config
- --config-file
- keria
- --name
- agent
entrypoint:
[
'keria',
'start',
'--config-dir',
'/keria/config',
'--config-file',
'keria',
'--name',
'agent',
]
healthcheck:
test: ['CMD', 'curl', '-f', 'http://localhost:3902/spec.yaml']
test: ['CMD', 'wget', '--spider', 'http://keria:3902/spec.yaml']
2byrds marked this conversation as resolved.
Show resolved Hide resolved
interval: 2s
timeout: 3s
retries: 5
Expand Down
4 changes: 2 additions & 2 deletions examples/integration-scripts/challenge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ test('challenge', async () => {
client1,
await icpResult1.op()
);
let rpyResult1 = await client1
const rpyResult1 = await client1
.identifiers()
.addEndRole('alice', 'agent', client1!.agent!.pre);
await waitOperation(client1, await rpyResult1.op());
Expand All @@ -81,7 +81,7 @@ test('challenge', async () => {
client2,
await icpResult2.op()
);
let rpyResult2 = await client2
const rpyResult2 = await client2
.identifiers()
.addEndRole('bob', 'agent', client2!.agent!.pre);
await waitOperation(client2, await rpyResult2.op());
Expand Down
27 changes: 10 additions & 17 deletions examples/integration-scripts/credentials.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@ import { resolveEnvironment } from './utils/resolve-env';
import {
assertNotifications,
assertOperations,
createAid,
getOrCreateClients,
getOrCreateContact,
markAndRemoveNotification,
resolveOobi,
waitForNotifications,
waitOperation,
} from './utils/test-util';
import { retry } from './utils/retry';
import {
getOrCreateClients,
getOrCreateContact,
getOrCreateIdentifier,
} from './utils/test-setup';
import { randomUUID } from 'crypto';
import { step } from './utils/test-step';

Expand All @@ -36,11 +34,6 @@ function createTimestamp() {
return new Date().toISOString().replace('Z', '000+00:00');
}

async function createAid(client: SignifyClient, name: string): Promise<Aid> {
const [prefix, oobi] = await getOrCreateIdentifier(client, name);
return { prefix, oobi, name };
}

let issuerClient: SignifyClient;
let holderClient: SignifyClient;
let verifierClient: SignifyClient;
Expand Down Expand Up @@ -125,7 +118,7 @@ test('single signature credentials', async () => {
.rename(issuerAid.name, registryName, updatedRegistryName);

registries = await issuerClient.registries().list(issuerAid.name);
let updateRegistry: { name: string; regk: string } = registries[0];
const updateRegistry: { name: string; regk: string } = registries[0];
assert.equal(registries.length, 1);
assert.equal(updateRegistry.name, updatedRegistryName);

Expand Down Expand Up @@ -243,7 +236,7 @@ test('single signature credentials', async () => {
datetime: dt,
});

let op = await issuerClient
const op = await issuerClient
.ipex()
.submitGrant(issuerAid.name, grant, gsigs, gend, [
holderAid.prefix,
Expand All @@ -266,7 +259,7 @@ test('single signature credentials', async () => {
grantNotification.a.d!,
createTimestamp()
);
let op = await holderClient
const op = await holderClient
.ipex()
.submitAdmit(holderAid.name, admit, sigs, aend, [issuerAid.prefix]);
await waitOperation(holderClient, op);
Expand Down Expand Up @@ -313,7 +306,7 @@ test('single signature credentials', async () => {
datetime: createTimestamp(),
});

let op = await holderClient
const op = await holderClient
.ipex()
.submitGrant(holderAid.name, grant2, gsigs2, gend2, [
verifierAid.prefix,
Expand All @@ -338,7 +331,7 @@ test('single signature credentials', async () => {
createTimestamp()
);

let op = await verifierClient
const op = await verifierClient
.ipex()
.submitAdmit(verifierAid.name, admit3, sigs3, aend3, [
holderAid.prefix,
Expand Down Expand Up @@ -437,7 +430,7 @@ test('single signature credentials', async () => {
datetime: dt,
});

let op = await holderClient
const op = await holderClient
.ipex()
.submitGrant(holderAid.name, grant, gsigs, gend, [
legalEntityAid.prefix,
Expand All @@ -461,7 +454,7 @@ test('single signature credentials', async () => {
createTimestamp()
);

let op = await legalEntityClient
const op = await legalEntityClient
.ipex()
.submitAdmit(legalEntityAid.name, admit, sigs, aend, [
holderAid.prefix,
Expand Down
Loading
Loading