diff --git a/.github/workflows/e2e-evm.yml b/.github/workflows/e2e-evm.yml index 4e4f390c4..8e304b0ae 100644 --- a/.github/workflows/e2e-evm.yml +++ b/.github/workflows/e2e-evm.yml @@ -68,9 +68,7 @@ jobs: node-version: 18 - name: "just install" - run: | - hardhat compile - hardhat typechain + run: just install working-directory: "evm-e2e" - name: "Launch localnet" @@ -79,9 +77,7 @@ jobs: sleep 10 - name: "Run tests (just test)" - run: | - just test - + run: just test working-directory: "evm-e2e" env: JSON_RPC_ENDPOINT: http://127.0.0.1:8545 diff --git a/evm-e2e/justfile b/evm-e2e/justfile index 8ab9fb7d1..00aabeaa1 100644 --- a/evm-e2e/justfile +++ b/evm-e2e/justfile @@ -7,25 +7,10 @@ setup: #!/usr/bin/env bash just -l - # Install all dependencies -install: - #!/usr/bin/env bash - - # Check if the given binary is in the $PATH. - the_cmd="bun" - if which "$the_cmd" >/dev/null 2>&1; then - echo "✅ bun is installed." - else - log_error "$the_cmd is not present in \$PATH" - npm install -g bun@1.1.12 - fi - - bun install - -# Generate types from compiled contracts -gen-types: - bun run typechain --target=ethers-v6 contracts/*Compiled.json +install: + npm install + hardhat typechain # Runs the E2E tests test: @@ -33,4 +18,4 @@ test: # Format fmt: - bun run prettier --write "test/**/*.ts" + npm run format diff --git a/evm-e2e/package-lock.json b/evm-e2e/package-lock.json index 005e3ae4f..77f7df55d 100644 --- a/evm-e2e/package-lock.json +++ b/evm-e2e/package-lock.json @@ -15,8 +15,6 @@ "@typechain/ethers-v6": "^0.5.1", "@typechain/hardhat": "^9.1.0", "@types/jest": "^29.5.12", - "bun": "^1.1.30", - "bun-types": "^1.0.3", "dotenv": "^16.4.5", "eslint": "^8.0.0", "eslint-config-airbnb": "^19.0.4", @@ -2914,118 +2912,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@oven/bun-darwin-aarch64": { - "version": "1.1.30", - "resolved": "https://registry.npmjs.org/@oven/bun-darwin-aarch64/-/bun-darwin-aarch64-1.1.30.tgz", - "integrity": "sha512-D07QioP+QXlouvIqQIS+7r2zq4lTNd6he79rhKsRQRZGFf9i3NPu87zspUpCaFEu//DZ35DYTt+5anQpAzpoxA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@oven/bun-darwin-x64": { - "version": "1.1.30", - "resolved": "https://registry.npmjs.org/@oven/bun-darwin-x64/-/bun-darwin-x64-1.1.30.tgz", - "integrity": "sha512-xZ4gTehS6QwN6bsJfDycCNneKoUMaFUQhQg24bJzXS4JPDxeKg1W7PS5AE+U9apz5Dx6//+D4RwVpAPG2LXt0w==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@oven/bun-darwin-x64-baseline": { - "version": "1.1.30", - "resolved": "https://registry.npmjs.org/@oven/bun-darwin-x64-baseline/-/bun-darwin-x64-baseline-1.1.30.tgz", - "integrity": "sha512-1kFUCxHx7WuEbLDmqm0m2UKBd3S4Ln6qKQ4gxU4umMLFkmvDJn6PszDruFInxGKFLoTAmbXNYNVWkkG/ekt/Lg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@oven/bun-linux-aarch64": { - "version": "1.1.30", - "resolved": "https://registry.npmjs.org/@oven/bun-linux-aarch64/-/bun-linux-aarch64-1.1.30.tgz", - "integrity": "sha512-SfHHLlph6fptDXyyChcUkeDbEZr2ww1p2BucV6OrvzwTOPi8pVmXA4360YT8ggR/3AHPp4GO36VaD+FU2Ocbxw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@oven/bun-linux-x64": { - "version": "1.1.30", - "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64/-/bun-linux-x64-1.1.30.tgz", - "integrity": "sha512-1mC39jQSaECytEKAZdCZmv3ZreMsp7aoxnBwmJtVd2Z7urnw17PKi4dKkZd/R+AubsNYtXtW4jeM8SEa5sUJRw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@oven/bun-linux-x64-baseline": { - "version": "1.1.30", - "resolved": "https://registry.npmjs.org/@oven/bun-linux-x64-baseline/-/bun-linux-x64-baseline-1.1.30.tgz", - "integrity": "sha512-/b/VuNOaAYmsVk9MvfwKcCYARJPUg78hebxNyD5DSajAf3dqtUSnf7QYcq/3mxWH++N+gM7uRTrGksGS63+ZUw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@oven/bun-windows-x64": { - "version": "1.1.30", - "resolved": "https://registry.npmjs.org/@oven/bun-windows-x64/-/bun-windows-x64-1.1.30.tgz", - "integrity": "sha512-mdRjNtD9NIA8CiH6N1zrIVE6oAtDko/c29H1s00UA+5O/WhXhg95G8IyInD8hN3vAEz8H2lGBgLG2EGfSFxnGg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@oven/bun-windows-x64-baseline": { - "version": "1.1.30", - "resolved": "https://registry.npmjs.org/@oven/bun-windows-x64-baseline/-/bun-windows-x64-baseline-1.1.30.tgz", - "integrity": "sha512-ERQ4/ogzbFvHjpyHcnruc8bnryvDvUoiWi6vczfQ4M/idJc+Kg5VSEJiF5k7946rIZGamG6QWgRxtpIglD4/Zw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/@pkgr/core": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", @@ -3625,15 +3511,6 @@ "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", "dev": true }, - "node_modules/@types/ws": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz", - "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/yargs": { "version": "17.0.33", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", @@ -4505,47 +4382,6 @@ "dev": true, "license": "MIT" }, - "node_modules/bun": { - "version": "1.1.30", - "resolved": "https://registry.npmjs.org/bun/-/bun-1.1.30.tgz", - "integrity": "sha512-ysRL1pq10Xba0jqVLPrKU3YIv0ohfp3cTajCPtpjCyppbn3lfiAVNpGoHfyaxS17OlPmWmR67UZRPw/EueQuug==", - "cpu": [ - "arm64", - "x64" - ], - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "os": [ - "darwin", - "linux", - "win32" - ], - "bin": { - "bun": "bin/bun.exe", - "bunx": "bin/bun.exe" - }, - "optionalDependencies": { - "@oven/bun-darwin-aarch64": "1.1.30", - "@oven/bun-darwin-x64": "1.1.30", - "@oven/bun-darwin-x64-baseline": "1.1.30", - "@oven/bun-linux-aarch64": "1.1.30", - "@oven/bun-linux-x64": "1.1.30", - "@oven/bun-linux-x64-baseline": "1.1.30", - "@oven/bun-windows-x64": "1.1.30", - "@oven/bun-windows-x64-baseline": "1.1.30" - } - }, - "node_modules/bun-types": { - "version": "1.1.24", - "resolved": "https://registry.npmjs.org/bun-types/-/bun-types-1.1.24.tgz", - "integrity": "sha512-UNEcYawHWOVw9GYQdOgjJvTQduYlPckmRMqpBqfkWpUzeK2CZfEP/JOYBH6SMypyfkNg/Zsqf0olN6vMrSPg3w==", - "dev": true, - "dependencies": { - "@types/node": "~20.12.8", - "@types/ws": "~8.5.10" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", diff --git a/evm-e2e/package.json b/evm-e2e/package.json index 063cdebb5..149b78524 100644 --- a/evm-e2e/package.json +++ b/evm-e2e/package.json @@ -13,8 +13,6 @@ "@typechain/ethers-v6": "^0.5.1", "@typechain/hardhat": "^9.1.0", "@types/jest": "^29.5.12", - "bun": "^1.1.30", - "bun-types": "^1.0.3", "dotenv": "^16.4.5", "eslint": "^8.0.0", "eslint-config-airbnb": "^19.0.4",