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.

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

Jump to bottom

fix credentialing field ordering and related singlesig-vlei-issuance test #254

Merged
merged 23 commits into from
May 8, 2024
Merged

fix credentialing field ordering and related singlesig-vlei-issuance test #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fa0fe7d
testing again vlei verification service
2byrds Apr 26, 2024
ec214fe
Fixes for cd '/Users/meenyleeny/VSCode/signify-ts'
2byrds Apr 29, 2024
6e19a80
make signedFetch generic so the caller can control contentType and da…
2byrds Apr 29, 2024
cbaafb6
CI/CD can't run the vlei verification integration test, so commenting…
2byrds Apr 29, 2024
05768f0
CI/CD can't run the vlei verification integration test, so commenting…
2byrds Apr 29, 2024
12fc3cf
formatting fixes
2byrds Apr 29, 2024
9db0c69
prettier formatting fixes
2byrds Apr 29, 2024
895a819
Align signedFetch with fetch api.
2byrds Apr 30, 2024
18b863b
improved reliability of singlesig-vlei-issuance with retries
2byrds May 1, 2024
96ec3c7
restore original package-lock.json
2byrds May 1, 2024
51422fc
prettier formatting
2byrds May 1, 2024
4058a49
removed unnecessary imports
2byrds May 1, 2024
8245ed7
even prettier formatting
2byrds May 1, 2024
c5914db
fixed signedFetch documentation
2byrds May 1, 2024
6fe4061
set retry options
2byrds May 8, 2024
df6f4f0
format code
2byrds May 8, 2024
355fcaf
restore asserts
2byrds May 8, 2024
5447464
restore asserts
2byrds May 8, 2024
c6b850a
better naming
2byrds May 8, 2024
1cfe7a2
restore check
2byrds May 8, 2024
4c728f1
removed unnecessary re-ordering
2byrds May 8, 2024
fdb9e33
separating pr functionality
2byrds May 8, 2024
fc6d59b
separating pr functionality
2byrds May 8, 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
28 changes: 21 additions & 7 deletions examples/integration-scripts/singlesig-vlei-issuance.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,13 @@ const ECR_AUTH_RULES = Saider.saidify({
const OOR_RULES = LE_RULES;
const OOR_AUTH_RULES = LE_RULES;

const CRED_RETRY_DEFAULTS = {
maxSleep: 1000,
minSleep: 10,
maxRetries: 5,
timeout: 10000,
};

interface Aid {
name: string;
prefix: string;
Expand Down Expand Up @@ -193,8 +200,9 @@ test('singlesig-vlei-issuance', async function run() {
const cred = await getGrantedCredential(qviClient, qviCred.sad.d);
assert(cred !== undefined);
return cred;
});
}, CRED_RETRY_DEFAULTS);
}

assert.equal(qviCredHolder.sad.d, qviCred.sad.d);
assert.equal(qviCredHolder.sad.s, QVI_SCHEMA_SAID);
assert.equal(qviCredHolder.sad.i, gleifAid.prefix);
Expand Down Expand Up @@ -232,8 +240,9 @@ test('singlesig-vlei-issuance', async function run() {
const cred = await getGrantedCredential(leClient, leCred.sad.d);
assert(cred !== undefined);
return cred;
});
}, CRED_RETRY_DEFAULTS);
}

assert.equal(leCredHolder.sad.d, leCred.sad.d);
assert.equal(leCredHolder.sad.s, LE_SCHEMA_SAID);
assert.equal(leCredHolder.sad.i, qviAid.prefix);
Expand Down Expand Up @@ -273,8 +282,9 @@ test('singlesig-vlei-issuance', async function run() {
const cred = await getGrantedCredential(roleClient, ecrCred.sad.d);
assert(cred !== undefined);
return cred;
});
}, CRED_RETRY_DEFAULTS);
}

assert.equal(ecrCredHolder.sad.d, ecrCred.sad.d);
assert.equal(ecrCredHolder.sad.s, ECR_SCHEMA_SAID);
assert.equal(ecrCredHolder.sad.i, leAid.prefix);
Expand Down Expand Up @@ -320,8 +330,9 @@ test('singlesig-vlei-issuance', async function run() {
);
assert(cred !== undefined);
return cred;
});
}, CRED_RETRY_DEFAULTS);
}

assert.equal(ecrAuthCredHolder.sad.d, ecrAuthCred.sad.d);
assert.equal(ecrAuthCredHolder.sad.s, ECR_AUTH_SCHEMA_SAID);
assert.equal(ecrAuthCredHolder.sad.i, leAid.prefix);
Expand Down Expand Up @@ -363,8 +374,9 @@ test('singlesig-vlei-issuance', async function run() {
const cred = await getGrantedCredential(roleClient, ecrCred2.sad.d);
assert(cred !== undefined);
return cred;
});
}, CRED_RETRY_DEFAULTS);
}

assert.equal(ecrCredHolder2.sad.d, ecrCred2.sad.d);
assert.equal(ecrCredHolder2.sad.s, ECR_SCHEMA_SAID);
assert.equal(ecrCredHolder2.sad.i, qviAid.prefix);
Expand Down Expand Up @@ -409,8 +421,9 @@ test('singlesig-vlei-issuance', async function run() {
);
assert(cred !== undefined);
return cred;
});
}, CRED_RETRY_DEFAULTS);
}

assert.equal(oorAuthCredHolder.sad.d, oorAuthCred.sad.d);
assert.equal(oorAuthCredHolder.sad.s, OOR_AUTH_SCHEMA_SAID);
assert.equal(oorAuthCredHolder.sad.i, leAid.prefix);
Expand Down Expand Up @@ -451,8 +464,9 @@ test('singlesig-vlei-issuance', async function run() {
const cred = await getGrantedCredential(roleClient, oorCred.sad.d);
assert(cred !== undefined);
return cred;
});
}, CRED_RETRY_DEFAULTS);
}

assert.equal(oorCredHolder.sad.d, oorCred.sad.d);
assert.equal(oorCredHolder.sad.s, OOR_SCHEMA_SAID);
assert.equal(oorCredHolder.sad.i, qviAid.prefix);
Expand Down
6 changes: 5 additions & 1 deletion src/keri/app/credentialing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,13 @@ export class Credentials {
const [, acdc] = Saider.saidify({
v: versify(Ident.ACDC, undefined, Serials.JSON, 0),
d: '',
u: args.u,
i: args.i ?? hab.prefix,
...args,
ri: args.ri,
s: args.s,
a: subject,
e: args.e,
r: args.r,
});

const [, iss] = Saider.saidify({
Expand Down
Loading