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

fix: browser test in canary flow #2102

Merged
merged 2 commits into from
Sep 7, 2023
Merged

fix: browser test in canary flow #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c93df2
fix browser test in canary flow
spypsy Sep 7, 2023
2e23cd9
Merge branch 'master' into sp/fix-browser-canary
spypsy Sep 7, 2023
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
3 changes: 2 additions & 1 deletion yarn-project/aztec.js/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ export {
emptyFunctionCall,
} from '@aztec/types';

export { createDebugLogger } from '@aztec/foundation/log';
export { createDebugLogger, DebugLogger } from '@aztec/foundation/log';
export { fileURLToPath } from '@aztec/foundation/url';
export { sleep } from '@aztec/foundation/sleep';
8 changes: 6 additions & 2 deletions yarn-project/canary/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
FROM node:18-alpine
RUN apk update && apk add --no-cache jq bash
RUN apk update && apk add --no-cache udev ttf-freefont chromium curl jq bash
ENV CHROME_BIN="/usr/bin/chromium-browser" PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"

ARG COMMIT_TAG=""
ARG COMMIT_TAG="v0.1.0-alpha62"

#Build canary
WORKDIR /usr/src/
COPY ./canary .
RUN ./scripts/update_packages.sh $COMMIT_TAG
RUN yarn && yarn build

RUN cp node_modules/@aztec/aztec.js/dest/main.js src/web/
RUN cp node_modules/@aztec/circuits.js/resources/aztec3-circuits.wasm src/web/

ENTRYPOINT ["yarn", "test"]
29 changes: 13 additions & 16 deletions yarn-project/canary/src/aztec_js_browser.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
/* eslint-disable no-console */
import * as AztecJs from '@aztec/aztec.js';
import { AztecAddress, GrumpkinScalar } from '@aztec/circuits.js';
import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
import { fileURLToPath } from '@aztec/foundation/url';
import { PrivateTokenContractAbi } from '@aztec/noir-contracts/artifacts';

import { Server } from 'http';
Expand All @@ -17,15 +14,15 @@ declare global {
}
}

const __filename = fileURLToPath(import.meta.url);
const __filename = AztecJs.fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);

const PORT = 3000;
const PORT = 3033;

const { SANDBOX_URL } = process.env;

const conditionalDescribe = () => (SANDBOX_URL ? describe : describe.skip);
const privKey = GrumpkinScalar.random();
const privKey = AztecJs.GrumpkinScalar.random();

/**
* This test is a bit of a special case as it's relying on sandbox and web browser and not only on anvil and node.js.
Expand All @@ -45,10 +42,10 @@ conditionalDescribe()('e2e_aztec.js_browser', () => {
const initialBalance = 33n;
const transferAmount = 3n;

let contractAddress: AztecAddress;
let contractAddress: AztecJs.AztecAddress;

let logger: DebugLogger;
let pageLogger: DebugLogger;
let logger: AztecJs.DebugLogger;
let pageLogger: AztecJs.DebugLogger;
let app: Koa;
let testClient: AztecJs.AztecRPC;
let server: Server;
Expand All @@ -59,15 +56,15 @@ conditionalDescribe()('e2e_aztec.js_browser', () => {
beforeAll(async () => {
testClient = AztecJs.createAztecRpcClient(SANDBOX_URL!, AztecJs.makeFetch([1, 2, 3], true));
await AztecJs.waitForSandbox(testClient);

const pathRes = path.resolve(__dirname, './web');
app = new Koa();
app.use(serve(path.resolve(__dirname, './web')));
app.use(serve(pathRes));
server = app.listen(PORT, () => {
logger(`Server started at http://localhost:${PORT}`);
});

logger = createDebugLogger('aztec:aztec.js:web');
pageLogger = createDebugLogger('aztec:aztec.js:web:page');
logger = AztecJs.createDebugLogger('aztec:aztec.js:web');
pageLogger = AztecJs.createDebugLogger('aztec:aztec.js:web:page');

browser = await launch({
executablePath: process.env.CHROME_BIN,
Expand All @@ -86,12 +83,12 @@ conditionalDescribe()('e2e_aztec.js_browser', () => {
});
page = await browser.newPage();
page.on('console', msg => {
pageLogger(msg.text());
pageLogger('PAGE MSG', msg.text());
});
page.on('pageerror', err => {
pageLogger.error(err.toString());
pageLogger.error('PAGE ERROR', err.toString());
});
await page.goto(`http://localhost:${PORT}/index.html`);
await page.goto(`http://localhost:${PORT}`);
}, 120_000);

afterAll(async () => {
Expand Down
10 changes: 10 additions & 0 deletions yarn-project/canary/src/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<body>
<script type="module">
import * as AztecJs from './main.js';

window.AztecJs = AztecJs;
</script>
</body>
</html>