From 1fc309f79f818a8e7247723f52ff09d34913045a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Fingen?= Date: Thu, 12 Dec 2024 16:39:25 +0000 Subject: [PATCH] chore: Move test and script out of src --- .../{src => }/scripts/DeployGovernance.s.sol | 0 .../{src => }/scripts/DeployLiquity2.s.sol | 0 .../scripts/DeployOnlyExchangeHelpers.s.sol | 0 .../scripts/DeployOnlyGovernance.s.sol | 0 .../scripts/Interfaces/Balancer/IVault.sol | 0 .../Interfaces/Balancer/IWeightedPool.sol | 0 .../{src => }/scripts/LiquidateTrove.s.sol | 0 contracts/{src => }/scripts/OpenTroves.s.sol | 0 .../scripts/ProvideUniV3Liquidity.s.sol | 0 .../{src => }/scripts/RedeemCollateral.s.sol | 0 .../{test => test-js}/AccessControlTest.js | 0 .../BorrowerOperationsTest.js | 0 .../{test => test-js}/CollSurplusPool.js | 0 .../{test => test-js}/ConnectContractsTest.js | 0 .../{test => test-js}/FeeArithmeticTest.js | 0 .../{test => test-js}/GasCompensationTest.js | 0 .../HintHelpers_getApproxHintTest.js | 0 .../{test => test-js}/LiquityMathTest.js | 0 contracts/{test => test-js}/OwnershipTest.js | 0 contracts/{test => test-js}/PoolsTest.js | 0 .../{test => test-js}/SP_P_TruncationTest.js | 0 .../{test => test-js}/SortedTrovesTest.js | 0 .../{test => test-js}/StabilityPoolTest.js | 0 .../StabilityPool_SPWithdrawalTest.js | 0 .../{test => test-js}/TroveManagerTest.js | 0 .../TroveManager_LiquidationRewardsTest.js | 0 .../{test => test-js}/stakeDeclineTest.js | 0 contracts/{src => }/test/.gitignore | 0 .../test/AnchoredInvariantsTest.t.sol | 0 .../test/AnchoredSPInvariantsTest.t.sol | 0 contracts/{src => }/test/BoldToken.t.sol | 0 contracts/{src => }/test/HintHelpers.t.sol | 0 contracts/{src => }/test/Invariants.t.sol | 12 ++-- contracts/{src => }/test/OracleMainnet.t.sol | 18 ++--- contracts/{src => }/test/SPInvariants.t.sol | 6 +- contracts/{src => }/test/SortedTroves.t.sol | 6 +- .../{src => }/test/TestContracts/Accounts.sol | 0 .../TestContracts/AddRemoveManagersTester.sol | 2 +- .../test/TestContracts/Assertions.sol | 0 .../test/TestContracts/BaseHandler.sol | 0 .../test/TestContracts/BaseInvariantTest.sol | 0 .../TestContracts/BaseMultiCollateralTest.sol | 8 +-- .../{src => }/test/TestContracts/BaseTest.sol | 28 ++++---- .../test/TestContracts/BoldTokenTester.sol | 2 +- .../BorrowerOperationsTester.t.sol | 4 +- .../TestContracts/ChainlinkOracleMock.sol | 2 +- .../CollateralRegistryTester.sol | 2 +- .../TestContracts/CommunityIssuanceMock.sol | 0 .../test/TestContracts/Deployment.t.sol | 66 +++++++++---------- .../test/TestContracts/DevTestSetup.sol | 0 .../test/TestContracts/ERC20Faucet.sol | 0 .../test/TestContracts/ERC20MinterMock.sol | 0 .../Interfaces/IBorrowerOperationsTester.sol | 2 +- .../Interfaces/IPriceFeedMock.sol | 2 +- .../Interfaces/IPriceFeedTestnet.sol | 2 +- .../Interfaces/ITroveManagerTester.sol | 2 +- .../TestContracts/InvariantsTestHandler.t.sol | 20 +++--- .../test/TestContracts/LQTYStakingMock.sol | 0 .../test/TestContracts/LQTYTokenMock.sol | 4 +- .../test/TestContracts/LiquityMathTester.sol | 2 +- .../test/TestContracts/MetadataDeployment.sol | 0 .../test/TestContracts/MockInterestRouter.sol | 2 +- .../test/TestContracts/NonPayableSwitch.sol | 0 .../test/TestContracts/PriceFeedMock.sol | 0 .../test/TestContracts/PriceFeedTestnet.sol | 0 .../test/TestContracts/RETHTokenMock.sol | 2 +- .../SPInvariantsTestHandler.t.sol | 14 ++-- .../test/TestContracts/SortedTrovesTester.sol | 2 +- .../TestContracts/TroveManagerTester.t.sol | 6 +- .../{src => }/test/TestContracts/WETH.sol | 2 +- .../test/TestContracts/WETHTester.sol | 2 +- .../test/TestContracts/WSTETHTokenMock.sol | 2 +- contracts/{src => }/test/Utils/BatchIdSet.sol | 2 +- .../{src => }/test/Utils/EnumerableSet.sol | 0 contracts/{src => }/test/Utils/Logging.sol | 0 contracts/{src => }/test/Utils/Math.sol | 2 +- .../{src => }/test/Utils/StringFormatting.sol | 0 contracts/{src => }/test/Utils/Trove.sol | 2 +- contracts/{src => }/test/Utils/TroveId.sol | 0 .../test/Utils/UniPriceConverterLog.sol | 4 +- contracts/{src => }/test/basicOps.t.sol | 0 .../{src => }/test/batchManagementFee.t.sol | 0 .../{src => }/test/borrowerOperations.t.sol | 0 ...werOperationsOnBehalfTroveManagament.t.sol | 2 +- .../{src => }/test/criticalThreshold.t.sol | 0 contracts/{src => }/test/deployment.t.sol | 0 contracts/{src => }/test/events.t.sol | 4 +- .../test/interestBatchManagement.t.sol | 2 +- .../test/interestIndividualDelegation.t.sol | 2 +- .../test/interestRateAggregate.t.sol | 0 .../{src => }/test/interestRateBasic.t.sol | 0 .../{src => }/test/liquidationCosts.t.sol | 0 contracts/{src => }/test/liquidations.t.sol | 0 .../{src => }/test/liquidationsLST.t.sol | 0 .../{src => }/test/multicollateral.t.sol | 0 .../{src => }/test/rebasingBatchShares.t.sol | 0 contracts/{src => }/test/redemptions.t.sol | 0 contracts/{src => }/test/shutdown.t.sol | 0 contracts/{src => }/test/stabilityPool.t.sol | 0 contracts/{src => }/test/troveManager.t.sol | 0 contracts/{src => }/test/troveNFT.t.sol | 0 contracts/{src => }/test/zapperGasComp.t.sol | 2 +- contracts/{src => }/test/zapperLeverage.t.sol | 26 ++++---- contracts/{src => }/test/zapperWETH.t.sol | 2 +- 104 files changed, 136 insertions(+), 136 deletions(-) rename contracts/{src => }/scripts/DeployGovernance.s.sol (100%) rename contracts/{src => }/scripts/DeployLiquity2.s.sol (100%) rename contracts/{src => }/scripts/DeployOnlyExchangeHelpers.s.sol (100%) rename contracts/{src => }/scripts/DeployOnlyGovernance.s.sol (100%) rename contracts/{src => }/scripts/Interfaces/Balancer/IVault.sol (100%) rename contracts/{src => }/scripts/Interfaces/Balancer/IWeightedPool.sol (100%) rename contracts/{src => }/scripts/LiquidateTrove.s.sol (100%) rename contracts/{src => }/scripts/OpenTroves.s.sol (100%) rename contracts/{src => }/scripts/ProvideUniV3Liquidity.s.sol (100%) rename contracts/{src => }/scripts/RedeemCollateral.s.sol (100%) rename contracts/{test => test-js}/AccessControlTest.js (100%) rename contracts/{test => test-js}/BorrowerOperationsTest.js (100%) rename contracts/{test => test-js}/CollSurplusPool.js (100%) rename contracts/{test => test-js}/ConnectContractsTest.js (100%) rename contracts/{test => test-js}/FeeArithmeticTest.js (100%) rename contracts/{test => test-js}/GasCompensationTest.js (100%) rename contracts/{test => test-js}/HintHelpers_getApproxHintTest.js (100%) rename contracts/{test => test-js}/LiquityMathTest.js (100%) rename contracts/{test => test-js}/OwnershipTest.js (100%) rename contracts/{test => test-js}/PoolsTest.js (100%) rename contracts/{test => test-js}/SP_P_TruncationTest.js (100%) rename contracts/{test => test-js}/SortedTrovesTest.js (100%) rename contracts/{test => test-js}/StabilityPoolTest.js (100%) rename contracts/{test => test-js}/StabilityPool_SPWithdrawalTest.js (100%) rename contracts/{test => test-js}/TroveManagerTest.js (100%) rename contracts/{test => test-js}/TroveManager_LiquidationRewardsTest.js (100%) rename contracts/{test => test-js}/stakeDeclineTest.js (100%) rename contracts/{src => }/test/.gitignore (100%) rename contracts/{src => }/test/AnchoredInvariantsTest.t.sol (100%) rename contracts/{src => }/test/AnchoredSPInvariantsTest.t.sol (100%) rename contracts/{src => }/test/BoldToken.t.sol (100%) rename contracts/{src => }/test/HintHelpers.t.sol (100%) rename contracts/{src => }/test/Invariants.t.sol (98%) rename contracts/{src => }/test/OracleMainnet.t.sol (99%) rename contracts/{src => }/test/SPInvariants.t.sol (95%) rename contracts/{src => }/test/SortedTroves.t.sol (99%) rename contracts/{src => }/test/TestContracts/Accounts.sol (100%) rename contracts/{src => }/test/TestContracts/AddRemoveManagersTester.sol (92%) rename contracts/{src => }/test/TestContracts/Assertions.sol (100%) rename contracts/{src => }/test/TestContracts/BaseHandler.sol (100%) rename contracts/{src => }/test/TestContracts/BaseInvariantTest.sol (100%) rename contracts/{src => }/test/TestContracts/BaseMultiCollateralTest.sol (80%) rename contracts/{src => }/test/TestContracts/BaseTest.sol (97%) rename contracts/{src => }/test/TestContracts/BoldTokenTester.sol (90%) rename contracts/{src => }/test/TestContracts/BorrowerOperationsTester.t.sol (93%) rename contracts/{src => }/test/TestContracts/ChainlinkOracleMock.sol (95%) rename contracts/{src => }/test/TestContracts/CollateralRegistryTester.sol (96%) rename contracts/{src => }/test/TestContracts/CommunityIssuanceMock.sol (100%) rename contracts/{src => }/test/TestContracts/Deployment.t.sol (96%) rename contracts/{src => }/test/TestContracts/DevTestSetup.sol (100%) rename contracts/{src => }/test/TestContracts/ERC20Faucet.sol (100%) rename contracts/{src => }/test/TestContracts/ERC20MinterMock.sol (100%) rename contracts/{src => }/test/TestContracts/Interfaces/IBorrowerOperationsTester.sol (91%) rename contracts/{src => }/test/TestContracts/Interfaces/IPriceFeedMock.sol (77%) rename contracts/{src => }/test/TestContracts/Interfaces/IPriceFeedTestnet.sol (83%) rename contracts/{src => }/test/TestContracts/Interfaces/ITroveManagerTester.sol (98%) rename contracts/{src => }/test/TestContracts/InvariantsTestHandler.t.sol (99%) rename contracts/{src => }/test/TestContracts/LQTYStakingMock.sol (100%) rename contracts/{src => }/test/TestContracts/LQTYTokenMock.sol (79%) rename contracts/{src => }/test/TestContracts/LiquityMathTester.sol (93%) rename contracts/{src => }/test/TestContracts/MetadataDeployment.sol (100%) rename contracts/{src => }/test/TestContracts/MockInterestRouter.sol (69%) rename contracts/{src => }/test/TestContracts/NonPayableSwitch.sol (100%) rename contracts/{src => }/test/TestContracts/PriceFeedMock.sol (100%) rename contracts/{src => }/test/TestContracts/PriceFeedTestnet.sol (100%) rename contracts/{src => }/test/TestContracts/RETHTokenMock.sol (81%) rename contracts/{src => }/test/TestContracts/SPInvariantsTestHandler.t.sol (95%) rename contracts/{src => }/test/TestContracts/SortedTrovesTester.sol (96%) rename contracts/{src => }/test/TestContracts/TroveManagerTester.t.sol (99%) rename contracts/{src => }/test/TestContracts/WETH.sol (98%) rename contracts/{src => }/test/TestContracts/WETHTester.sol (95%) rename contracts/{src => }/test/TestContracts/WSTETHTokenMock.sol (95%) rename contracts/{src => }/test/Utils/BatchIdSet.sol (93%) rename contracts/{src => }/test/Utils/EnumerableSet.sol (100%) rename contracts/{src => }/test/Utils/Logging.sol (100%) rename contracts/{src => }/test/Utils/Math.sol (92%) rename contracts/{src => }/test/Utils/StringFormatting.sol (100%) rename contracts/{src => }/test/Utils/Trove.sol (96%) rename contracts/{src => }/test/Utils/TroveId.sol (100%) rename contracts/{src => }/test/Utils/UniPriceConverterLog.sol (90%) rename contracts/{src => }/test/basicOps.t.sol (100%) rename contracts/{src => }/test/batchManagementFee.t.sol (100%) rename contracts/{src => }/test/borrowerOperations.t.sol (100%) rename contracts/{src => }/test/borrowerOperationsOnBehalfTroveManagament.t.sol (99%) rename contracts/{src => }/test/criticalThreshold.t.sol (100%) rename contracts/{src => }/test/deployment.t.sol (100%) rename contracts/{src => }/test/events.t.sol (99%) rename contracts/{src => }/test/interestBatchManagement.t.sol (99%) rename contracts/{src => }/test/interestIndividualDelegation.t.sol (99%) rename contracts/{src => }/test/interestRateAggregate.t.sol (100%) rename contracts/{src => }/test/interestRateBasic.t.sol (100%) rename contracts/{src => }/test/liquidationCosts.t.sol (100%) rename contracts/{src => }/test/liquidations.t.sol (100%) rename contracts/{src => }/test/liquidationsLST.t.sol (100%) rename contracts/{src => }/test/multicollateral.t.sol (100%) rename contracts/{src => }/test/rebasingBatchShares.t.sol (100%) rename contracts/{src => }/test/redemptions.t.sol (100%) rename contracts/{src => }/test/shutdown.t.sol (100%) rename contracts/{src => }/test/stabilityPool.t.sol (100%) rename contracts/{src => }/test/troveManager.t.sol (100%) rename contracts/{src => }/test/troveNFT.t.sol (100%) rename contracts/{src => }/test/zapperGasComp.t.sol (99%) rename contracts/{src => }/test/zapperLeverage.t.sol (98%) rename contracts/{src => }/test/zapperWETH.t.sol (99%) diff --git a/contracts/src/scripts/DeployGovernance.s.sol b/contracts/scripts/DeployGovernance.s.sol similarity index 100% rename from contracts/src/scripts/DeployGovernance.s.sol rename to contracts/scripts/DeployGovernance.s.sol diff --git a/contracts/src/scripts/DeployLiquity2.s.sol b/contracts/scripts/DeployLiquity2.s.sol similarity index 100% rename from contracts/src/scripts/DeployLiquity2.s.sol rename to contracts/scripts/DeployLiquity2.s.sol diff --git a/contracts/src/scripts/DeployOnlyExchangeHelpers.s.sol b/contracts/scripts/DeployOnlyExchangeHelpers.s.sol similarity index 100% rename from contracts/src/scripts/DeployOnlyExchangeHelpers.s.sol rename to contracts/scripts/DeployOnlyExchangeHelpers.s.sol diff --git a/contracts/src/scripts/DeployOnlyGovernance.s.sol b/contracts/scripts/DeployOnlyGovernance.s.sol similarity index 100% rename from contracts/src/scripts/DeployOnlyGovernance.s.sol rename to contracts/scripts/DeployOnlyGovernance.s.sol diff --git a/contracts/src/scripts/Interfaces/Balancer/IVault.sol b/contracts/scripts/Interfaces/Balancer/IVault.sol similarity index 100% rename from contracts/src/scripts/Interfaces/Balancer/IVault.sol rename to contracts/scripts/Interfaces/Balancer/IVault.sol diff --git a/contracts/src/scripts/Interfaces/Balancer/IWeightedPool.sol b/contracts/scripts/Interfaces/Balancer/IWeightedPool.sol similarity index 100% rename from contracts/src/scripts/Interfaces/Balancer/IWeightedPool.sol rename to contracts/scripts/Interfaces/Balancer/IWeightedPool.sol diff --git a/contracts/src/scripts/LiquidateTrove.s.sol b/contracts/scripts/LiquidateTrove.s.sol similarity index 100% rename from contracts/src/scripts/LiquidateTrove.s.sol rename to contracts/scripts/LiquidateTrove.s.sol diff --git a/contracts/src/scripts/OpenTroves.s.sol b/contracts/scripts/OpenTroves.s.sol similarity index 100% rename from contracts/src/scripts/OpenTroves.s.sol rename to contracts/scripts/OpenTroves.s.sol diff --git a/contracts/src/scripts/ProvideUniV3Liquidity.s.sol b/contracts/scripts/ProvideUniV3Liquidity.s.sol similarity index 100% rename from contracts/src/scripts/ProvideUniV3Liquidity.s.sol rename to contracts/scripts/ProvideUniV3Liquidity.s.sol diff --git a/contracts/src/scripts/RedeemCollateral.s.sol b/contracts/scripts/RedeemCollateral.s.sol similarity index 100% rename from contracts/src/scripts/RedeemCollateral.s.sol rename to contracts/scripts/RedeemCollateral.s.sol diff --git a/contracts/test/AccessControlTest.js b/contracts/test-js/AccessControlTest.js similarity index 100% rename from contracts/test/AccessControlTest.js rename to contracts/test-js/AccessControlTest.js diff --git a/contracts/test/BorrowerOperationsTest.js b/contracts/test-js/BorrowerOperationsTest.js similarity index 100% rename from contracts/test/BorrowerOperationsTest.js rename to contracts/test-js/BorrowerOperationsTest.js diff --git a/contracts/test/CollSurplusPool.js b/contracts/test-js/CollSurplusPool.js similarity index 100% rename from contracts/test/CollSurplusPool.js rename to contracts/test-js/CollSurplusPool.js diff --git a/contracts/test/ConnectContractsTest.js b/contracts/test-js/ConnectContractsTest.js similarity index 100% rename from contracts/test/ConnectContractsTest.js rename to contracts/test-js/ConnectContractsTest.js diff --git a/contracts/test/FeeArithmeticTest.js b/contracts/test-js/FeeArithmeticTest.js similarity index 100% rename from contracts/test/FeeArithmeticTest.js rename to contracts/test-js/FeeArithmeticTest.js diff --git a/contracts/test/GasCompensationTest.js b/contracts/test-js/GasCompensationTest.js similarity index 100% rename from contracts/test/GasCompensationTest.js rename to contracts/test-js/GasCompensationTest.js diff --git a/contracts/test/HintHelpers_getApproxHintTest.js b/contracts/test-js/HintHelpers_getApproxHintTest.js similarity index 100% rename from contracts/test/HintHelpers_getApproxHintTest.js rename to contracts/test-js/HintHelpers_getApproxHintTest.js diff --git a/contracts/test/LiquityMathTest.js b/contracts/test-js/LiquityMathTest.js similarity index 100% rename from contracts/test/LiquityMathTest.js rename to contracts/test-js/LiquityMathTest.js diff --git a/contracts/test/OwnershipTest.js b/contracts/test-js/OwnershipTest.js similarity index 100% rename from contracts/test/OwnershipTest.js rename to contracts/test-js/OwnershipTest.js diff --git a/contracts/test/PoolsTest.js b/contracts/test-js/PoolsTest.js similarity index 100% rename from contracts/test/PoolsTest.js rename to contracts/test-js/PoolsTest.js diff --git a/contracts/test/SP_P_TruncationTest.js b/contracts/test-js/SP_P_TruncationTest.js similarity index 100% rename from contracts/test/SP_P_TruncationTest.js rename to contracts/test-js/SP_P_TruncationTest.js diff --git a/contracts/test/SortedTrovesTest.js b/contracts/test-js/SortedTrovesTest.js similarity index 100% rename from contracts/test/SortedTrovesTest.js rename to contracts/test-js/SortedTrovesTest.js diff --git a/contracts/test/StabilityPoolTest.js b/contracts/test-js/StabilityPoolTest.js similarity index 100% rename from contracts/test/StabilityPoolTest.js rename to contracts/test-js/StabilityPoolTest.js diff --git a/contracts/test/StabilityPool_SPWithdrawalTest.js b/contracts/test-js/StabilityPool_SPWithdrawalTest.js similarity index 100% rename from contracts/test/StabilityPool_SPWithdrawalTest.js rename to contracts/test-js/StabilityPool_SPWithdrawalTest.js diff --git a/contracts/test/TroveManagerTest.js b/contracts/test-js/TroveManagerTest.js similarity index 100% rename from contracts/test/TroveManagerTest.js rename to contracts/test-js/TroveManagerTest.js diff --git a/contracts/test/TroveManager_LiquidationRewardsTest.js b/contracts/test-js/TroveManager_LiquidationRewardsTest.js similarity index 100% rename from contracts/test/TroveManager_LiquidationRewardsTest.js rename to contracts/test-js/TroveManager_LiquidationRewardsTest.js diff --git a/contracts/test/stakeDeclineTest.js b/contracts/test-js/stakeDeclineTest.js similarity index 100% rename from contracts/test/stakeDeclineTest.js rename to contracts/test-js/stakeDeclineTest.js diff --git a/contracts/src/test/.gitignore b/contracts/test/.gitignore similarity index 100% rename from contracts/src/test/.gitignore rename to contracts/test/.gitignore diff --git a/contracts/src/test/AnchoredInvariantsTest.t.sol b/contracts/test/AnchoredInvariantsTest.t.sol similarity index 100% rename from contracts/src/test/AnchoredInvariantsTest.t.sol rename to contracts/test/AnchoredInvariantsTest.t.sol diff --git a/contracts/src/test/AnchoredSPInvariantsTest.t.sol b/contracts/test/AnchoredSPInvariantsTest.t.sol similarity index 100% rename from contracts/src/test/AnchoredSPInvariantsTest.t.sol rename to contracts/test/AnchoredSPInvariantsTest.t.sol diff --git a/contracts/src/test/BoldToken.t.sol b/contracts/test/BoldToken.t.sol similarity index 100% rename from contracts/src/test/BoldToken.t.sol rename to contracts/test/BoldToken.t.sol diff --git a/contracts/src/test/HintHelpers.t.sol b/contracts/test/HintHelpers.t.sol similarity index 100% rename from contracts/src/test/HintHelpers.t.sol rename to contracts/test/HintHelpers.t.sol diff --git a/contracts/src/test/Invariants.t.sol b/contracts/test/Invariants.t.sol similarity index 98% rename from contracts/src/test/Invariants.t.sol rename to contracts/test/Invariants.t.sol index 7fea6727..09da32b0 100644 --- a/contracts/src/test/Invariants.t.sol +++ b/contracts/test/Invariants.t.sol @@ -4,12 +4,12 @@ pragma solidity 0.8.24; import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"; import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol"; import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol"; -import {BatchId} from "../Types/BatchId.sol"; -import {LatestBatchData} from "../Types/LatestBatchData.sol"; -import {LatestTroveData} from "../Types/LatestTroveData.sol"; -import {ISortedTroves} from "../Interfaces/ISortedTroves.sol"; -import {IStabilityPool} from "../Interfaces/IStabilityPool.sol"; -import {ITroveManager} from "../Interfaces/ITroveManager.sol"; +import {BatchId} from "src/Types/BatchId.sol"; +import {LatestBatchData} from "src/Types/LatestBatchData.sol"; +import {LatestTroveData} from "src/Types/LatestTroveData.sol"; +import {ISortedTroves} from "src/Interfaces/ISortedTroves.sol"; +import {IStabilityPool} from "src/Interfaces/IStabilityPool.sol"; +import {ITroveManager} from "src/Interfaces/ITroveManager.sol"; import {BatchIdSet} from "./Utils/BatchIdSet.sol"; import {Logging} from "./Utils/Logging.sol"; import {StringFormatting} from "./Utils/StringFormatting.sol"; diff --git a/contracts/src/test/OracleMainnet.t.sol b/contracts/test/OracleMainnet.t.sol similarity index 99% rename from contracts/src/test/OracleMainnet.t.sol rename to contracts/test/OracleMainnet.t.sol index 772932b2..b096b898 100644 --- a/contracts/src/test/OracleMainnet.t.sol +++ b/contracts/test/OracleMainnet.t.sol @@ -2,10 +2,10 @@ pragma solidity 0.8.24; -import "../PriceFeeds/WSTETHPriceFeed.sol"; -import "../PriceFeeds/MainnetPriceFeedBase.sol"; -import "../PriceFeeds/RETHPriceFeed.sol"; -import "../PriceFeeds/WETHPriceFeed.sol"; +import "src/PriceFeeds/WSTETHPriceFeed.sol"; +import "src/PriceFeeds/MainnetPriceFeedBase.sol"; +import "src/PriceFeeds/RETHPriceFeed.sol"; +import "src/PriceFeeds/WETHPriceFeed.sol"; import "./TestContracts/Accounts.sol"; import "./TestContracts/ChainlinkOracleMock.sol"; @@ -13,12 +13,12 @@ import "./TestContracts/RETHTokenMock.sol"; import "./TestContracts/WSTETHTokenMock.sol"; import "./TestContracts/Deployment.t.sol"; -import "../Dependencies/AggregatorV3Interface.sol"; -import "../Interfaces/IRETHPriceFeed.sol"; -import "../Interfaces/IWSTETHPriceFeed.sol"; +import "src/Dependencies/AggregatorV3Interface.sol"; +import "src/Interfaces/IRETHPriceFeed.sol"; +import "src/Interfaces/IWSTETHPriceFeed.sol"; -import "../Interfaces/IRETHToken.sol"; -import "../Interfaces/IWSTETH.sol"; +import "src/Interfaces/IRETHToken.sol"; +import "src/Interfaces/IWSTETH.sol"; import "forge-std/Test.sol"; import "lib/forge-std/src/console2.sol"; diff --git a/contracts/src/test/SPInvariants.t.sol b/contracts/test/SPInvariants.t.sol similarity index 95% rename from contracts/src/test/SPInvariants.t.sol rename to contracts/test/SPInvariants.t.sol index 4595b263..dd6cc3b5 100644 --- a/contracts/src/test/SPInvariants.t.sol +++ b/contracts/test/SPInvariants.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {IBoldToken} from "../Interfaces/IBoldToken.sol"; -import {IStabilityPool} from "../Interfaces/IStabilityPool.sol"; -import {HintHelpers} from "../HintHelpers.sol"; +import {IBoldToken} from "src/Interfaces/IBoldToken.sol"; +import {IStabilityPool} from "src/Interfaces/IStabilityPool.sol"; +import {HintHelpers} from "src/HintHelpers.sol"; import {Assertions} from "./TestContracts/Assertions.sol"; import {BaseInvariantTest} from "./TestContracts/BaseInvariantTest.sol"; import {TestDeployer} from "./TestContracts/Deployment.t.sol"; diff --git a/contracts/src/test/SortedTroves.t.sol b/contracts/test/SortedTroves.t.sol similarity index 99% rename from contracts/src/test/SortedTroves.t.sol rename to contracts/test/SortedTroves.t.sol index f4a18a1a..eb9898f9 100644 --- a/contracts/src/test/SortedTroves.t.sol +++ b/contracts/test/SortedTroves.t.sol @@ -2,9 +2,9 @@ pragma solidity 0.8.24; import "forge-std/Test.sol"; -import "../SortedTroves.sol"; -import "../AddressesRegistry.sol"; -import "../Types/TroveId.sol"; +import "src/SortedTroves.sol"; +import "src/AddressesRegistry.sol"; +import "src/Types/TroveId.sol"; uint256 constant FUZZ_INPUT_LENGTH = 9; diff --git a/contracts/src/test/TestContracts/Accounts.sol b/contracts/test/TestContracts/Accounts.sol similarity index 100% rename from contracts/src/test/TestContracts/Accounts.sol rename to contracts/test/TestContracts/Accounts.sol diff --git a/contracts/src/test/TestContracts/AddRemoveManagersTester.sol b/contracts/test/TestContracts/AddRemoveManagersTester.sol similarity index 92% rename from contracts/src/test/TestContracts/AddRemoveManagersTester.sol rename to contracts/test/TestContracts/AddRemoveManagersTester.sol index e5dc4912..735ee8b2 100644 --- a/contracts/src/test/TestContracts/AddRemoveManagersTester.sol +++ b/contracts/test/TestContracts/AddRemoveManagersTester.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.18; -import "../../Dependencies/AddRemoveManagers.sol"; +import "src/Dependencies/AddRemoveManagers.sol"; contract AddRemoveManagersTester is AddRemoveManagers { constructor(IAddressesRegistry _addressesRegistry) AddRemoveManagers(_addressesRegistry) {} diff --git a/contracts/src/test/TestContracts/Assertions.sol b/contracts/test/TestContracts/Assertions.sol similarity index 100% rename from contracts/src/test/TestContracts/Assertions.sol rename to contracts/test/TestContracts/Assertions.sol diff --git a/contracts/src/test/TestContracts/BaseHandler.sol b/contracts/test/TestContracts/BaseHandler.sol similarity index 100% rename from contracts/src/test/TestContracts/BaseHandler.sol rename to contracts/test/TestContracts/BaseHandler.sol diff --git a/contracts/src/test/TestContracts/BaseInvariantTest.sol b/contracts/test/TestContracts/BaseInvariantTest.sol similarity index 100% rename from contracts/src/test/TestContracts/BaseInvariantTest.sol rename to contracts/test/TestContracts/BaseInvariantTest.sol diff --git a/contracts/src/test/TestContracts/BaseMultiCollateralTest.sol b/contracts/test/TestContracts/BaseMultiCollateralTest.sol similarity index 80% rename from contracts/src/test/TestContracts/BaseMultiCollateralTest.sol rename to contracts/test/TestContracts/BaseMultiCollateralTest.sol index 2e771c8a..b7c1b1d4 100644 --- a/contracts/src/test/TestContracts/BaseMultiCollateralTest.sol +++ b/contracts/test/TestContracts/BaseMultiCollateralTest.sol @@ -2,10 +2,10 @@ pragma solidity 0.8.24; import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"; -import {IBoldToken} from "../../Interfaces/IBoldToken.sol"; -import {ICollateralRegistry} from "../../Interfaces/ICollateralRegistry.sol"; -import {IWETH} from "../../Interfaces/IWETH.sol"; -import {HintHelpers} from "../../HintHelpers.sol"; +import {IBoldToken} from "src/Interfaces/IBoldToken.sol"; +import {ICollateralRegistry} from "src/Interfaces/ICollateralRegistry.sol"; +import {IWETH} from "src/Interfaces/IWETH.sol"; +import {HintHelpers} from "src/HintHelpers.sol"; import {TestDeployer} from "./Deployment.t.sol"; contract BaseMultiCollateralTest { diff --git a/contracts/src/test/TestContracts/BaseTest.sol b/contracts/test/TestContracts/BaseTest.sol similarity index 97% rename from contracts/src/test/TestContracts/BaseTest.sol rename to contracts/test/TestContracts/BaseTest.sol index 45f01c71..313d8ee2 100644 --- a/contracts/src/test/TestContracts/BaseTest.sol +++ b/contracts/test/TestContracts/BaseTest.sol @@ -2,23 +2,23 @@ pragma solidity 0.8.24; import "./Accounts.sol"; -import "../../Interfaces/IActivePool.sol"; -import "../../Interfaces/IBoldToken.sol"; -import "../../Interfaces/ICollSurplusPool.sol"; -import "../../Interfaces/IDefaultPool.sol"; -import "../../Interfaces/IPriceFeed.sol"; -import "../../Interfaces/ISortedTroves.sol"; -import "../../Interfaces/IStabilityPool.sol"; +import "src/Interfaces/IActivePool.sol"; +import "src/Interfaces/IBoldToken.sol"; +import "src/Interfaces/ICollSurplusPool.sol"; +import "src/Interfaces/IDefaultPool.sol"; +import "src/Interfaces/IPriceFeed.sol"; +import "src/Interfaces/ISortedTroves.sol"; +import "src/Interfaces/IStabilityPool.sol"; import "./BorrowerOperationsTester.t.sol"; import "./TroveManagerTester.t.sol"; -import "../../Interfaces/ICollateralRegistry.sol"; +import "src/Interfaces/ICollateralRegistry.sol"; import "./PriceFeedTestnet.sol"; -import "../../Interfaces/IInterestRouter.sol"; -import "../../GasPool.sol"; -import "../../HintHelpers.sol"; -import "../../Zappers/WETHZapper.sol"; -import "../../Zappers/GasCompZapper.sol"; -import "../../Zappers/LeverageLSTZapper.sol"; +import "src/Interfaces/IInterestRouter.sol"; +import "src/GasPool.sol"; +import "src/HintHelpers.sol"; +import "src/Zappers/WETHZapper.sol"; +import "src/Zappers/GasCompZapper.sol"; +import "src/Zappers/LeverageLSTZapper.sol"; import {mulDivCeil} from "../Utils/Math.sol"; import {Logging} from "../Utils/Logging.sol"; import {StringFormatting} from "../Utils/StringFormatting.sol"; diff --git a/contracts/src/test/TestContracts/BoldTokenTester.sol b/contracts/test/TestContracts/BoldTokenTester.sol similarity index 90% rename from contracts/src/test/TestContracts/BoldTokenTester.sol rename to contracts/test/TestContracts/BoldTokenTester.sol index 66b0fdda..eaa91247 100644 --- a/contracts/src/test/TestContracts/BoldTokenTester.sol +++ b/contracts/test/TestContracts/BoldTokenTester.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../BoldToken.sol"; +import "src/BoldToken.sol"; contract BoldTokenTester is BoldToken { constructor(address _owner) BoldToken(_owner) {} diff --git a/contracts/src/test/TestContracts/BorrowerOperationsTester.t.sol b/contracts/test/TestContracts/BorrowerOperationsTester.t.sol similarity index 93% rename from contracts/src/test/TestContracts/BorrowerOperationsTester.t.sol rename to contracts/test/TestContracts/BorrowerOperationsTester.t.sol index 9433c408..ab24961d 100644 --- a/contracts/src/test/TestContracts/BorrowerOperationsTester.t.sol +++ b/contracts/test/TestContracts/BorrowerOperationsTester.t.sol @@ -2,8 +2,8 @@ pragma solidity 0.8.24; -import "../../Interfaces/IAddressesRegistry.sol"; -import "../../BorrowerOperations.sol"; +import "src/Interfaces/IAddressesRegistry.sol"; +import "src/BorrowerOperations.sol"; import "./Interfaces/IBorrowerOperationsTester.sol"; /* Tester contract inherits from BorrowerOperations, and provides external functions diff --git a/contracts/src/test/TestContracts/ChainlinkOracleMock.sol b/contracts/test/TestContracts/ChainlinkOracleMock.sol similarity index 95% rename from contracts/src/test/TestContracts/ChainlinkOracleMock.sol rename to contracts/test/TestContracts/ChainlinkOracleMock.sol index 54b02e7e..df13d22f 100644 --- a/contracts/src/test/TestContracts/ChainlinkOracleMock.sol +++ b/contracts/test/TestContracts/ChainlinkOracleMock.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../Dependencies/AggregatorV3Interface.sol"; +import "src/Dependencies/AggregatorV3Interface.sol"; // Mock Chainlink oracle that returns a stale price answer. // this contract code is etched over mainnet oracle addresses in mainnet fork tests. diff --git a/contracts/src/test/TestContracts/CollateralRegistryTester.sol b/contracts/test/TestContracts/CollateralRegistryTester.sol similarity index 96% rename from contracts/src/test/TestContracts/CollateralRegistryTester.sol rename to contracts/test/TestContracts/CollateralRegistryTester.sol index 7bda2103..e6254944 100644 --- a/contracts/src/test/TestContracts/CollateralRegistryTester.sol +++ b/contracts/test/TestContracts/CollateralRegistryTester.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../CollateralRegistry.sol"; +import "src/CollateralRegistry.sol"; /* Tester contract inherits from CollateralRegistry, and provides external functions for testing the parent's internal functions. */ diff --git a/contracts/src/test/TestContracts/CommunityIssuanceMock.sol b/contracts/test/TestContracts/CommunityIssuanceMock.sol similarity index 100% rename from contracts/src/test/TestContracts/CommunityIssuanceMock.sol rename to contracts/test/TestContracts/CommunityIssuanceMock.sol diff --git a/contracts/src/test/TestContracts/Deployment.t.sol b/contracts/test/TestContracts/Deployment.t.sol similarity index 96% rename from contracts/src/test/TestContracts/Deployment.t.sol rename to contracts/test/TestContracts/Deployment.t.sol index 59462dbe..97ac1aca 100644 --- a/contracts/src/test/TestContracts/Deployment.t.sol +++ b/contracts/test/TestContracts/Deployment.t.sol @@ -2,47 +2,47 @@ pragma solidity 0.8.24; -import "../../AddressesRegistry.sol"; -import "../../ActivePool.sol"; -import "../../BoldToken.sol"; -import "../../BorrowerOperations.sol"; -import "../../CollSurplusPool.sol"; -import "../../DefaultPool.sol"; -import "../../GasPool.sol"; -import "../../HintHelpers.sol"; -import "../../MultiTroveGetter.sol"; -import "../../SortedTroves.sol"; -import "../../StabilityPool.sol"; +import "src/AddressesRegistry.sol"; +import "src/ActivePool.sol"; +import "src/BoldToken.sol"; +import "src/BorrowerOperations.sol"; +import "src/CollSurplusPool.sol"; +import "src/DefaultPool.sol"; +import "src/GasPool.sol"; +import "src/HintHelpers.sol"; +import "src/MultiTroveGetter.sol"; +import "src/SortedTroves.sol"; +import "src/StabilityPool.sol"; import "./BorrowerOperationsTester.t.sol"; import "./TroveManagerTester.t.sol"; -import "../../TroveNFT.sol"; -import "../../NFTMetadata/MetadataNFT.sol"; -import "../../CollateralRegistry.sol"; +import "src/TroveNFT.sol"; +import "src/NFTMetadata/MetadataNFT.sol"; +import "src/CollateralRegistry.sol"; import "./MockInterestRouter.sol"; import "./PriceFeedTestnet.sol"; import "./MetadataDeployment.sol"; -import "../../Zappers/WETHZapper.sol"; -import "../../Zappers/GasCompZapper.sol"; -import "../../Zappers/LeverageLSTZapper.sol"; -import "../../Zappers/LeverageWETHZapper.sol"; -import "../../Zappers/Modules/FlashLoans/BalancerFlashLoan.sol"; -import "../../Zappers/Interfaces/IFlashLoanProvider.sol"; -import "../../Zappers/Interfaces/IExchange.sol"; -import "../../Zappers/Modules/Exchanges/Curve/ICurveFactory.sol"; -import "../../Zappers/Modules/Exchanges/Curve/ICurveStableswapNGFactory.sol"; -import "../../Zappers/Modules/Exchanges/Curve/ICurvePool.sol"; -import "../../Zappers/Modules/Exchanges/Curve/ICurveStableswapNGPool.sol"; -import "../../Zappers/Modules/Exchanges/CurveExchange.sol"; -import "../../Zappers/Modules/Exchanges/UniswapV3/ISwapRouter.sol"; -import "../../Zappers/Modules/Exchanges/UniV3Exchange.sol"; -import "../../Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol"; -import "../../Zappers/Modules/Exchanges/HybridCurveUniV3Exchange.sol"; +import "src/Zappers/WETHZapper.sol"; +import "src/Zappers/GasCompZapper.sol"; +import "src/Zappers/LeverageLSTZapper.sol"; +import "src/Zappers/LeverageWETHZapper.sol"; +import "src/Zappers/Modules/FlashLoans/BalancerFlashLoan.sol"; +import "src/Zappers/Interfaces/IFlashLoanProvider.sol"; +import "src/Zappers/Interfaces/IExchange.sol"; +import "src/Zappers/Modules/Exchanges/Curve/ICurveFactory.sol"; +import "src/Zappers/Modules/Exchanges/Curve/ICurveStableswapNGFactory.sol"; +import "src/Zappers/Modules/Exchanges/Curve/ICurvePool.sol"; +import "src/Zappers/Modules/Exchanges/Curve/ICurveStableswapNGPool.sol"; +import "src/Zappers/Modules/Exchanges/CurveExchange.sol"; +import "src/Zappers/Modules/Exchanges/UniswapV3/ISwapRouter.sol"; +import "src/Zappers/Modules/Exchanges/UniV3Exchange.sol"; +import "src/Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol"; +import "src/Zappers/Modules/Exchanges/HybridCurveUniV3Exchange.sol"; import {WETHTester} from "./WETHTester.sol"; import {ERC20Faucet} from "./ERC20Faucet.sol"; -import "../../PriceFeeds/WETHPriceFeed.sol"; -import "../../PriceFeeds/WSTETHPriceFeed.sol"; -import "../../PriceFeeds/RETHPriceFeed.sol"; +import "src/PriceFeeds/WETHPriceFeed.sol"; +import "src/PriceFeeds/WSTETHPriceFeed.sol"; +import "src/PriceFeeds/RETHPriceFeed.sol"; import "forge-std/console2.sol"; diff --git a/contracts/src/test/TestContracts/DevTestSetup.sol b/contracts/test/TestContracts/DevTestSetup.sol similarity index 100% rename from contracts/src/test/TestContracts/DevTestSetup.sol rename to contracts/test/TestContracts/DevTestSetup.sol diff --git a/contracts/src/test/TestContracts/ERC20Faucet.sol b/contracts/test/TestContracts/ERC20Faucet.sol similarity index 100% rename from contracts/src/test/TestContracts/ERC20Faucet.sol rename to contracts/test/TestContracts/ERC20Faucet.sol diff --git a/contracts/src/test/TestContracts/ERC20MinterMock.sol b/contracts/test/TestContracts/ERC20MinterMock.sol similarity index 100% rename from contracts/src/test/TestContracts/ERC20MinterMock.sol rename to contracts/test/TestContracts/ERC20MinterMock.sol diff --git a/contracts/src/test/TestContracts/Interfaces/IBorrowerOperationsTester.sol b/contracts/test/TestContracts/Interfaces/IBorrowerOperationsTester.sol similarity index 91% rename from contracts/src/test/TestContracts/Interfaces/IBorrowerOperationsTester.sol rename to contracts/test/TestContracts/Interfaces/IBorrowerOperationsTester.sol index ca6d0913..ae45e0bb 100644 --- a/contracts/src/test/TestContracts/Interfaces/IBorrowerOperationsTester.sol +++ b/contracts/test/TestContracts/Interfaces/IBorrowerOperationsTester.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../../Interfaces/IBorrowerOperations.sol"; +import "src/Interfaces/IBorrowerOperations.sol"; interface IBorrowerOperationsTester is IBorrowerOperations { function getCollToken() external view returns (IERC20); diff --git a/contracts/src/test/TestContracts/Interfaces/IPriceFeedMock.sol b/contracts/test/TestContracts/Interfaces/IPriceFeedMock.sol similarity index 77% rename from contracts/src/test/TestContracts/Interfaces/IPriceFeedMock.sol rename to contracts/test/TestContracts/Interfaces/IPriceFeedMock.sol index fc85122e..bf2d65ca 100644 --- a/contracts/src/test/TestContracts/Interfaces/IPriceFeedMock.sol +++ b/contracts/test/TestContracts/Interfaces/IPriceFeedMock.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.18; -import "../../../Interfaces/IPriceFeed.sol"; +import "src/Interfaces/IPriceFeed.sol"; interface IPriceFeedMock is IPriceFeed { function setPrice(uint256 _price) external; diff --git a/contracts/src/test/TestContracts/Interfaces/IPriceFeedTestnet.sol b/contracts/test/TestContracts/Interfaces/IPriceFeedTestnet.sol similarity index 83% rename from contracts/src/test/TestContracts/Interfaces/IPriceFeedTestnet.sol rename to contracts/test/TestContracts/Interfaces/IPriceFeedTestnet.sol index 93bccb0f..53732c37 100644 --- a/contracts/src/test/TestContracts/Interfaces/IPriceFeedTestnet.sol +++ b/contracts/test/TestContracts/Interfaces/IPriceFeedTestnet.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../../Interfaces/IPriceFeed.sol"; +import "src/Interfaces/IPriceFeed.sol"; interface IPriceFeedTestnet is IPriceFeed { function setPrice(uint256 _price) external returns (bool); diff --git a/contracts/src/test/TestContracts/Interfaces/ITroveManagerTester.sol b/contracts/test/TestContracts/Interfaces/ITroveManagerTester.sol similarity index 98% rename from contracts/src/test/TestContracts/Interfaces/ITroveManagerTester.sol rename to contracts/test/TestContracts/Interfaces/ITroveManagerTester.sol index e925c213..300dfc77 100644 --- a/contracts/src/test/TestContracts/Interfaces/ITroveManagerTester.sol +++ b/contracts/test/TestContracts/Interfaces/ITroveManagerTester.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../../Interfaces/ITroveManager.sol"; +import "src/Interfaces/ITroveManager.sol"; interface ITroveManagerTester is ITroveManager { function liquidate(uint256 _troveId) external; diff --git a/contracts/src/test/TestContracts/InvariantsTestHandler.t.sol b/contracts/test/TestContracts/InvariantsTestHandler.t.sol similarity index 99% rename from contracts/src/test/TestContracts/InvariantsTestHandler.t.sol rename to contracts/test/TestContracts/InvariantsTestHandler.t.sol index 7af8367a..a6442fd5 100644 --- a/contracts/src/test/TestContracts/InvariantsTestHandler.t.sol +++ b/contracts/test/TestContracts/InvariantsTestHandler.t.sol @@ -6,15 +6,15 @@ import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"; import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol"; import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol"; import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol"; -import {LatestBatchData} from "../../Types/LatestBatchData.sol"; -import {LatestTroveData} from "../../Types/LatestTroveData.sol"; -import {IBorrowerOperations} from "../../Interfaces/IBorrowerOperations.sol"; -import {ISortedTroves} from "../../Interfaces/ISortedTroves.sol"; -import {ITroveManager} from "../../Interfaces/ITroveManager.sol"; -import {AddressesRegistry} from "../../AddressesRegistry.sol"; -import {AddRemoveManagers} from "../../Dependencies/AddRemoveManagers.sol"; -import {BorrowerOperations} from "../../BorrowerOperations.sol"; -import {TroveManager} from "../../TroveManager.sol"; +import {LatestBatchData} from "src/Types/LatestBatchData.sol"; +import {LatestTroveData} from "src/Types/LatestTroveData.sol"; +import {IBorrowerOperations} from "src/Interfaces/IBorrowerOperations.sol"; +import {ISortedTroves} from "src/Interfaces/ISortedTroves.sol"; +import {ITroveManager} from "src/Interfaces/ITroveManager.sol"; +import {AddressesRegistry} from "src/AddressesRegistry.sol"; +import {AddRemoveManagers} from "src/Dependencies/AddRemoveManagers.sol"; +import {BorrowerOperations} from "src/BorrowerOperations.sol"; +import {TroveManager} from "src/TroveManager.sol"; import {EnumerableAddressSet, EnumerableSet} from "../Utils/EnumerableSet.sol"; import {pow} from "../Utils/Math.sol"; import {StringFormatting} from "../Utils/StringFormatting.sol"; @@ -48,7 +48,7 @@ import { SP_YIELD_SPLIT, UPFRONT_INTEREST_PERIOD, URGENT_REDEMPTION_BONUS -} from "../../Dependencies/Constants.sol"; +} from "src/Dependencies/Constants.sol"; uint256 constant TIME_DELTA_MIN = 0; uint256 constant TIME_DELTA_MAX = ONE_YEAR; diff --git a/contracts/src/test/TestContracts/LQTYStakingMock.sol b/contracts/test/TestContracts/LQTYStakingMock.sol similarity index 100% rename from contracts/src/test/TestContracts/LQTYStakingMock.sol rename to contracts/test/TestContracts/LQTYStakingMock.sol diff --git a/contracts/src/test/TestContracts/LQTYTokenMock.sol b/contracts/test/TestContracts/LQTYTokenMock.sol similarity index 79% rename from contracts/src/test/TestContracts/LQTYTokenMock.sol rename to contracts/test/TestContracts/LQTYTokenMock.sol index f1206d16..ecd0c692 100644 --- a/contracts/src/test/TestContracts/LQTYTokenMock.sol +++ b/contracts/test/TestContracts/LQTYTokenMock.sol @@ -2,8 +2,8 @@ pragma solidity 0.8.24; -//import "../../Dependencies/IERC20.sol"; -//import "../../Dependencies/IERC2612.sol"; +//import "src/Dependencies/IERC20.sol"; +//import "src/Dependencies/IERC2612.sol"; contract LQTYTokenMock { /*is IERC20, IERC2612*/ function sendToLQTYStaking(address _sender, uint256 _amount) external {} diff --git a/contracts/src/test/TestContracts/LiquityMathTester.sol b/contracts/test/TestContracts/LiquityMathTester.sol similarity index 93% rename from contracts/src/test/TestContracts/LiquityMathTester.sol rename to contracts/test/TestContracts/LiquityMathTester.sol index fd34bbc2..4586d076 100644 --- a/contracts/src/test/TestContracts/LiquityMathTester.sol +++ b/contracts/test/TestContracts/LiquityMathTester.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../Dependencies/LiquityMath.sol"; +import "src/Dependencies/LiquityMath.sol"; /* Tester contract for math functions in Math.sol library. */ diff --git a/contracts/src/test/TestContracts/MetadataDeployment.sol b/contracts/test/TestContracts/MetadataDeployment.sol similarity index 100% rename from contracts/src/test/TestContracts/MetadataDeployment.sol rename to contracts/test/TestContracts/MetadataDeployment.sol diff --git a/contracts/src/test/TestContracts/MockInterestRouter.sol b/contracts/test/TestContracts/MockInterestRouter.sol similarity index 69% rename from contracts/src/test/TestContracts/MockInterestRouter.sol rename to contracts/test/TestContracts/MockInterestRouter.sol index 55d906cd..955674ab 100644 --- a/contracts/src/test/TestContracts/MockInterestRouter.sol +++ b/contracts/test/TestContracts/MockInterestRouter.sol @@ -2,6 +2,6 @@ pragma solidity 0.8.24; -import "../../Interfaces/IInterestRouter.sol"; +import "src/Interfaces/IInterestRouter.sol"; contract MockInterestRouter is IInterestRouter {} diff --git a/contracts/src/test/TestContracts/NonPayableSwitch.sol b/contracts/test/TestContracts/NonPayableSwitch.sol similarity index 100% rename from contracts/src/test/TestContracts/NonPayableSwitch.sol rename to contracts/test/TestContracts/NonPayableSwitch.sol diff --git a/contracts/src/test/TestContracts/PriceFeedMock.sol b/contracts/test/TestContracts/PriceFeedMock.sol similarity index 100% rename from contracts/src/test/TestContracts/PriceFeedMock.sol rename to contracts/test/TestContracts/PriceFeedMock.sol diff --git a/contracts/src/test/TestContracts/PriceFeedTestnet.sol b/contracts/test/TestContracts/PriceFeedTestnet.sol similarity index 100% rename from contracts/src/test/TestContracts/PriceFeedTestnet.sol rename to contracts/test/TestContracts/PriceFeedTestnet.sol diff --git a/contracts/src/test/TestContracts/RETHTokenMock.sol b/contracts/test/TestContracts/RETHTokenMock.sol similarity index 81% rename from contracts/src/test/TestContracts/RETHTokenMock.sol rename to contracts/test/TestContracts/RETHTokenMock.sol index 3497dd38..6b52dfaf 100644 --- a/contracts/src/test/TestContracts/RETHTokenMock.sol +++ b/contracts/test/TestContracts/RETHTokenMock.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../Interfaces/IRETHToken.sol"; +import "src/Interfaces/IRETHToken.sol"; contract RETHTokenMock is IRETHToken { function getExchangeRate() external pure returns (uint256) { diff --git a/contracts/src/test/TestContracts/SPInvariantsTestHandler.t.sol b/contracts/test/TestContracts/SPInvariantsTestHandler.t.sol similarity index 95% rename from contracts/src/test/TestContracts/SPInvariantsTestHandler.t.sol rename to contracts/test/TestContracts/SPInvariantsTestHandler.t.sol index 33705a73..f43577c5 100644 --- a/contracts/src/test/TestContracts/SPInvariantsTestHandler.t.sol +++ b/contracts/test/TestContracts/SPInvariantsTestHandler.t.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.24; import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"; -import {IBorrowerOperations} from "../../Interfaces/IBorrowerOperations.sol"; -import {IBoldToken} from "../../Interfaces/IBoldToken.sol"; -import {IStabilityPool} from "../../Interfaces/IStabilityPool.sol"; -import {ITroveManager} from "../../Interfaces/ITroveManager.sol"; -import {ICollSurplusPool} from "../../Interfaces/ICollSurplusPool.sol"; -import {HintHelpers} from "../../HintHelpers.sol"; +import {IBorrowerOperations} from "src/Interfaces/IBorrowerOperations.sol"; +import {IBoldToken} from "src/Interfaces/IBoldToken.sol"; +import {IStabilityPool} from "src/Interfaces/IStabilityPool.sol"; +import {ITroveManager} from "src/Interfaces/ITroveManager.sol"; +import {ICollSurplusPool} from "src/Interfaces/ICollSurplusPool.sol"; +import {HintHelpers} from "src/HintHelpers.sol"; import {IPriceFeedTestnet} from "./Interfaces/IPriceFeedTestnet.sol"; import {ITroveManagerTester} from "./Interfaces/ITroveManagerTester.sol"; import {mulDivCeil} from "../Utils/Math.sol"; @@ -21,7 +21,7 @@ import { ETH_GAS_COMPENSATION, COLL_GAS_COMPENSATION_DIVISOR, MIN_ANNUAL_INTEREST_RATE -} from "../../Dependencies/Constants.sol"; +} from "src/Dependencies/Constants.sol"; using {mulDivCeil} for uint256; diff --git a/contracts/src/test/TestContracts/SortedTrovesTester.sol b/contracts/test/TestContracts/SortedTrovesTester.sol similarity index 96% rename from contracts/src/test/TestContracts/SortedTrovesTester.sol rename to contracts/test/TestContracts/SortedTrovesTester.sol index 39c9c133..c080b5ec 100644 --- a/contracts/src/test/TestContracts/SortedTrovesTester.sol +++ b/contracts/test/TestContracts/SortedTrovesTester.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../Interfaces/ISortedTroves.sol"; +import "src/Interfaces/ISortedTroves.sol"; // Used as both a wrapper for SortedTroves functions and a mock TroveManager. contract SortedTrovesTester { diff --git a/contracts/src/test/TestContracts/TroveManagerTester.t.sol b/contracts/test/TestContracts/TroveManagerTester.t.sol similarity index 99% rename from contracts/src/test/TestContracts/TroveManagerTester.t.sol rename to contracts/test/TestContracts/TroveManagerTester.t.sol index bc9199da..3e82745f 100644 --- a/contracts/src/test/TestContracts/TroveManagerTester.t.sol +++ b/contracts/test/TestContracts/TroveManagerTester.t.sol @@ -2,9 +2,9 @@ pragma solidity 0.8.24; -import "../../Interfaces/IAddressesRegistry.sol"; -import "../../Interfaces/ICollateralRegistry.sol"; -import "../../TroveManager.sol"; +import "src/Interfaces/IAddressesRegistry.sol"; +import "src/Interfaces/ICollateralRegistry.sol"; +import "src/TroveManager.sol"; import "./Interfaces/ITroveManagerTester.sol"; /* Tester contract inherits from TroveManager, and provides external functions diff --git a/contracts/src/test/TestContracts/WETH.sol b/contracts/test/TestContracts/WETH.sol similarity index 98% rename from contracts/src/test/TestContracts/WETH.sol rename to contracts/test/TestContracts/WETH.sol index 41a86dc1..24eb5402 100644 --- a/contracts/src/test/TestContracts/WETH.sol +++ b/contracts/test/TestContracts/WETH.sol @@ -17,7 +17,7 @@ pragma solidity ^0.8.18; -import "../../Interfaces/IWETH.sol"; +import "src/Interfaces/IWETH.sol"; // Mainnet deployment: 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2 contract WETH9 is IWETH { diff --git a/contracts/src/test/TestContracts/WETHTester.sol b/contracts/test/TestContracts/WETHTester.sol similarity index 95% rename from contracts/src/test/TestContracts/WETHTester.sol rename to contracts/test/TestContracts/WETHTester.sol index 557fb1c3..8926f47c 100644 --- a/contracts/src/test/TestContracts/WETHTester.sol +++ b/contracts/test/TestContracts/WETHTester.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.18; import {ERC20Faucet} from "./ERC20Faucet.sol"; -import "../../Interfaces/IWETH.sol"; +import "src/Interfaces/IWETH.sol"; contract WETHTester is ERC20Faucet, IWETH { event Deposit(address indexed dst, uint256 wad); diff --git a/contracts/src/test/TestContracts/WSTETHTokenMock.sol b/contracts/test/TestContracts/WSTETHTokenMock.sol similarity index 95% rename from contracts/src/test/TestContracts/WSTETHTokenMock.sol rename to contracts/test/TestContracts/WSTETHTokenMock.sol index 9d54f61c..073f37eb 100644 --- a/contracts/src/test/TestContracts/WSTETHTokenMock.sol +++ b/contracts/test/TestContracts/WSTETHTokenMock.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import "../../Interfaces/IWSTETH.sol"; +import "src/Interfaces/IWSTETH.sol"; contract WSTETHTokenMock is IWSTETH { function stEthPerToken() external pure returns (uint256) { diff --git a/contracts/src/test/Utils/BatchIdSet.sol b/contracts/test/Utils/BatchIdSet.sol similarity index 93% rename from contracts/src/test/Utils/BatchIdSet.sol rename to contracts/test/Utils/BatchIdSet.sol index f2b104e7..f810560f 100644 --- a/contracts/src/test/Utils/BatchIdSet.sol +++ b/contracts/test/Utils/BatchIdSet.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {BatchId} from "../../Types/BatchId.sol"; +import {BatchId} from "src/Types/BatchId.sol"; using BatchIdSetMethods for BatchIdSet global; diff --git a/contracts/src/test/Utils/EnumerableSet.sol b/contracts/test/Utils/EnumerableSet.sol similarity index 100% rename from contracts/src/test/Utils/EnumerableSet.sol rename to contracts/test/Utils/EnumerableSet.sol diff --git a/contracts/src/test/Utils/Logging.sol b/contracts/test/Utils/Logging.sol similarity index 100% rename from contracts/src/test/Utils/Logging.sol rename to contracts/test/Utils/Logging.sol diff --git a/contracts/src/test/Utils/Math.sol b/contracts/test/Utils/Math.sol similarity index 92% rename from contracts/src/test/Utils/Math.sol rename to contracts/test/Utils/Math.sol index f136447a..039770b4 100644 --- a/contracts/src/test/Utils/Math.sol +++ b/contracts/test/Utils/Math.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {DECIMAL_PRECISION} from "../../Dependencies/Constants.sol"; +import {DECIMAL_PRECISION} from "src/Dependencies/Constants.sol"; function roundedMul(uint256 x, uint256 y) pure returns (uint256) { return (x * y + DECIMAL_PRECISION / 2) / DECIMAL_PRECISION; diff --git a/contracts/src/test/Utils/StringFormatting.sol b/contracts/test/Utils/StringFormatting.sol similarity index 100% rename from contracts/src/test/Utils/StringFormatting.sol rename to contracts/test/Utils/StringFormatting.sol diff --git a/contracts/src/test/Utils/Trove.sol b/contracts/test/Utils/Trove.sol similarity index 96% rename from contracts/src/test/Utils/Trove.sol rename to contracts/test/Utils/Trove.sol index 15a51b18..8893dd95 100644 --- a/contracts/src/test/Utils/Trove.sol +++ b/contracts/test/Utils/Trove.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {DECIMAL_PRECISION, ONE_YEAR} from "../../Dependencies/Constants.sol"; +import {DECIMAL_PRECISION, ONE_YEAR} from "src/Dependencies/Constants.sol"; using TroveMethods for Trove global; diff --git a/contracts/src/test/Utils/TroveId.sol b/contracts/test/Utils/TroveId.sol similarity index 100% rename from contracts/src/test/Utils/TroveId.sol rename to contracts/test/Utils/TroveId.sol diff --git a/contracts/src/test/Utils/UniPriceConverterLog.sol b/contracts/test/Utils/UniPriceConverterLog.sol similarity index 90% rename from contracts/src/test/Utils/UniPriceConverterLog.sol rename to contracts/test/Utils/UniPriceConverterLog.sol index c1ff465c..f99b8dc5 100644 --- a/contracts/src/test/Utils/UniPriceConverterLog.sol +++ b/contracts/test/Utils/UniPriceConverterLog.sol @@ -4,10 +4,10 @@ pragma solidity 0.8.24; import "openzeppelin-contracts/contracts/utils/math/Math.sol"; -import {UniPriceConverter} from "../../Zappers/Modules/Exchanges/UniswapV3/UniPriceConverter.sol"; +import {UniPriceConverter} from "src/Zappers/Modules/Exchanges/UniswapV3/UniPriceConverter.sol"; import {Logging} from "./Logging.sol"; import {StringFormatting} from "./StringFormatting.sol"; -import {DECIMAL_PRECISION} from "../../Dependencies/Constants.sol"; +import {DECIMAL_PRECISION} from "src/Dependencies/Constants.sol"; import "forge-std/console2.sol"; diff --git a/contracts/src/test/basicOps.t.sol b/contracts/test/basicOps.t.sol similarity index 100% rename from contracts/src/test/basicOps.t.sol rename to contracts/test/basicOps.t.sol diff --git a/contracts/src/test/batchManagementFee.t.sol b/contracts/test/batchManagementFee.t.sol similarity index 100% rename from contracts/src/test/batchManagementFee.t.sol rename to contracts/test/batchManagementFee.t.sol diff --git a/contracts/src/test/borrowerOperations.t.sol b/contracts/test/borrowerOperations.t.sol similarity index 100% rename from contracts/src/test/borrowerOperations.t.sol rename to contracts/test/borrowerOperations.t.sol diff --git a/contracts/src/test/borrowerOperationsOnBehalfTroveManagament.t.sol b/contracts/test/borrowerOperationsOnBehalfTroveManagament.t.sol similarity index 99% rename from contracts/src/test/borrowerOperationsOnBehalfTroveManagament.t.sol rename to contracts/test/borrowerOperationsOnBehalfTroveManagament.t.sol index cd9f7992..5f35990a 100644 --- a/contracts/src/test/borrowerOperationsOnBehalfTroveManagament.t.sol +++ b/contracts/test/borrowerOperationsOnBehalfTroveManagament.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.18; -import "../Dependencies/AddRemoveManagers.sol"; +import "src/Dependencies/AddRemoveManagers.sol"; import "./TestContracts/AddRemoveManagersTester.sol"; import "./TestContracts/DevTestSetup.sol"; diff --git a/contracts/src/test/criticalThreshold.t.sol b/contracts/test/criticalThreshold.t.sol similarity index 100% rename from contracts/src/test/criticalThreshold.t.sol rename to contracts/test/criticalThreshold.t.sol diff --git a/contracts/src/test/deployment.t.sol b/contracts/test/deployment.t.sol similarity index 100% rename from contracts/src/test/deployment.t.sol rename to contracts/test/deployment.t.sol diff --git a/contracts/src/test/events.t.sol b/contracts/test/events.t.sol similarity index 99% rename from contracts/src/test/events.t.sol rename to contracts/test/events.t.sol index 9e285be1..f54eac0c 100644 --- a/contracts/src/test/events.t.sol +++ b/contracts/test/events.t.sol @@ -2,9 +2,9 @@ pragma solidity 0.8.24; import "openzeppelin-contracts/contracts/utils/math/Math.sol"; -import "../Interfaces/IStabilityPoolEvents.sol"; +import "src/Interfaces/IStabilityPoolEvents.sol"; import "./TestContracts/DevTestSetup.sol"; -import "../Dependencies/Constants.sol"; +import "src/Dependencies/Constants.sol"; struct LiquidationParams { uint256 collSentToSP; diff --git a/contracts/src/test/interestBatchManagement.t.sol b/contracts/test/interestBatchManagement.t.sol similarity index 99% rename from contracts/src/test/interestBatchManagement.t.sol rename to contracts/test/interestBatchManagement.t.sol index 9cc47e1e..87e93cbe 100644 --- a/contracts/src/test/interestBatchManagement.t.sol +++ b/contracts/test/interestBatchManagement.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.18; -import "../Dependencies/AddRemoveManagers.sol"; +import "src/Dependencies/AddRemoveManagers.sol"; import "./TestContracts/DevTestSetup.sol"; contract InterestBatchManagementTest is DevTestSetup { diff --git a/contracts/src/test/interestIndividualDelegation.t.sol b/contracts/test/interestIndividualDelegation.t.sol similarity index 99% rename from contracts/src/test/interestIndividualDelegation.t.sol rename to contracts/test/interestIndividualDelegation.t.sol index 4acb543d..4ec1b30c 100644 --- a/contracts/src/test/interestIndividualDelegation.t.sol +++ b/contracts/test/interestIndividualDelegation.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.18; -import "../Dependencies/AddRemoveManagers.sol"; +import "src/Dependencies/AddRemoveManagers.sol"; import "./TestContracts/DevTestSetup.sol"; contract InterestIndividualDelegationTest is DevTestSetup { diff --git a/contracts/src/test/interestRateAggregate.t.sol b/contracts/test/interestRateAggregate.t.sol similarity index 100% rename from contracts/src/test/interestRateAggregate.t.sol rename to contracts/test/interestRateAggregate.t.sol diff --git a/contracts/src/test/interestRateBasic.t.sol b/contracts/test/interestRateBasic.t.sol similarity index 100% rename from contracts/src/test/interestRateBasic.t.sol rename to contracts/test/interestRateBasic.t.sol diff --git a/contracts/src/test/liquidationCosts.t.sol b/contracts/test/liquidationCosts.t.sol similarity index 100% rename from contracts/src/test/liquidationCosts.t.sol rename to contracts/test/liquidationCosts.t.sol diff --git a/contracts/src/test/liquidations.t.sol b/contracts/test/liquidations.t.sol similarity index 100% rename from contracts/src/test/liquidations.t.sol rename to contracts/test/liquidations.t.sol diff --git a/contracts/src/test/liquidationsLST.t.sol b/contracts/test/liquidationsLST.t.sol similarity index 100% rename from contracts/src/test/liquidationsLST.t.sol rename to contracts/test/liquidationsLST.t.sol diff --git a/contracts/src/test/multicollateral.t.sol b/contracts/test/multicollateral.t.sol similarity index 100% rename from contracts/src/test/multicollateral.t.sol rename to contracts/test/multicollateral.t.sol diff --git a/contracts/src/test/rebasingBatchShares.t.sol b/contracts/test/rebasingBatchShares.t.sol similarity index 100% rename from contracts/src/test/rebasingBatchShares.t.sol rename to contracts/test/rebasingBatchShares.t.sol diff --git a/contracts/src/test/redemptions.t.sol b/contracts/test/redemptions.t.sol similarity index 100% rename from contracts/src/test/redemptions.t.sol rename to contracts/test/redemptions.t.sol diff --git a/contracts/src/test/shutdown.t.sol b/contracts/test/shutdown.t.sol similarity index 100% rename from contracts/src/test/shutdown.t.sol rename to contracts/test/shutdown.t.sol diff --git a/contracts/src/test/stabilityPool.t.sol b/contracts/test/stabilityPool.t.sol similarity index 100% rename from contracts/src/test/stabilityPool.t.sol rename to contracts/test/stabilityPool.t.sol diff --git a/contracts/src/test/troveManager.t.sol b/contracts/test/troveManager.t.sol similarity index 100% rename from contracts/src/test/troveManager.t.sol rename to contracts/test/troveManager.t.sol diff --git a/contracts/src/test/troveNFT.t.sol b/contracts/test/troveNFT.t.sol similarity index 100% rename from contracts/src/test/troveNFT.t.sol rename to contracts/test/troveNFT.t.sol diff --git a/contracts/src/test/zapperGasComp.t.sol b/contracts/test/zapperGasComp.t.sol similarity index 99% rename from contracts/src/test/zapperGasComp.t.sol rename to contracts/test/zapperGasComp.t.sol index 96c4c426..04cba126 100644 --- a/contracts/src/test/zapperGasComp.t.sol +++ b/contracts/test/zapperGasComp.t.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.18; import "./TestContracts/DevTestSetup.sol"; import "./TestContracts/WETH.sol"; -import "../Zappers/GasCompZapper.sol"; +import "src/Zappers/GasCompZapper.sol"; contract ZapperGasCompTest is DevTestSetup { function setUp() public override { diff --git a/contracts/src/test/zapperLeverage.t.sol b/contracts/test/zapperLeverage.t.sol similarity index 98% rename from contracts/src/test/zapperLeverage.t.sol rename to contracts/test/zapperLeverage.t.sol index d101ee8d..2b575f5d 100644 --- a/contracts/src/test/zapperLeverage.t.sol +++ b/contracts/test/zapperLeverage.t.sol @@ -4,19 +4,19 @@ pragma solidity ^0.8.18; import "./TestContracts/DevTestSetup.sol"; import "./TestContracts/WETH.sol"; -import "../Zappers/Modules/Exchanges/Curve/ICurvePool.sol"; -import "../Zappers/Modules/Exchanges/CurveExchange.sol"; -import "../Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Pool.sol"; -import "../Zappers/Modules/Exchanges/UniV3Exchange.sol"; -import "../Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol"; -import "../Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Factory.sol"; -import "../Zappers/Modules/Exchanges/UniswapV3/IQuoterV2.sol"; -import "../Zappers/Modules/Exchanges/HybridCurveUniV3Exchange.sol"; -import "../Zappers/Modules/Exchanges/HybridCurveUniV3ExchangeHelpers.sol"; -import "../Zappers/Interfaces/IFlashLoanProvider.sol"; -import "../Zappers/Modules/FlashLoans/Balancer/vault/IVault.sol"; - -import "../Zappers/Modules/Exchanges/Curve/ICurveStableswapNGFactory.sol"; +import "src/Zappers/Modules/Exchanges/Curve/ICurvePool.sol"; +import "src/Zappers/Modules/Exchanges/CurveExchange.sol"; +import "src/Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Pool.sol"; +import "src/Zappers/Modules/Exchanges/UniV3Exchange.sol"; +import "src/Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol"; +import "src/Zappers/Modules/Exchanges/UniswapV3/IUniswapV3Factory.sol"; +import "src/Zappers/Modules/Exchanges/UniswapV3/IQuoterV2.sol"; +import "src/Zappers/Modules/Exchanges/HybridCurveUniV3Exchange.sol"; +import "src/Zappers/Modules/Exchanges/HybridCurveUniV3ExchangeHelpers.sol"; +import "src/Zappers/Interfaces/IFlashLoanProvider.sol"; +import "src/Zappers/Modules/FlashLoans/Balancer/vault/IVault.sol"; + +import "src/Zappers/Modules/Exchanges/Curve/ICurveStableswapNGFactory.sol"; contract ZapperLeverageMainnet is DevTestSetup { using StringFormatting for uint256; diff --git a/contracts/src/test/zapperWETH.t.sol b/contracts/test/zapperWETH.t.sol similarity index 99% rename from contracts/src/test/zapperWETH.t.sol rename to contracts/test/zapperWETH.t.sol index f9aea5ca..62d54843 100644 --- a/contracts/src/test/zapperWETH.t.sol +++ b/contracts/test/zapperWETH.t.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.18; import "./TestContracts/DevTestSetup.sol"; import "./TestContracts/WETH.sol"; -import "../Zappers/WETHZapper.sol"; +import "src/Zappers/WETHZapper.sol"; contract ZapperWETHTest is DevTestSetup { function setUp() public override {