move test into integration-scripts directory

WebOfTrust · Nov 21, 2023 · a2859c2 · a2859c2
1 parent f00503e
commit a2859c2
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 108 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -52,8 +52,9 @@ jobs:
           node-version: '18.12.1'
           cache: 'npm'
       - name: install deps
-        run: |
-          npm ci
+        run: npm ci
+      - name: Build
+        run: npm run build
       - name: Start dependencies
         run: docker compose up deps
       - name: Run integration test

diff --git a/test-integration/test-utils.ts → ...tion-scripts/single-issuer-holder.test.ts b/test-integration/test-utils.ts → ...tion-scripts/single-issuer-holder.test.ts
@@ -5,14 +5,21 @@ import signify, {
     messagize,
     d,
     Siger,
-} from '../src/index.ts';
+} from 'signify-ts';
 
-export function createTimestamp() {
+const URL = 'http://127.0.0.1:3901';
+const BOOT_URL = 'http://127.0.0.1:3903';
+const SCHEMA_SAID = 'EBfdlu8R27Fbx-ehrqwImnK-8Cm79sqbAQ4MmvEAYqao';
+const WITNESS_AIDS: string[] = []; // ['BBilc4-L3tFUnfM_wJr4S4OJanAv_VmF_dJNN6vkf2Ha'];
+const SCHEMA_OOBI =
+    'http://vlei-server:7723/oobi/EBfdlu8R27Fbx-ehrqwImnK-8Cm79sqbAQ4MmvEAYqao';
+
+function createTimestamp() {
     const dt = new Date().toISOString().replace('Z', '000+00:00');
     return dt;
 }
 
-export async function connect(url: string, bootUrl: string) {
+async function connect(url: string, bootUrl: string) {
     const client = new signify.SignifyClient(
         url,
         signify.randomPasscode(),
@@ -26,7 +33,7 @@ export async function connect(url: string, bootUrl: string) {
     return client;
 }
 
-export async function createIdentifier(
+async function createIdentifier(
     client: signify.SignifyClient,
     name: string,
     witnesses: string[]
@@ -48,15 +55,15 @@ export async function createIdentifier(
     return aid.prefix;
 }
 
-export async function getAgentOobi(
-    client: SignifyClient,
+async function getAgentOobi(
+    client: signify.SignifyClient,
     name: string
 ): Promise<string> {
     const result = await client.oobis().get(name, 'agent');
     return result.oobis[0];
 }
 
-export async function resolveOobi(
+async function resolveOobi(
     client: SignifyClient,
     oobi: string,
     alias: string
@@ -66,7 +73,7 @@ export async function resolveOobi(
     await waitOperation(client, op.name, 5000);
 }
 
-export async function createRegistry(
+async function createRegistry(
     client: SignifyClient,
     name: string,
     registryName: string
@@ -82,7 +89,7 @@ export async function createRegistry(
     return registries[0];
 }
 
-export async function issueCredential(
+async function issueCredential(
     client: SignifyClient,
     name: string,
     args: { registry: string; schema: string; recipient: string; data: unknown }
@@ -142,7 +149,7 @@ interface Notification {
     a: { r: string; d?: string; m?: string };
 }
 
-export async function waitForNotification(
+async function waitForNotification(
     client: SignifyClient,
     route: string
 ): Promise<Notification> {
@@ -159,7 +166,7 @@ export async function waitForNotification(
     }
 }
 
-export async function admitCredential(
+async function admitCredential(
     client: SignifyClient,
     name: string,
     said: string,
@@ -172,7 +179,7 @@ export async function admitCredential(
     await client.ipex().submitAdmit(name, admit, sigs, end, [recipient]);
 }
 
-export async function wait<T>(fn: () => Promise<T>, timeout: number = 10000) {
+async function wait<T>(fn: () => Promise<T>, timeout: number = 10000) {
     const start = Date.now();
     const errors: Error[] = [];
     while (Date.now() - start < timeout) {
@@ -188,7 +195,7 @@ export async function wait<T>(fn: () => Promise<T>, timeout: number = 10000) {
     throw new RetryError(`Retry failed after ${Date.now() - start} ms`, errors);
 }
 
-export async function waitOperation(
+async function waitOperation(
     client: SignifyClient,
     name: string,
     timeout?: number
@@ -213,11 +220,75 @@ export async function waitOperation(
     }
 }
 
-export class RetryError extends Error {
+class RetryError extends Error {
     constructor(
         message: string,
         public errors: Error[]
     ) {
         super(message);
     }
 }
+
+test(
+    'Single issuer holder',
+    async () => {
+        await signify.ready();
+        const issuerClient = await connect(URL, BOOT_URL);
+        const holderClient = await connect(URL, BOOT_URL);
+
+        await issuerClient.state();
+        await holderClient.state();
+
+        // Create two identifiers, one for each client
+        const issuerPrefix = await createIdentifier(
+            issuerClient,
+            'issuer',
+            WITNESS_AIDS
+        );
+        const holderPrefix = await createIdentifier(
+            holderClient,
+            'holder',
+            WITNESS_AIDS
+        );
+
+        // Exchange OOBIs
+        const issuerOobi = await getAgentOobi(issuerClient, 'issuer');
+        const holderOobi = await getAgentOobi(holderClient, 'holder');
+        await resolveOobi(issuerClient, holderOobi, 'holder');
+        await resolveOobi(issuerClient, SCHEMA_OOBI, 'schema');
+        await resolveOobi(holderClient, issuerOobi, 'issuer');
+        await resolveOobi(holderClient, SCHEMA_OOBI, 'schema');
+
+        await createRegistry(issuerClient, 'issuer', 'vLEI');
+
+        const registires = await issuerClient.registries().list('issuer');
+        await issueCredential(issuerClient, 'issuer', {
+            registry: registires[0].regk,
+            schema: SCHEMA_SAID,
+            recipient: holderPrefix,
+            data: {
+                LEI: '5493001KJTIIGC8Y1R17',
+            },
+        });
+
+        const grantNotification = await waitForNotification(
+            holderClient,
+            '/exn/ipex/grant'
+        );
+
+        await admitCredential(
+            holderClient,
+            'holder',
+            grantNotification.a.d!,
+            issuerPrefix
+        );
+
+        await holderClient.notifications().mark(grantNotification.i);
+
+        await wait(async () => {
+            const creds = await holderClient.credentials().list();
+            assert(creds.length >= 1);
+        });
+    },
+    1000 * 60 * 5
+);
diff --git a/package.json b/package.json
@@ -21,8 +21,8 @@
     "build:types": "tsc -p tsconfig.build.json",
     "build": "npm run build:cjs && npm run build:esm && npm run build:types",
     "test": "jest test/",
-    "test:integration": "jest test-integration/",
-    "lint": "npx eslint src test test-integration examples/integration-scripts examples/scripts",
+    "test:integration": "jest examples/integration-scripts/",
+    "lint": "npx eslint src test examples/integration-scripts examples/scripts",
     "prepare": "npm run build",
     "generate-docs": "node_modules/.bin/jsdoc --configure .jsdoc.json --verbose",
     "pretty": "prettier --config .prettierrc 'src/**/*.ts' 'test/**/*.ts' 'examples/**/*.ts' --write"

diff --git a/test-integration/single-issuer-holder.test.ts b/test-integration/single-issuer-holder.test.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,8 +1,8 @@
 {
-    "include": ["src", "types", "test", "test-integration"],
-    "extends": "./tsconfig.node.json",
-    "compilerOptions": {
-        "noEmit": true,
-        "allowImportingTsExtensions": true
-    }
+  "include": ["src", "types", "test", "examples/integration-scripts"],
+  "extends": "./tsconfig.node.json",
+  "compilerOptions": {
+    "noEmit": true,
+    "allowImportingTsExtensions": true
+  }
 }