From f4eb5d86e028e058fd8dec7f6e6249817031dc25 Mon Sep 17 00:00:00 2001 From: Domen Grabec Date: Fri, 7 Jun 2024 22:34:40 +0200 Subject: [PATCH 1/3] remove the redundant '-test' in fork test names --- contracts/test/_global-hooks.js | 10 +++++----- ...ck.mainnet.fork-test.js => buyback.mainnet.fork.js} | 0 ...t.fork-test.js => ousd-harvest-crv.mainnet.fork.js} | 0 ....mainnet.fork-test.js => aura-feed.mainnet.fork.js} | 0 ...cle.mainnet.fork-test.js => oracle.mainnet.fork.js} | 0 ...-test.js => balancerMetaStablePool.mainnet.fork.js} | 0 ...-test.js => balancerPoolReentrancy.mainnet.fork.js} | 0 ...{flux.mainnet.fork-test.js => flux.mainnet.fork.js} | 0 ...th.mainnet.fork-test.js => fraxeth.mainnet.fork.js} | 0 ...et.fork-test.js => frxeth_strategy.mainnet.fork.js} | 0 ...t.fork-test.js => generalized-meta.mainnet.fork.js} | 0 ...ainnet.fork-test.js => morpho-aave.mainnet.fork.js} | 0 ...ainnet.fork-test.js => morpho-comp.mainnet.fork.js} | 0 ...nnet.fork-test.js => oeth-metapool.mainnet.fork.js} | 0 ...t.fork-test.js => oeth-morpho-aave.mainnet.fork.js} | 0 ...net.fork-test.js => ousd-maker-dsr.mainnet.fork.js} | 0 ... => ousd-metapool-3crv-tilted-pool.mainnet.fork.js} | 0 ....js => ousd-metapool-balanced-pool.mainnet.fork.js} | 0 ... => ousd-metapool-ousd-tilted-pool.mainnet.fork.js} | 0 ...{oeth.mainnet.fork-test.js => oeth.mainnet.fork.js} | 0 .../{woeth.arb.fork-test.js => woeth.arb.fork.js} | 0 ...t.fork-test.js => collateral-swaps.mainnet.fork.js} | 0 ....mainnet.fork-test.js => harvester.mainnet.fork.js} | 0 ...mainnet.fork-test.js => oeth-vault.mainnet.fork.js} | 0 ...ault.mainnet.fork-test.js => vault.mainnet.fork.js} | 0 ...et.fork-test.js => woethccipzapper.mainnet.fork.js} | 0 26 files changed, 5 insertions(+), 5 deletions(-) rename contracts/test/buyback/{buyback.mainnet.fork-test.js => buyback.mainnet.fork.js} (100%) rename contracts/test/harvest/{ousd-harvest-crv.mainnet.fork-test.js => ousd-harvest-crv.mainnet.fork.js} (100%) rename contracts/test/oracle/{aura-feed.mainnet.fork-test.js => aura-feed.mainnet.fork.js} (100%) rename contracts/test/oracle/{oracle.mainnet.fork-test.js => oracle.mainnet.fork.js} (100%) rename contracts/test/strategies/{balancerMetaStablePool.mainnet.fork-test.js => balancerMetaStablePool.mainnet.fork.js} (100%) rename contracts/test/strategies/{balancerPoolReentrancy.mainnet.fork-test.js => balancerPoolReentrancy.mainnet.fork.js} (100%) rename contracts/test/strategies/{flux.mainnet.fork-test.js => flux.mainnet.fork.js} (100%) rename contracts/test/strategies/{fraxeth.mainnet.fork-test.js => fraxeth.mainnet.fork.js} (100%) rename contracts/test/strategies/{frxeth_strategy.mainnet.fork-test.js => frxeth_strategy.mainnet.fork.js} (100%) rename contracts/test/strategies/{generalized-meta.mainnet.fork-test.js => generalized-meta.mainnet.fork.js} (100%) rename contracts/test/strategies/{morpho-aave.mainnet.fork-test.js => morpho-aave.mainnet.fork.js} (100%) rename contracts/test/strategies/{morpho-comp.mainnet.fork-test.js => morpho-comp.mainnet.fork.js} (100%) rename contracts/test/strategies/{oeth-metapool.mainnet.fork-test.js => oeth-metapool.mainnet.fork.js} (100%) rename contracts/test/strategies/{oeth-morpho-aave.mainnet.fork-test.js => oeth-morpho-aave.mainnet.fork.js} (100%) rename contracts/test/strategies/{ousd-maker-dsr.mainnet.fork-test.js => ousd-maker-dsr.mainnet.fork.js} (100%) rename contracts/test/strategies/{ousd-metapool-3crv-tilted-pool.mainnet.fork-test.js => ousd-metapool-3crv-tilted-pool.mainnet.fork.js} (100%) rename contracts/test/strategies/{ousd-metapool-balanced-pool.mainnet.fork-test.js => ousd-metapool-balanced-pool.mainnet.fork.js} (100%) rename contracts/test/strategies/{ousd-metapool-ousd-tilted-pool.mainnet.fork-test.js => ousd-metapool-ousd-tilted-pool.mainnet.fork.js} (100%) rename contracts/test/token/{oeth.mainnet.fork-test.js => oeth.mainnet.fork.js} (100%) rename contracts/test/token/{woeth.arb.fork-test.js => woeth.arb.fork.js} (100%) rename contracts/test/vault/{collateral-swaps.mainnet.fork-test.js => collateral-swaps.mainnet.fork.js} (100%) rename contracts/test/vault/{harvester.mainnet.fork-test.js => harvester.mainnet.fork.js} (100%) rename contracts/test/vault/{oeth-vault.mainnet.fork-test.js => oeth-vault.mainnet.fork.js} (100%) rename contracts/test/vault/{vault.mainnet.fork-test.js => vault.mainnet.fork.js} (100%) rename contracts/test/zapper/{woethccipzapper.mainnet.fork-test.js => woethccipzapper.mainnet.fork.js} (100%) diff --git a/contracts/test/_global-hooks.js b/contracts/test/_global-hooks.js index bd7b3a74d1..57f7ca311c 100644 --- a/contracts/test/_global-hooks.js +++ b/contracts/test/_global-hooks.js @@ -40,11 +40,11 @@ mocha.before(function () { // If you are running unit tests, scrape out all fork tests. // For fork tests, scrape out all unit tests. root.suites = root.suites.filter((s) => { - const isMainnetForkTestFile = s.file.endsWith("mainnet.fork-test.js"); - const isHoleskyTestFile = s.file.endsWith(".holesky.fork-test.js"); - const isArbTestFile = s.file.endsWith(".arb.fork-test.js"); - const isBaseTestFile = s.file.endsWith(".base.fork-test.js"); - const unitTest = !s.file.endsWith(".fork-test.js"); + const isMainnetForkTestFile = s.file.endsWith("mainnet.fork.js"); + const isHoleskyTestFile = s.file.endsWith(".holesky.fork.js"); + const isArbTestFile = s.file.endsWith(".arb.fork.js"); + const isBaseTestFile = s.file.endsWith(".base.fork.js"); + const unitTest = !s.file.endsWith(".fork.js"); if (isArbFork) { return isArbTestFile; diff --git a/contracts/test/buyback/buyback.mainnet.fork-test.js b/contracts/test/buyback/buyback.mainnet.fork.js similarity index 100% rename from contracts/test/buyback/buyback.mainnet.fork-test.js rename to contracts/test/buyback/buyback.mainnet.fork.js diff --git a/contracts/test/harvest/ousd-harvest-crv.mainnet.fork-test.js b/contracts/test/harvest/ousd-harvest-crv.mainnet.fork.js similarity index 100% rename from contracts/test/harvest/ousd-harvest-crv.mainnet.fork-test.js rename to contracts/test/harvest/ousd-harvest-crv.mainnet.fork.js diff --git a/contracts/test/oracle/aura-feed.mainnet.fork-test.js b/contracts/test/oracle/aura-feed.mainnet.fork.js similarity index 100% rename from contracts/test/oracle/aura-feed.mainnet.fork-test.js rename to contracts/test/oracle/aura-feed.mainnet.fork.js diff --git a/contracts/test/oracle/oracle.mainnet.fork-test.js b/contracts/test/oracle/oracle.mainnet.fork.js similarity index 100% rename from contracts/test/oracle/oracle.mainnet.fork-test.js rename to contracts/test/oracle/oracle.mainnet.fork.js diff --git a/contracts/test/strategies/balancerMetaStablePool.mainnet.fork-test.js b/contracts/test/strategies/balancerMetaStablePool.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/balancerMetaStablePool.mainnet.fork-test.js rename to contracts/test/strategies/balancerMetaStablePool.mainnet.fork.js diff --git a/contracts/test/strategies/balancerPoolReentrancy.mainnet.fork-test.js b/contracts/test/strategies/balancerPoolReentrancy.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/balancerPoolReentrancy.mainnet.fork-test.js rename to contracts/test/strategies/balancerPoolReentrancy.mainnet.fork.js diff --git a/contracts/test/strategies/flux.mainnet.fork-test.js b/contracts/test/strategies/flux.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/flux.mainnet.fork-test.js rename to contracts/test/strategies/flux.mainnet.fork.js diff --git a/contracts/test/strategies/fraxeth.mainnet.fork-test.js b/contracts/test/strategies/fraxeth.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/fraxeth.mainnet.fork-test.js rename to contracts/test/strategies/fraxeth.mainnet.fork.js diff --git a/contracts/test/strategies/frxeth_strategy.mainnet.fork-test.js b/contracts/test/strategies/frxeth_strategy.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/frxeth_strategy.mainnet.fork-test.js rename to contracts/test/strategies/frxeth_strategy.mainnet.fork.js diff --git a/contracts/test/strategies/generalized-meta.mainnet.fork-test.js b/contracts/test/strategies/generalized-meta.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/generalized-meta.mainnet.fork-test.js rename to contracts/test/strategies/generalized-meta.mainnet.fork.js diff --git a/contracts/test/strategies/morpho-aave.mainnet.fork-test.js b/contracts/test/strategies/morpho-aave.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/morpho-aave.mainnet.fork-test.js rename to contracts/test/strategies/morpho-aave.mainnet.fork.js diff --git a/contracts/test/strategies/morpho-comp.mainnet.fork-test.js b/contracts/test/strategies/morpho-comp.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/morpho-comp.mainnet.fork-test.js rename to contracts/test/strategies/morpho-comp.mainnet.fork.js diff --git a/contracts/test/strategies/oeth-metapool.mainnet.fork-test.js b/contracts/test/strategies/oeth-metapool.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/oeth-metapool.mainnet.fork-test.js rename to contracts/test/strategies/oeth-metapool.mainnet.fork.js diff --git a/contracts/test/strategies/oeth-morpho-aave.mainnet.fork-test.js b/contracts/test/strategies/oeth-morpho-aave.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/oeth-morpho-aave.mainnet.fork-test.js rename to contracts/test/strategies/oeth-morpho-aave.mainnet.fork.js diff --git a/contracts/test/strategies/ousd-maker-dsr.mainnet.fork-test.js b/contracts/test/strategies/ousd-maker-dsr.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/ousd-maker-dsr.mainnet.fork-test.js rename to contracts/test/strategies/ousd-maker-dsr.mainnet.fork.js diff --git a/contracts/test/strategies/ousd-metapool-3crv-tilted-pool.mainnet.fork-test.js b/contracts/test/strategies/ousd-metapool-3crv-tilted-pool.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/ousd-metapool-3crv-tilted-pool.mainnet.fork-test.js rename to contracts/test/strategies/ousd-metapool-3crv-tilted-pool.mainnet.fork.js diff --git a/contracts/test/strategies/ousd-metapool-balanced-pool.mainnet.fork-test.js b/contracts/test/strategies/ousd-metapool-balanced-pool.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/ousd-metapool-balanced-pool.mainnet.fork-test.js rename to contracts/test/strategies/ousd-metapool-balanced-pool.mainnet.fork.js diff --git a/contracts/test/strategies/ousd-metapool-ousd-tilted-pool.mainnet.fork-test.js b/contracts/test/strategies/ousd-metapool-ousd-tilted-pool.mainnet.fork.js similarity index 100% rename from contracts/test/strategies/ousd-metapool-ousd-tilted-pool.mainnet.fork-test.js rename to contracts/test/strategies/ousd-metapool-ousd-tilted-pool.mainnet.fork.js diff --git a/contracts/test/token/oeth.mainnet.fork-test.js b/contracts/test/token/oeth.mainnet.fork.js similarity index 100% rename from contracts/test/token/oeth.mainnet.fork-test.js rename to contracts/test/token/oeth.mainnet.fork.js diff --git a/contracts/test/token/woeth.arb.fork-test.js b/contracts/test/token/woeth.arb.fork.js similarity index 100% rename from contracts/test/token/woeth.arb.fork-test.js rename to contracts/test/token/woeth.arb.fork.js diff --git a/contracts/test/vault/collateral-swaps.mainnet.fork-test.js b/contracts/test/vault/collateral-swaps.mainnet.fork.js similarity index 100% rename from contracts/test/vault/collateral-swaps.mainnet.fork-test.js rename to contracts/test/vault/collateral-swaps.mainnet.fork.js diff --git a/contracts/test/vault/harvester.mainnet.fork-test.js b/contracts/test/vault/harvester.mainnet.fork.js similarity index 100% rename from contracts/test/vault/harvester.mainnet.fork-test.js rename to contracts/test/vault/harvester.mainnet.fork.js diff --git a/contracts/test/vault/oeth-vault.mainnet.fork-test.js b/contracts/test/vault/oeth-vault.mainnet.fork.js similarity index 100% rename from contracts/test/vault/oeth-vault.mainnet.fork-test.js rename to contracts/test/vault/oeth-vault.mainnet.fork.js diff --git a/contracts/test/vault/vault.mainnet.fork-test.js b/contracts/test/vault/vault.mainnet.fork.js similarity index 100% rename from contracts/test/vault/vault.mainnet.fork-test.js rename to contracts/test/vault/vault.mainnet.fork.js diff --git a/contracts/test/zapper/woethccipzapper.mainnet.fork-test.js b/contracts/test/zapper/woethccipzapper.mainnet.fork.js similarity index 100% rename from contracts/test/zapper/woethccipzapper.mainnet.fork-test.js rename to contracts/test/zapper/woethccipzapper.mainnet.fork.js From bb4cd8ee5ec4ca6f5485713113f91c67224c98f4 Mon Sep 17 00:00:00 2001 From: Domen Grabec Date: Sat, 8 Jun 2024 00:52:39 +0200 Subject: [PATCH 2/3] fix fork tests --- contracts/fork-test.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/contracts/fork-test.sh b/contracts/fork-test.sh index 915031e176..ee6d614cd2 100755 --- a/contracts/fork-test.sh +++ b/contracts/fork-test.sh @@ -69,17 +69,7 @@ main() cp -r deployments/localhost deployments/hardhat fi - if [ -z "$1" ]; then - if [[ $FORK_NETWORK_NAME == "holesky" ]]; then - # Run all files with `.holesky.fork-test.js` suffix when no file name param is given - # pass all other params along - params+="test/**/*.holesky.fork-test.js" - else - # Run all files with `.fork-test.js` suffix when no file name param is given - # pass all other params along - params+="test/**/*.fork-test.js" - fi - else + if [ ! -z "$1" ]; then # Run specifc files when a param is given params+="$@" fi From 10505ddbe241b5d304a93c81229f5cdb415d8525 Mon Sep 17 00:00:00 2001 From: Domen Grabec Date: Sat, 8 Jun 2024 01:00:58 +0200 Subject: [PATCH 3/3] undo change and add coverage report required parameters in --- contracts/fork-test.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/contracts/fork-test.sh b/contracts/fork-test.sh index ee6d614cd2..caf2cf2d67 100755 --- a/contracts/fork-test.sh +++ b/contracts/fork-test.sh @@ -69,7 +69,25 @@ main() cp -r deployments/localhost deployments/hardhat fi - if [ ! -z "$1" ]; then + if [ -z "$1" ]; then + if [[ $FORK_NETWORK_NAME == "holesky" ]]; then + # Run all files with `.holesky.fork.js` suffix when no file name param is given + # pass all other params along + params+="test/**/*.holesky.fork.js" + elif [[ $FORK_NETWORK_NAME == "arbitrumOne" ]]; then + # Run all files with `.arb.fork.js` suffix when no file name param is given + # pass all other params along + params+="test/**/*.arb.fork.js" + elif [[ $FORK_NETWORK_NAME == "base" ]]; then + # Run all files with `.base.fork.js` suffix when no file name param is given + # pass all other params along + params+="test/**/*.base.fork.js" + else + # Run all files with `.fork-test.js` suffix when no file name param is given + # pass all other params along + params+="test/**/*.fork.js" + fi + else # Run specifc files when a param is given params+="$@" fi