picking things from stacked branch

AztecProtocol · Mar 1, 2024 · b9776ba · b9776ba
1 parent aa9e56a
commit b9776ba
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 237 deletions.
diff --git a/boxes/boxes/react/artifacts/BoxReact.ts b/boxes/boxes/react/artifacts/BoxReact.ts
diff --git a/boxes/boxes/react/src/contracts/target/boxreact-BoxReact.json b/boxes/boxes/react/src/contracts/target/boxreact-BoxReact.json
diff --git a/boxes/boxes/vanilla/artifacts/Vanilla.ts b/boxes/boxes/vanilla/artifacts/Vanilla.ts
diff --git a/boxes/boxes/vanilla/dist/index.html b/boxes/boxes/vanilla/dist/index.html
diff --git a/boxes/boxes/vanilla/dist/main.js b/boxes/boxes/vanilla/dist/main.js
diff --git a/boxes/boxes/vanilla/dist/main.js.LICENSE.txt b/boxes/boxes/vanilla/dist/main.js.LICENSE.txt
diff --git a/boxes/boxes/vanilla/dist/main.js.map b/boxes/boxes/vanilla/dist/main.js.map
diff --git a/boxes/boxes/vanilla/src/contracts/target/vanilla-Vanilla.json b/boxes/boxes/vanilla/src/contracts/target/vanilla-Vanilla.json
diff --git a/boxes/vanilla-js/package.json b/boxes/vanilla-js/package.json
@@ -20,7 +20,7 @@
     "@aztec/aztec.js": "latest"
   },
   "devDependencies": {
-    "@playwright/test": "^1.41.2",
+    "@playwright/test": "1.42.0",
     "@types/node": "^20.11.17",
     "copy-webpack-plugin": "^11.0.0",
     "html-webpack-plugin": "^5.6.0",

diff --git a/boxes/vanilla-js/playwright.config.ts b/boxes/vanilla-js/playwright.config.ts
@@ -1,19 +1,10 @@
 import { defineConfig, devices } from '@playwright/test';
 
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// require('dotenv').config();
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
 export default defineConfig({
   testDir: './tests',
   fullyParallel: true,
   retries: 3,
-  workers: 1,
+  workers: process.env.CI ? 1 : 3,
   reporter: 'list',
   use: {
     baseURL: 'http://127.0.0.1:5173',

diff --git a/boxes/vanilla-js/src/index.ts b/boxes/vanilla-js/src/index.ts
@@ -1,20 +1,14 @@
-import {
-  GrumpkinScalar,
-  createPXEClient,
-  AccountManager,
-  ContractDeployer,
-  Fr,
-  AccountWalletWithPrivateKey,
-} from '@aztec/aztec.js';
+import { GrumpkinScalar, createPXEClient, AccountManager, ContractDeployer, Fr, Wallet } from '@aztec/aztec.js';
 
 import { SingleKeyAccountContract } from '@aztec/accounts/single_key';
 import { VanillaContract } from '../artifacts/Vanilla';
 
 const privateKey: GrumpkinScalar = GrumpkinScalar.random();
 const pxe = createPXEClient(process.env.PXE_URL || 'http://localhost:8080');
+
 const account = new AccountManager(pxe, privateKey, new SingleKeyAccountContract(privateKey));
 let contract: any = null;
-let wallet: AccountWalletWithPrivateKey | null = null;
+let wallet: Wallet | null = null;
 
 const setWait = (state: boolean): void =>
   document.querySelectorAll('*').forEach((e: HTMLElement & HTMLButtonElement) => {
@@ -33,11 +27,11 @@ document.querySelector('#deploy').addEventListener('click', async ({ target }: a
     .send({ contractAddressSalt: Fr.random() })
     .deployed();
   contract = await at(contractAddress, wallet);
-  setWait(false);
-
   alert(`Contract deployed at ${contractAddress}`);
+
   target.hidden = true;
   document.querySelectorAll('#get, #set').forEach((e: HTMLButtonElement & HTMLFormElement) => (e.hidden = false));
+  setWait(false);
 });
 
 document.querySelector('#set').addEventListener('submit', async (e: Event) => {

diff --git a/boxes/vanilla-js/tests/test.spec.ts → boxes/vanilla-js/tests/browser.spec.ts b/boxes/vanilla-js/tests/test.spec.ts → boxes/vanilla-js/tests/browser.spec.ts
@@ -1,6 +1,7 @@
 import { test, expect } from '@playwright/test';
 
 test('Deploying, setting, and getting a number', async ({ page }) => {
+  test.slow();
   await page.goto('/');
 
   const handleDialog = (expectedMessage: string) => {