From 613bddcfab49fcc74553afa55f56a7df211b8a21 Mon Sep 17 00:00:00 2001 From: MathisGD Date: Tue, 7 May 2024 12:29:00 +0200 Subject: [PATCH] test: harmonization --- .github/workflows/foundry.yml | 2 +- package.json | 2 +- test/forge/fork/BundlerForkTest.sol | 2 +- test/forge/fork/Permit2BundlerForkTest.sol | 2 +- test/forge/fork/PermitBundlerForkTest.sol | 2 +- test/forge/fork/StEthBundlerForkTest.sol | 2 +- test/forge/fork/WNativeBundlerForkTest.sol | 2 +- test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol | 2 +- test/forge/fork/migration/AaveV3MigrationBundlerForkTest.sol | 2 +- .../fork/migration/AaveV3OptimizerMigrationBundlerForkTest.sol | 2 +- .../CompoundV2EthBorrowableMigrationBundlerForkTest.sol | 2 +- .../CompoundV2EthCollateralMigrationBundlerForkTest.sol | 2 +- .../fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol | 2 +- .../forge/fork/migration/CompoundV3MigrationBundlerForkTest.sol | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/foundry.yml b/.github/workflows/foundry.yml index 3f6421eb..64bc526d 100644 --- a/.github/workflows/foundry.yml +++ b/.github/workflows/foundry.yml @@ -145,7 +145,7 @@ jobs: - uses: ./.github/actions/install-cache - name: Run fork tests on chain ${{ matrix.chain }} in ${{ matrix.type }} mode - run: yarn test:forge:ethereum --chain ${{ matrix.chain }} + run: yarn test:forge:fork --chain ${{ matrix.chain }} env: ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }} FOUNDRY_FUZZ_RUNS: ${{ matrix.fuzz-runs }} diff --git a/package.json b/package.json index 2eff5a25..c0be05cb 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "typecheck": "tsc --noEmit", "test:forge": "FOUNDRY_PROFILE=test forge test", "test:forge:local": "FOUNDRY_MATCH_CONTRACT=LocalTest yarn test:forge", - "test:forge:ethereum": "FOUNDRY_MATCH_CONTRACT=EthereumTest yarn test:forge", + "test:forge:fork": "FOUNDRY_MATCH_CONTRACT=ForkTest yarn test:forge", "test:hardhat": "hardhat test", "lint": "yarn lint:forge && yarn lint:ts", "lint:ts": "prettier --check pkg", diff --git a/test/forge/fork/BundlerForkTest.sol b/test/forge/fork/BundlerForkTest.sol index a24e51e8..ee049bf2 100644 --- a/test/forge/fork/BundlerForkTest.sol +++ b/test/forge/fork/BundlerForkTest.sol @@ -8,7 +8,7 @@ import {BaseBundlerV2} from "../../../src/base/BaseBundlerV2.sol"; import "./helpers/ForkTest.sol"; -contract EthereumBundlerEthereumTest is ForkTest { +contract EthereumBundlerForkTest is ForkTest { using MathLib for uint256; using MorphoLib for IMorpho; using MorphoBalancesLib for IMorpho; diff --git a/test/forge/fork/Permit2BundlerForkTest.sol b/test/forge/fork/Permit2BundlerForkTest.sol index 399bc17f..01343c8f 100644 --- a/test/forge/fork/Permit2BundlerForkTest.sol +++ b/test/forge/fork/Permit2BundlerForkTest.sol @@ -9,7 +9,7 @@ import "./helpers/ForkTest.sol"; error InvalidNonce(); -contract Permit2BundlerEthereumTest is ForkTest { +contract Permit2BundlerForkTest is ForkTest { using SafeTransferLib for ERC20; function setUp() public override { diff --git a/test/forge/fork/PermitBundlerForkTest.sol b/test/forge/fork/PermitBundlerForkTest.sol index f28cdda2..6f2ee688 100644 --- a/test/forge/fork/PermitBundlerForkTest.sol +++ b/test/forge/fork/PermitBundlerForkTest.sol @@ -12,7 +12,7 @@ import "./helpers/ForkTest.sol"; /// @dev The unique EIP-712 domain domain separator for the DAI token contract on Ethereum. bytes32 constant DAI_DOMAIN_SEPARATOR = 0xdbb8cf42e1ecb028be3f3dbc922e1d878b963f411dc388ced501601c60f7c6f7; -contract EthereumPermitBundlerEthereumTest is ForkTest { +contract EthereumPermitBundlerForkTest is ForkTest { function setUp() public override { super.setUp(); diff --git a/test/forge/fork/StEthBundlerForkTest.sol b/test/forge/fork/StEthBundlerForkTest.sol index 2879f9d4..8fa68d4c 100644 --- a/test/forge/fork/StEthBundlerForkTest.sol +++ b/test/forge/fork/StEthBundlerForkTest.sol @@ -11,7 +11,7 @@ import "./helpers/ForkTest.sol"; bytes32 constant BEACON_BALANCE_POSITION = 0xa66d35f054e68143c18f32c990ed5cb972bb68a68f500cd2dd3a16bbf3686483; // keccak256("lido.Lido.beaconBalance"); -contract EthereumStEthBundlerEthereumTest is ForkTest { +contract EthereumStEthBundlerForkTest is ForkTest { using SafeTransferLib for ERC20; function setUp() public override { diff --git a/test/forge/fork/WNativeBundlerForkTest.sol b/test/forge/fork/WNativeBundlerForkTest.sol index 6767ec0a..ea24a8ca 100644 --- a/test/forge/fork/WNativeBundlerForkTest.sol +++ b/test/forge/fork/WNativeBundlerForkTest.sol @@ -7,7 +7,7 @@ import "../../../src/mocks/bundlers/WNativeBundlerMock.sol"; import "./helpers/ForkTest.sol"; -contract WNativeBundlerEthereumTest is ForkTest { +contract WNativeBundlerForkTest is ForkTest { function setUp() public override { super.setUp(); diff --git a/test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol b/test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol index 6a0d2bc5..a2467beb 100644 --- a/test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol +++ b/test/forge/fork/migration/AaveV2MigrationBundlerForkTest.sol @@ -9,7 +9,7 @@ import "../../../../src/migration/AaveV2MigrationBundlerV2.sol"; import "./helpers/MigrationForkTest.sol"; -contract AaveV2MigrationBundlerEthereumTest is MigrationForkTest { +contract AaveV2MigrationBundlerForkTest is MigrationForkTest { using SafeTransferLib for ERC20; using MarketParamsLib for MarketParams; using MorphoLib for IMorpho; diff --git a/test/forge/fork/migration/AaveV3MigrationBundlerForkTest.sol b/test/forge/fork/migration/AaveV3MigrationBundlerForkTest.sol index b9460e63..deb5ba2b 100644 --- a/test/forge/fork/migration/AaveV3MigrationBundlerForkTest.sol +++ b/test/forge/fork/migration/AaveV3MigrationBundlerForkTest.sol @@ -9,7 +9,7 @@ import "../../../../src/migration/AaveV3MigrationBundlerV2.sol"; import "./helpers/MigrationForkTest.sol"; -contract AaveV3MigrationBundlerEthereumTest is MigrationForkTest { +contract AaveV3MigrationBundlerForkTest is MigrationForkTest { using SafeTransferLib for ERC20; using MarketParamsLib for MarketParams; using MorphoLib for IMorpho; diff --git a/test/forge/fork/migration/AaveV3OptimizerMigrationBundlerForkTest.sol b/test/forge/fork/migration/AaveV3OptimizerMigrationBundlerForkTest.sol index ea21313d..ebec2285 100644 --- a/test/forge/fork/migration/AaveV3OptimizerMigrationBundlerForkTest.sol +++ b/test/forge/fork/migration/AaveV3OptimizerMigrationBundlerForkTest.sol @@ -7,7 +7,7 @@ import "../../../../src/migration/AaveV3OptimizerMigrationBundlerV2.sol"; import "./helpers/MigrationForkTest.sol"; -contract AaveV3OptimizerMigrationBundlerEthereumTest is MigrationForkTest { +contract AaveV3OptimizerMigrationBundlerForkTest is MigrationForkTest { using SafeTransferLib for ERC20; using MarketParamsLib for MarketParams; using MorphoLib for IMorpho; diff --git a/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerForkTest.sol b/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerForkTest.sol index a162d1b6..956d777e 100644 --- a/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerForkTest.sol +++ b/test/forge/fork/migration/CompoundV2EthBorrowableMigrationBundlerForkTest.sol @@ -7,7 +7,7 @@ import "../../../../src/migration/CompoundV2MigrationBundlerV2.sol"; import "./helpers/MigrationForkTest.sol"; -contract CompoundV2EthLoanMigrationBundlerEthereumTest is MigrationForkTest { +contract CompoundV2EthLoanMigrationBundlerForkTest is MigrationForkTest { using MathLib for uint256; using SafeTransferLib for ERC20; using MarketParamsLib for MarketParams; diff --git a/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerForkTest.sol b/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerForkTest.sol index 0fd19507..e4c08e98 100644 --- a/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerForkTest.sol +++ b/test/forge/fork/migration/CompoundV2EthCollateralMigrationBundlerForkTest.sol @@ -7,7 +7,7 @@ import "../../../../src/migration/CompoundV2MigrationBundlerV2.sol"; import "./helpers/MigrationForkTest.sol"; -contract CompoundV2EthCollateralMigrationBundlerEthereumTest is MigrationForkTest { +contract CompoundV2EthCollateralMigrationBundlerForkTest is MigrationForkTest { using MathLib for uint256; using SafeTransferLib for ERC20; using MarketParamsLib for MarketParams; diff --git a/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol b/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol index dd59a332..6c2aada0 100644 --- a/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol +++ b/test/forge/fork/migration/CompoundV2NoEthMigrationBundlerForkTest.sol @@ -7,7 +7,7 @@ import "../../../../src/migration/CompoundV2MigrationBundlerV2.sol"; import "./helpers/MigrationForkTest.sol"; -contract CompoundV2NoEthMigrationBundlerEthereumTest is MigrationForkTest { +contract CompoundV2NoEthMigrationBundlerForkTest is MigrationForkTest { using MathLib for uint256; using SafeTransferLib for ERC20; using MarketParamsLib for MarketParams; diff --git a/test/forge/fork/migration/CompoundV3MigrationBundlerForkTest.sol b/test/forge/fork/migration/CompoundV3MigrationBundlerForkTest.sol index 91e3c11f..4671cc2e 100644 --- a/test/forge/fork/migration/CompoundV3MigrationBundlerForkTest.sol +++ b/test/forge/fork/migration/CompoundV3MigrationBundlerForkTest.sol @@ -7,7 +7,7 @@ import "../../../../src/migration/CompoundV3MigrationBundlerV2.sol"; import "./helpers/MigrationForkTest.sol"; -contract CompoundV3MigrationBundlerEthereumTest is MigrationForkTest { +contract CompoundV3MigrationBundlerForkTest is MigrationForkTest { using SafeTransferLib for ERC20; using MarketParamsLib for MarketParams; using MorphoLib for IMorpho;