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

Add build step for Wasm examples #369

Merged
merged 26 commits into from
Sep 3, 2021
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6e8afe5
added build step for examples
eike-hass Aug 25, 2021
d531ac6
enable more examples
eike-hass Aug 25, 2021
4ce15a1
Merge branch 'dev' into feat/unify-js-examples
eike-hass Aug 25, 2021
0856120
enabled more examples, cleaned up utils
eike-hass Aug 26, 2021
776328b
removed platform specific examples
eike-hass Aug 26, 2021
92d66f4
fixed node tests
eike-hass Aug 26, 2021
e4ee677
copy index.html to dist
eike-hass Aug 26, 2021
8c31406
enable all examples
eike-hass Aug 26, 2021
4e3f49d
changed example server root
eike-hass Aug 26, 2021
4ef4095
fixed browser test
eike-hass Aug 31, 2021
20d0515
fixed wasm path
eike-hass Aug 31, 2021
3a63026
enabled all node tests
eike-hass Aug 31, 2021
1bd053d
added example build to workflow
eike-hass Aug 31, 2021
507e5b6
renamed build step
eike-hass Aug 31, 2021
0703edf
Merge branch 'dev' into feat/unify-js-examples
eike-hass Aug 31, 2021
9586c8e
fixed tests
eike-hass Aug 31, 2021
cac32bd
added example build to README
eike-hass Aug 31, 2021
7bc2543
fixed example path
eike-hass Sep 2, 2021
8dbd839
added sourcemap option to build step
eike-hass Sep 2, 2021
eb37257
removed redundant try catch
eike-hass Sep 2, 2021
f94d804
added WASM example build to build and test
eike-hass Sep 3, 2021
6f1641f
fixed Readme links
eike-hass Sep 3, 2021
cc8c3b5
changed test command
eike-hass Sep 3, 2021
a03df8f
added signature for linkify method
eike-hass Sep 3, 2021
3876cd4
minor rework of resolution workflow
eike-hass Sep 3, 2021
67850d2
Merge branch 'dev' into feat/unify-js-examples
eike-hass Sep 3, 2021
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
4 changes: 4 additions & 0 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ jobs:
run: yarn build
working-directory: bindings/wasm

- name: Build Wasm examples
run: yarn build:examples
working-directory: bindings/wasm

eike-hass marked this conversation as resolved.
Show resolved Hide resolved
- name: Test Wasm examples (node)
run: yarn run test:node
working-directory: bindings/wasm
Expand Down
58 changes: 25 additions & 33 deletions bindings/wasm/cypress/integration/browser_test.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
import { defaultClientConfig, initIdentity } from "../../examples/browser/utils";
import { createIdentity } from "../../examples/browser/create_did.js";
import { createVC } from "../../examples/browser/create_vc.js";
import { manipulateIdentity } from "../../examples/browser/mainpulate_did.js";
import { resolveIdentity } from "../../examples/browser/resolve.js";
import { createVP } from "../../examples/browser/create_vp.js";
import { createDiff } from "../../examples/browser/diff_chain.js";
import { revoke } from "../../examples/browser/revoke_vc.js";
import { merkleKey } from "../../examples/browser/merkle_key.js";
import { createIdentityPrivateTangle } from "../../examples/browser/private_tangle";
import { resolveHistory } from "../../examples/browser/resolve_history";
import {
defaultClientConfig, initIdentity, createIdentity, createVC, manipulateIdentity, resolution, createVP, createDiff, revokeVC, merkleKey, createIdentityPrivateTangle, resolveHistory
} from '../../examples/dist/web'

// Test that the browser examples do not throw uncaught exceptions twice, including syntax errors etc.
describe(
Expand All @@ -19,7 +11,7 @@ describe(
() => {
beforeEach(async () => {
// The working directory is under __cypress at test runtime, so we need to go up one more level than usual
await initIdentity("../../../web/identity_wasm_bg.wasm", false);
await initIdentity('../../../examples/dist/identity_wasm_bg.wasm');

// NOTE: `cy.wrap(defaultClientConfig()).as('config')` does not always work to make the config available
// from the shared context as `this.config` because it has a race condition with initializing the wasm.
Expand All @@ -29,65 +21,65 @@ describe(
it("create identity", async function () {
let identityResult;
try {
identityResult = await createIdentity(defaultClientConfig(), false);
identityResult = await createIdentity(defaultClientConfig());
} catch (e) {
identityResult = await createIdentity(defaultClientConfig(), false);
identityResult = await createIdentity(defaultClientConfig());
}
// example of testing the output, can remove if needed
expect(identityResult).to.have.all.keys("key", "doc", "receipt", "explorerUrl");
expect(identityResult).to.have.all.keys("key", "doc", "receipt");
});

it("manipulate identity", async function () {
try {
await manipulateIdentity(defaultClientConfig(), false);
await manipulateIdentity(defaultClientConfig());
} catch (e) {
await manipulateIdentity(defaultClientConfig(), false);
await manipulateIdentity(defaultClientConfig());
}
});

it("resolve identity", async function () {
try {
await resolveIdentity(defaultClientConfig(), false, false);
await resolution(defaultClientConfig());
} catch (e) {
await resolveIdentity(defaultClientConfig(), false, false);
await resolution(defaultClientConfig());
}
});

it("create verifiable credential", async function () {
try {
await createVC(defaultClientConfig(), false);
await createVC(defaultClientConfig());
} catch (e) {
await createVC(defaultClientConfig(), false);
await createVC(defaultClientConfig());
}
});

it("revoke verifiable credential", async function () {
try {
await revoke(defaultClientConfig(), false);
await revokeVC(defaultClientConfig());
} catch (e) {
await revoke(defaultClientConfig(), false);
await revokeVC(defaultClientConfig());
}
});

it("create verifiable presentation", async function () {
try {
await createVP(defaultClientConfig(), false);
await createVP(defaultClientConfig());
} catch (e) {
await createVP(defaultClientConfig(), false);
await createVP(defaultClientConfig());
}
});

it("merkle key", async function () {
try {
await merkleKey(defaultClientConfig(), false);
await merkleKey(defaultClientConfig());
} catch (e) {
await merkleKey(defaultClientConfig(), false);
await merkleKey(defaultClientConfig());
}
});

it("private tangle", async function () {
try {
await createIdentityPrivateTangle(false, false)
await createIdentityPrivateTangle()
throw new Error("Did not throw.")
} catch (err) {
// Example is expected to throw an error because no private Tangle is running
Expand All @@ -98,17 +90,17 @@ describe(

it("diff chain", async function () {
try {
await createDiff(defaultClientConfig(), false);
await createDiff(defaultClientConfig());
} catch (e) {
await createDiff(defaultClientConfig(), false);
await createDiff(defaultClientConfig());
}
});

it("resolve history", async function () {
try {
await resolveHistory(defaultClientConfig(), false);
await resolveHistory(defaultClientConfig());
} catch (e) {
await resolveHistory(defaultClientConfig(), false);
await resolveHistory(defaultClientConfig());
}
});
}
Expand Down
3 changes: 2 additions & 1 deletion bindings/wasm/examples/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
!*
!*
dist/
11 changes: 11 additions & 0 deletions bindings/wasm/examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ that can be found in the `config.js` file for node and in `main.js` for the brow

Before running the examples, make sure you have [built the bindings](../README.md#Build) for `node.js`.

To build the examples use

```
npm run build:examples
```

You can run each example using

```
Expand Down Expand Up @@ -51,6 +57,11 @@ All the Node.js examples are also available for the browser.

Before running the examples, make sure you have [built the bindings](../README.md#Build) for `web`.

To build the examples use
```
npm run build:examples
```

You can run the browser examples using

```
Expand Down
49 changes: 0 additions & 49 deletions bindings/wasm/examples/browser/create_did.js

This file was deleted.

67 changes: 0 additions & 67 deletions bindings/wasm/examples/browser/create_vc.js

This file was deleted.

46 changes: 0 additions & 46 deletions bindings/wasm/examples/browser/create_vp.js

This file was deleted.

49 changes: 0 additions & 49 deletions bindings/wasm/examples/browser/diff_chain.js

This file was deleted.

Loading