diff --git a/.github/actions/install/action.yml b/.github/actions/install/action.yml index fb56f25e..c70a4efe 100644 --- a/.github/actions/install/action.yml +++ b/.github/actions/install/action.yml @@ -12,7 +12,3 @@ runs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 - - - name: Install dependencies - run: yarn install --frozen-lockfile - shell: bash diff --git a/README.md b/README.md index 5cf27c5e..ab33e2fb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ User-end bundlers are provided in each chain-specific folder, instantiating all Install dependencies with `yarn`. -Run tests with `yarn test:forge --chain ` (chainid can be 1 or 8453). +Run tests with `yarn test --chain ` (chainid can be 1 or 8453). Note that the `EthereumBundlerV2` has been deployed with 80 000 optimizer runs. To compile contracts with the same configuration, run `FOUNDRY_PROFILE=ethereumBundlerV2 forge b`. diff --git a/package.json b/package.json index 1c6df4d9..62f55e86 100644 --- a/package.json +++ b/package.json @@ -20,28 +20,11 @@ "prepare": "forge install", "build": "FOUNDRY_PROFILE=build forge build", "test": "FOUNDRY_PROFILE=test forge test", - "test:local": "FOUNDRY_MATCH_CONTRACT=LocalTest yarn test:forge", - "test:fork": "FOUNDRY_MATCH_CONTRACT=ForkTest yarn test:forge", + "test:local": "FOUNDRY_MATCH_CONTRACT=LocalTest yarn test", + "test:fork": "FOUNDRY_MATCH_CONTRACT=ForkTest yarn test", "lint": "forge fmt", "lint:check": "forge fmt --check", "lint:fix": "forge fmt", "clean": "forge clean" - }, - "lint-staged": { - "*.sol": "forge fmt", - "*.json": "prettier", - "*.yml": "prettier" - }, - "prettier": { - "printWidth": 120, - "plugins": [ - "@trivago/prettier-plugin-sort-imports" - ], - "importOrder": [ - "^@", - "^\\.\\.", - "^\\." - ], - "importOrderSeparation": true } } diff --git a/test/MorphoBundlerLocalTest.sol b/test/MorphoBundlerLocalTest.sol index 2d8ad2f2..87ff570c 100644 --- a/test/MorphoBundlerLocalTest.sol +++ b/test/MorphoBundlerLocalTest.sol @@ -2,10 +2,7 @@ pragma solidity ^0.8.0; import { - Withdrawal, - FlowCapsConfig, - MAX_SETTABLE_FLOW_CAP, - IPublicAllocator + Withdrawal, FlowCapsConfig, MAX_SETTABLE_FLOW_CAP, IPublicAllocator } from "../src/interfaces/IPublicAllocator.sol"; import {SigUtils} from "./helpers/SigUtils.sol";