Test with hardhat

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Test
-        run: yarn test:forge
+        run: yarn test:forge-with-hardhat
 
   test-hardhat:
     runs-on: ubuntu-latest

package.json

@@ -24,9 +24,10 @@
     "lint:solidity": "npx prettier --check --plugin=prettier-plugin-solidity 'contracts/**/*.sol' ''test/**/*.sol'' && npx solhint 'contracts/**/*.sol'",
     "lint:typescript": "NODE_NO_WARNINGS=1 eslint  --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
     "prettier": "npx prettier --write --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test/**/*.sol'",
-    "test": "yarn test:hardhat && yarn test:forge",
+    "test": "yarn test:forge",
     "test:hardhat": "hardhat test",
-    "test:forge": "yarn build && REUSING_HARDHAT_ARTIFACTS=true forge test --ffi -vvv",
+    "test:forge": "forge test --ffi -vvv",
+    "test:forge-with-hardhat": "yarn build && REUSING_HARDHAT_ARTIFACTS=true forge test --ffi -vvv",
     "coverage": "./coverage.sh forge",
     "coverage:hardhat": "./coverage.sh hardhat",
     "coverage:all": "./coverage.sh all"

test/foundry/utils/BaseAngstromTest.sol

@@ -13,6 +13,8 @@ import { AngstromBalancer } from "../../../contracts/AngstromBalancer.sol";
 contract BaseAngstromTest is BaseVaultTest {
     using ArrayHelpers for *;
 
+    string private artifactsRootDir = "artifacts/";
+
     AngstromBalancerMock internal angstromBalancer;
 
     bytes internal aliceSignature;
@@ -33,7 +35,18 @@ contract BaseAngstromTest is BaseVaultTest {
     }
 
     function createHook() internal override returns (address) {
-        angstromBalancer = new AngstromBalancerMock(vault, weth, permit2, "AngstromBalancer Mock v1");
+        if (reusingArtifacts) {
+            angstromBalancer = AngstromBalancerMock(
+                payable(
+                    deployCode(
+                        _computeAngstromBalancerTestPath(type(AngstromBalancerMock).name),
+                        abi.encode(vault, weth, permit2, "AngstromBalancer Mock v1")
+                    )
+                )
+            );
+        } else {
+            angstromBalancer = new AngstromBalancerMock(vault, weth, permit2, "AngstromBalancer Mock v1");
+        }
         authorizer.grantRole(angstromBalancer.getActionId(AngstromBalancer.toggleNodes.selector), admin);
 
         return address(angstromBalancer);
@@ -59,4 +72,8 @@ contract BaseAngstromTest is BaseVaultTest {
         signature = abi.encodePacked(r, s, v);
         userData = abi.encodePacked(signer, signature);
     }
+
+    function _computeAngstromBalancerTestPath(string memory name) private view returns (string memory) {
+        return string(abi.encodePacked(artifactsRootDir, "contracts/test/", name, ".sol/", name, ".json"));
+    }
 }