From 648e94c9a5214e82bf891f1c799b570232d25b2c Mon Sep 17 00:00:00 2001 From: "John McClure (pickleback)" Date: Thu, 25 Jul 2024 13:15:22 -0500 Subject: [PATCH 1/8] use relative pathing everywhere --- .../MultiToken._transferFrom.t.sol | 6 +- test/debug/Debug.t.sol | 12 +-- test/instances/aave/AaveHyperdrive.t.sol | 42 +++++----- .../instances/erc4626/ERC4626Hyperdrive.t.sol | 56 ++++++------- .../instances/erc4626/ERC4626Validation.t.sol | 40 ++++----- test/instances/erc4626/Sweep.t.sol | 32 ++++---- test/instances/erc4626/UsdcERC4626.t.sol | 46 +++++------ test/instances/erc4626/sDai.t.sol | 4 +- test/instances/ezETH/EzETHHyperdrive.t.sol | 44 +++++----- test/instances/lseth/LsETHHyperdrive.t.sol | 40 ++++----- .../morpho-blue/MorphoBlueHyperdrive.t.sol | 42 +++++----- test/instances/reth/RETHHyperdrive.t.sol | 48 +++++------ test/instances/steth/StETHHyperdrive.t.sol | 40 ++++----- test/instances/steth/Sweep.t.sol | 34 ++++---- test/instances/susde/SUSDe.t.sol | 44 +++++----- .../deployers/DeployerCoordinator.t.sol | 22 ++--- .../ERC4626DeployerCoordinator.t.sol | 34 ++++---- .../deployers/RethDeployerCoordinator.t.sol | 34 ++++---- .../deployers/StethDeployerCoordinator.t.sol | 34 ++++---- .../factory/HyperdriveFactory.t.sol | 66 +++++++-------- .../hyperdrive/CheckpointRewards.t.sol | 18 ++-- .../hyperdrive/CircuitBreakerTest.t.sol | 14 ++-- .../IntraCheckpointNettingTest.t.sol | 16 ++-- .../hyperdrive/LPWithdrawalTest.t.sol | 16 ++-- .../NegativeInterestLongFeeTest.t.sol | 14 ++-- .../NegativeInterestShortFeeTest.t.sol | 14 ++-- .../hyperdrive/NonstandardDecimals.sol | 16 ++-- .../hyperdrive/PresentValueTest.t.sol | 16 ++-- .../hyperdrive/PriceDiscovery.t.sol | 10 +-- .../hyperdrive/ReentrancyTest.t.sol | 12 +-- .../hyperdrive/RoundTripTest.t.sol | 14 ++-- .../hyperdrive/SandwichTest.t.sol | 8 +- .../hyperdrive/VariableInterestLongTest.t.sol | 12 +-- .../VariableInterestShortTest.t.sol | 12 +-- .../hyperdrive/ZombieInterestTest.t.sol | 10 +-- test/units/ERC20Forwarder.t.sol | 20 ++--- test/units/ERC20ForwarderFactory.t.sol | 20 ++--- test/units/ForceRevertDelegatecall.t.sol | 14 ++-- test/units/MultiToken.t.sol | 22 ++--- test/units/hyperdrive/AddLiquidityTest.t.sol | 12 +-- test/units/hyperdrive/Admin.t.sol | 4 +- test/units/hyperdrive/CheckpointTest.t.sol | 8 +- test/units/hyperdrive/CloseLongTest.t.sol | 16 ++-- test/units/hyperdrive/CloseShortTest.t.sol | 14 ++-- test/units/hyperdrive/DataProvider.t.sol | 2 +- test/units/hyperdrive/ExtremeInputs.t.sol | 12 +-- test/units/hyperdrive/FeeTest.t.sol | 14 ++-- test/units/hyperdrive/InitializeTest.t.sol | 12 +-- test/units/hyperdrive/OpenLongTest.t.sol | 18 ++-- test/units/hyperdrive/OpenShortTest.t.sol | 14 ++-- .../RedeemWithdrawalSharesTest.t.sol | 12 +-- .../hyperdrive/RemoveLiquidityTest.t.sol | 16 ++-- .../hyperdrive/UpdateLiquidityTest.t.sol | 16 ++-- test/units/libraries/AssetId.t.sol | 10 +-- test/units/libraries/FixedPointMath.t.sol | 8 +- test/units/libraries/HyperdriveMath.t.sol | 20 ++--- .../units/libraries/HyperdriveUtilsTest.t.sol | 12 +-- test/units/libraries/LPMath.t.sol | 16 ++-- test/units/libraries/SafeCast.t.sol | 6 +- test/units/libraries/YieldSpaceMath.t.sol | 16 ++-- test/units/registry/HyperdriveRegistry.t.sol | 42 +++++----- .../HyperdriveCheckpointRewarder.t.sol | 16 ++-- .../HyperdriveCheckpointSubrewarder.t.sol | 24 +++--- test/utils/BaseTest.sol | 4 +- test/utils/EtchingUtils.sol | 82 +++++++++---------- test/utils/HyperdriveTest.sol | 38 ++++----- test/utils/HyperdriveUtils.sol | 12 +-- test/utils/InstanceTest.sol | 26 +++--- 68 files changed, 750 insertions(+), 750 deletions(-) diff --git a/test/combinatorial/MultiToken._transferFrom.t.sol b/test/combinatorial/MultiToken._transferFrom.t.sol index 2edbd4b88..505a22f1d 100644 --- a/test/combinatorial/MultiToken._transferFrom.t.sol +++ b/test/combinatorial/MultiToken._transferFrom.t.sol @@ -4,9 +4,9 @@ pragma solidity 0.8.20; import "forge-std/Test.sol"; import "forge-std/console2.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { CombinatorialTest } from "test/utils/CombinatorialTest.sol"; +import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { IMockHyperdrive } from "../../contracts/test/MockHyperdrive.sol"; +import { CombinatorialTest } from "../utils/CombinatorialTest.sol"; contract MultiToken__transferFrom is CombinatorialTest { struct TestCase { diff --git a/test/debug/Debug.t.sol b/test/debug/Debug.t.sol index 407809020..be0186c32 100644 --- a/test/debug/Debug.t.sol +++ b/test/debug/Debug.t.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.20; import { console2 as console } from "forge-std/console2.sol"; -import { IHyperdriveCore } from "contracts/src/interfaces/IHyperdriveCore.sol"; -import { IMultiTokenCore } from "contracts/src/interfaces/IMultiTokenCore.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { BaseTest } from "test/utils/BaseTest.sol"; -import { EtchingUtils } from "test/utils/EtchingUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdriveCore } from "../../contracts/src/interfaces/IHyperdriveCore.sol"; +import { IMultiTokenCore } from "../../contracts/src/interfaces/IMultiTokenCore.sol"; +import { ETH } from "../../contracts/src/libraries/Constants.sol"; +import { BaseTest } from "../utils/BaseTest.sol"; +import { EtchingUtils } from "../utils/EtchingUtils.sol"; +import { Lib } from "../utils/Lib.sol"; /// @author DELV /// @title Debugging diff --git a/test/instances/aave/AaveHyperdrive.t.sol b/test/instances/aave/AaveHyperdrive.t.sol index 734e7be10..74e706cf7 100644 --- a/test/instances/aave/AaveHyperdrive.t.sol +++ b/test/instances/aave/AaveHyperdrive.t.sol @@ -4,27 +4,27 @@ pragma solidity 0.8.20; import { IPool } from "aave/interfaces/IPool.sol"; import { DataTypes } from "aave/protocol/libraries/types/DataTypes.sol"; import { stdStorage, StdStorage } from "forge-std/Test.sol"; -import { AaveHyperdriveCoreDeployer } from "contracts/src/deployers/aave/AaveHyperdriveCoreDeployer.sol"; -import { AaveHyperdriveDeployerCoordinator } from "contracts/src/deployers/aave/AaveHyperdriveDeployerCoordinator.sol"; -import { AaveTarget0Deployer } from "contracts/src/deployers/aave/AaveTarget0Deployer.sol"; -import { AaveTarget1Deployer } from "contracts/src/deployers/aave/AaveTarget1Deployer.sol"; -import { AaveTarget2Deployer } from "contracts/src/deployers/aave/AaveTarget2Deployer.sol"; -import { AaveTarget3Deployer } from "contracts/src/deployers/aave/AaveTarget3Deployer.sol"; -import { AaveTarget4Deployer } from "contracts/src/deployers/aave/AaveTarget4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { IAaveHyperdrive } from "contracts/src/interfaces/IAaveHyperdrive.sol"; -import { IAToken } from "contracts/src/interfaces/IAToken.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { InstanceTest } from "test/utils/InstanceTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { AaveHyperdriveCoreDeployer } from "../../../contracts/src/deployers/aave/AaveHyperdriveCoreDeployer.sol"; +import { AaveHyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/aave/AaveHyperdriveDeployerCoordinator.sol"; +import { AaveTarget0Deployer } from "../../../contracts/src/deployers/aave/AaveTarget0Deployer.sol"; +import { AaveTarget1Deployer } from "../../../contracts/src/deployers/aave/AaveTarget1Deployer.sol"; +import { AaveTarget2Deployer } from "../../../contracts/src/deployers/aave/AaveTarget2Deployer.sol"; +import { AaveTarget3Deployer } from "../../../contracts/src/deployers/aave/AaveTarget3Deployer.sol"; +import { AaveTarget4Deployer } from "../../../contracts/src/deployers/aave/AaveTarget4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { IAToken } from "../../../contracts/src/interfaces/IAToken.sol"; +import { IAaveHyperdrive } from "../../../contracts/src/interfaces/IAaveHyperdrive.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { InstanceTest } from "../../utils/InstanceTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract AaveHyperdriveTest is InstanceTest { using FixedPointMath for uint256; diff --git a/test/instances/erc4626/ERC4626Hyperdrive.t.sol b/test/instances/erc4626/ERC4626Hyperdrive.t.sol index 0c2842637..2d7868737 100644 --- a/test/instances/erc4626/ERC4626Hyperdrive.t.sol +++ b/test/instances/erc4626/ERC4626Hyperdrive.t.sol @@ -1,34 +1,34 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { ERC4626HyperdriveCoreDeployer } from "contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; -import { ERC4626HyperdriveDeployerCoordinator } from "contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; -import { ERC4626Target0Deployer } from "contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; -import { ERC4626Target1Deployer } from "contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; -import { ERC4626Target2Deployer } from "contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; -import { ERC4626Target3Deployer } from "contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; -import { ERC4626Target4Deployer } from "contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { ERC4626Target0 } from "contracts/src/instances/erc4626/ERC4626Target0.sol"; -import { ERC4626Target1 } from "contracts/src/instances/erc4626/ERC4626Target1.sol"; -import { ERC4626Target2 } from "contracts/src/instances/erc4626/ERC4626Target2.sol"; -import { ERC4626Target3 } from "contracts/src/instances/erc4626/ERC4626Target3.sol"; -import { ERC4626Target4 } from "contracts/src/instances/erc4626/ERC4626Target4.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IERC4626 } from "contracts/src/interfaces/IERC4626.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ERC4626_HYPERDRIVE_KIND, ERC4626_HYPERDRIVE_DEPLOYER_COORDINATOR_KIND, VERSION } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockERC4626, ERC20 } from "contracts/test/MockERC4626.sol"; -import { MockERC4626Hyperdrive } from "contracts/test/MockERC4626Hyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; +import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; +import { ERC4626Target0Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; +import { ERC4626Target1Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; +import { ERC4626Target2Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; +import { ERC4626Target3Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; +import { ERC4626Target4Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { ERC4626Target0 } from "../../../contracts/src/instances/erc4626/ERC4626Target0.sol"; +import { ERC4626Target1 } from "../../../contracts/src/instances/erc4626/ERC4626Target1.sol"; +import { ERC4626Target2 } from "../../../contracts/src/instances/erc4626/ERC4626Target2.sol"; +import { ERC4626Target3 } from "../../../contracts/src/instances/erc4626/ERC4626Target3.sol"; +import { ERC4626Target4 } from "../../../contracts/src/instances/erc4626/ERC4626Target4.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IERC4626 } from "../../../contracts/src/interfaces/IERC4626.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ERC4626_HYPERDRIVE_KIND, ERC4626_HYPERDRIVE_DEPLOYER_COORDINATOR_KIND, VERSION } from "../../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockERC4626, ERC20 } from "../../../contracts/test/MockERC4626.sol"; +import { MockERC4626Hyperdrive } from "../../../contracts/test/MockERC4626Hyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract ERC4626HyperdriveTest is HyperdriveTest { using FixedPointMath for *; diff --git a/test/instances/erc4626/ERC4626Validation.t.sol b/test/instances/erc4626/ERC4626Validation.t.sol index 0f1240273..04ab62b26 100644 --- a/test/instances/erc4626/ERC4626Validation.t.sol +++ b/test/instances/erc4626/ERC4626Validation.t.sol @@ -1,26 +1,26 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { ERC4626HyperdriveCoreDeployer } from "contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; -import { ERC4626HyperdriveDeployerCoordinator } from "contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; -import { ERC4626Target0Deployer } from "contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; -import { ERC4626Target1Deployer } from "contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; -import { ERC4626Target2Deployer } from "contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; -import { ERC4626Target3Deployer } from "contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; -import { ERC4626Target4Deployer } from "contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IERC4626 } from "contracts/src/interfaces/IERC4626.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { MockERC4626Hyperdrive } from "contracts/test/MockERC4626Hyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; +import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; +import { ERC4626Target0Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; +import { ERC4626Target1Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; +import { ERC4626Target2Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; +import { ERC4626Target3Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; +import { ERC4626Target4Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IERC4626 } from "../../../contracts/src/interfaces/IERC4626.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { MockERC4626Hyperdrive } from "../../../contracts/test/MockERC4626Hyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; abstract contract ERC4626ValidationTest is HyperdriveTest { using FixedPointMath for *; diff --git a/test/instances/erc4626/Sweep.t.sol b/test/instances/erc4626/Sweep.t.sol index fa702359d..9cfd2e897 100644 --- a/test/instances/erc4626/Sweep.t.sol +++ b/test/instances/erc4626/Sweep.t.sol @@ -1,22 +1,22 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { ERC4626Hyperdrive } from "contracts/src/instances/erc4626/ERC4626Hyperdrive.sol"; -import { ERC4626Target0 } from "contracts/src/instances/erc4626/ERC4626Target0.sol"; -import { ERC4626Target1 } from "contracts/src/instances/erc4626/ERC4626Target1.sol"; -import { ERC4626Target2 } from "contracts/src/instances/erc4626/ERC4626Target2.sol"; -import { ERC4626Target3 } from "contracts/src/instances/erc4626/ERC4626Target3.sol"; -import { ERC4626Target4 } from "contracts/src/instances/erc4626/ERC4626Target4.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IERC4626 } from "contracts/src/interfaces/IERC4626.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveEvents } from "contracts/src/interfaces/IHyperdriveEvents.sol"; -import { ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockERC4626 } from "contracts/test/MockERC4626.sol"; -import { BaseTest } from "test/utils/BaseTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; +import { ERC4626Hyperdrive } from "../../../contracts/src/instances/erc4626/ERC4626Hyperdrive.sol"; +import { ERC4626Target0 } from "../../../contracts/src/instances/erc4626/ERC4626Target0.sol"; +import { ERC4626Target1 } from "../../../contracts/src/instances/erc4626/ERC4626Target1.sol"; +import { ERC4626Target2 } from "../../../contracts/src/instances/erc4626/ERC4626Target2.sol"; +import { ERC4626Target3 } from "../../../contracts/src/instances/erc4626/ERC4626Target3.sol"; +import { ERC4626Target4 } from "../../../contracts/src/instances/erc4626/ERC4626Target4.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IERC4626 } from "../../../contracts/src/interfaces/IERC4626.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveEvents } from "../../../contracts/src/interfaces/IHyperdriveEvents.sol"; +import { ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockERC4626 } from "../../../contracts/test/MockERC4626.sol"; +import { BaseTest } from "../../utils/BaseTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; contract SweepTest is BaseTest, IHyperdriveEvents { ForwardingToken baseForwarder; diff --git a/test/instances/erc4626/UsdcERC4626.t.sol b/test/instances/erc4626/UsdcERC4626.t.sol index fbfc8ed1a..d59489f61 100644 --- a/test/instances/erc4626/UsdcERC4626.t.sol +++ b/test/instances/erc4626/UsdcERC4626.t.sol @@ -1,29 +1,29 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { ERC4626HyperdriveCoreDeployer } from "contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; -import { ERC4626HyperdriveDeployerCoordinator } from "contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; -import { ERC4626Target0Deployer } from "contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; -import { ERC4626Target1Deployer } from "contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; -import { ERC4626Target2Deployer } from "contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; -import { ERC4626Target3Deployer } from "contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; -import { ERC4626Target4Deployer } from "contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IERC4626 } from "contracts/src/interfaces/IERC4626.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { ILido } from "contracts/src/interfaces/ILido.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { MockERC4626Hyperdrive } from "contracts/test/MockERC4626Hyperdrive.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockERC4626 } from "contracts/test/MockERC4626.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; +import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; +import { ERC4626Target0Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; +import { ERC4626Target1Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; +import { ERC4626Target2Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; +import { ERC4626Target3Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; +import { ERC4626Target4Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IERC4626 } from "../../../contracts/src/interfaces/IERC4626.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { ILido } from "../../../contracts/src/interfaces/ILido.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { MockERC4626Hyperdrive } from "../../../contracts/test/MockERC4626Hyperdrive.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockERC4626 } from "../../../contracts/test/MockERC4626.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; import { ERC4626ValidationTest } from "./ERC4626Validation.t.sol"; contract UsdcERC4626 is ERC4626ValidationTest { diff --git a/test/instances/erc4626/sDai.t.sol b/test/instances/erc4626/sDai.t.sol index cbb8931f8..aa4e3d4aa 100644 --- a/test/instances/erc4626/sDai.t.sol +++ b/test/instances/erc4626/sDai.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IERC4626 } from "contracts/src/interfaces/IERC4626.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IERC4626 } from "../../../contracts/src/interfaces/IERC4626.sol"; import { ERC4626ValidationTest } from "./ERC4626Validation.t.sol"; // Interface for the `Pot` of the underlying DSR diff --git a/test/instances/ezETH/EzETHHyperdrive.t.sol b/test/instances/ezETH/EzETHHyperdrive.t.sol index 9b6a0b7e2..5f260d6a8 100644 --- a/test/instances/ezETH/EzETHHyperdrive.t.sol +++ b/test/instances/ezETH/EzETHHyperdrive.t.sol @@ -2,28 +2,28 @@ pragma solidity 0.8.20; import { stdStorage, StdStorage } from "forge-std/Test.sol"; -import { EzETHHyperdriveCoreDeployer } from "contracts/src/deployers/ezeth/EzETHHyperdriveCoreDeployer.sol"; -import { EzETHHyperdriveDeployerCoordinator } from "contracts/src/deployers/ezeth/EzETHHyperdriveDeployerCoordinator.sol"; -import { EzETHTarget0Deployer } from "contracts/src/deployers/ezeth/EzETHTarget0Deployer.sol"; -import { EzETHTarget1Deployer } from "contracts/src/deployers/ezeth/EzETHTarget1Deployer.sol"; -import { EzETHTarget2Deployer } from "contracts/src/deployers/ezeth/EzETHTarget2Deployer.sol"; -import { EzETHTarget3Deployer } from "contracts/src/deployers/ezeth/EzETHTarget3Deployer.sol"; -import { EzETHTarget4Deployer } from "contracts/src/deployers/ezeth/EzETHTarget4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IEzETHHyperdriveRead } from "contracts/src/interfaces/IEzETHHyperdriveRead.sol"; -import { IRestakeManager } from "contracts/src/interfaces/IRenzo.sol"; -import { IRenzoOracle, IDepositQueue } from "contracts/src/interfaces/IRenzo.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { InstanceTest } from "test/utils/InstanceTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { EzETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/ezeth/EzETHHyperdriveCoreDeployer.sol"; +import { EzETHHyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/ezeth/EzETHHyperdriveDeployerCoordinator.sol"; +import { EzETHTarget0Deployer } from "../../../contracts/src/deployers/ezeth/EzETHTarget0Deployer.sol"; +import { EzETHTarget1Deployer } from "../../../contracts/src/deployers/ezeth/EzETHTarget1Deployer.sol"; +import { EzETHTarget2Deployer } from "../../../contracts/src/deployers/ezeth/EzETHTarget2Deployer.sol"; +import { EzETHTarget3Deployer } from "../../../contracts/src/deployers/ezeth/EzETHTarget3Deployer.sol"; +import { EzETHTarget4Deployer } from "../../../contracts/src/deployers/ezeth/EzETHTarget4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IEzETHHyperdriveRead } from "../../../contracts/src/interfaces/IEzETHHyperdriveRead.sol"; +import { IRestakeManager } from "../../../contracts/src/interfaces/IRenzo.sol"; +import { IRenzoOracle, IDepositQueue } from "../../../contracts/src/interfaces/IRenzo.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { InstanceTest } from "../../utils/InstanceTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract EzETHHyperdriveTest is InstanceTest { using FixedPointMath for uint256; diff --git a/test/instances/lseth/LsETHHyperdrive.t.sol b/test/instances/lseth/LsETHHyperdrive.t.sol index 56abdca12..ed1711136 100644 --- a/test/instances/lseth/LsETHHyperdrive.t.sol +++ b/test/instances/lseth/LsETHHyperdrive.t.sol @@ -2,26 +2,26 @@ pragma solidity 0.8.20; import { stdStorage, StdStorage } from "forge-std/Test.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { LsETHHyperdriveCoreDeployer } from "contracts/src/deployers/lseth/LsETHHyperdriveCoreDeployer.sol"; -import { LsETHHyperdriveDeployerCoordinator } from "contracts/src/deployers/lseth/LsETHHyperdriveDeployerCoordinator.sol"; -import { LsETHTarget0Deployer } from "contracts/src/deployers/lseth/LsETHTarget0Deployer.sol"; -import { LsETHTarget1Deployer } from "contracts/src/deployers/lseth/LsETHTarget1Deployer.sol"; -import { LsETHTarget2Deployer } from "contracts/src/deployers/lseth/LsETHTarget2Deployer.sol"; -import { LsETHTarget3Deployer } from "contracts/src/deployers/lseth/LsETHTarget3Deployer.sol"; -import { LsETHTarget4Deployer } from "contracts/src/deployers/lseth/LsETHTarget4Deployer.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IRiverV1 } from "contracts/src/interfaces/IRiverV1.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { InstanceTest } from "test/utils/InstanceTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { LsETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/lseth/LsETHHyperdriveCoreDeployer.sol"; +import { LsETHHyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/lseth/LsETHHyperdriveDeployerCoordinator.sol"; +import { LsETHTarget0Deployer } from "../../../contracts/src/deployers/lseth/LsETHTarget0Deployer.sol"; +import { LsETHTarget1Deployer } from "../../../contracts/src/deployers/lseth/LsETHTarget1Deployer.sol"; +import { LsETHTarget2Deployer } from "../../../contracts/src/deployers/lseth/LsETHTarget2Deployer.sol"; +import { LsETHTarget3Deployer } from "../../../contracts/src/deployers/lseth/LsETHTarget3Deployer.sol"; +import { LsETHTarget4Deployer } from "../../../contracts/src/deployers/lseth/LsETHTarget4Deployer.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IRiverV1 } from "../../../contracts/src/interfaces/IRiverV1.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { InstanceTest } from "../../utils/InstanceTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract LsETHHyperdriveTest is InstanceTest { using FixedPointMath for uint256; diff --git a/test/instances/morpho-blue/MorphoBlueHyperdrive.t.sol b/test/instances/morpho-blue/MorphoBlueHyperdrive.t.sol index b07145813..9e63be690 100644 --- a/test/instances/morpho-blue/MorphoBlueHyperdrive.t.sol +++ b/test/instances/morpho-blue/MorphoBlueHyperdrive.t.sol @@ -5,27 +5,27 @@ import { Id, IMorpho, Market, MarketParams } from "morpho-blue/src/interfaces/IM import { MarketParamsLib } from "morpho-blue/src/libraries/MarketParamsLib.sol"; import { MorphoBalancesLib } from "morpho-blue/src/libraries/periphery/MorphoBalancesLib.sol"; import { stdStorage, StdStorage } from "forge-std/Test.sol"; -import { MorphoBlueHyperdriveCoreDeployer } from "contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveCoreDeployer.sol"; -import { MorphoBlueHyperdriveDeployerCoordinator } from "contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveDeployerCoordinator.sol"; -import { MorphoBlueTarget0Deployer } from "contracts/src/deployers/morpho-blue/MorphoBlueTarget0Deployer.sol"; -import { MorphoBlueTarget1Deployer } from "contracts/src/deployers/morpho-blue/MorphoBlueTarget1Deployer.sol"; -import { MorphoBlueTarget2Deployer } from "contracts/src/deployers/morpho-blue/MorphoBlueTarget2Deployer.sol"; -import { MorphoBlueTarget3Deployer } from "contracts/src/deployers/morpho-blue/MorphoBlueTarget3Deployer.sol"; -import { MorphoBlueTarget4Deployer } from "contracts/src/deployers/morpho-blue/MorphoBlueTarget4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { MorphoBlueConversions } from "contracts/src/instances/morpho-blue/MorphoBlueConversions.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IMorphoBlueHyperdrive } from "contracts/src/interfaces/IMorphoBlueHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { InstanceTest } from "test/utils/InstanceTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { MorphoBlueHyperdriveCoreDeployer } from "../../../contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveCoreDeployer.sol"; +import { MorphoBlueHyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/morpho-blue/MorphoBlueHyperdriveDeployerCoordinator.sol"; +import { MorphoBlueTarget0Deployer } from "../../../contracts/src/deployers/morpho-blue/MorphoBlueTarget0Deployer.sol"; +import { MorphoBlueTarget1Deployer } from "../../../contracts/src/deployers/morpho-blue/MorphoBlueTarget1Deployer.sol"; +import { MorphoBlueTarget2Deployer } from "../../../contracts/src/deployers/morpho-blue/MorphoBlueTarget2Deployer.sol"; +import { MorphoBlueTarget3Deployer } from "../../../contracts/src/deployers/morpho-blue/MorphoBlueTarget3Deployer.sol"; +import { MorphoBlueTarget4Deployer } from "../../../contracts/src/deployers/morpho-blue/MorphoBlueTarget4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { MorphoBlueConversions } from "../../../contracts/src/instances/morpho-blue/MorphoBlueConversions.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IMorphoBlueHyperdrive } from "../../../contracts/src/interfaces/IMorphoBlueHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { InstanceTest } from "../../utils/InstanceTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract MorphoBlueHyperdriveTest is InstanceTest { using FixedPointMath for uint256; diff --git a/test/instances/reth/RETHHyperdrive.t.sol b/test/instances/reth/RETHHyperdrive.t.sol index 7c019a92c..b172365b6 100644 --- a/test/instances/reth/RETHHyperdrive.t.sol +++ b/test/instances/reth/RETHHyperdrive.t.sol @@ -1,30 +1,30 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { InstanceTest } from "test/utils/InstanceTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IRocketDepositPool } from "contracts/src/interfaces/IRocketDepositPool.sol"; -import { IRocketNetworkBalances } from "contracts/src/interfaces/IRocketNetworkBalances.sol"; -import { IRocketPoolDAOProtocolSettingsDeposit } from "contracts/src/interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol"; -import { IRocketStorage } from "contracts/src/interfaces/IRocketStorage.sol"; -import { IRocketTokenRETH } from "contracts/src/interfaces/IRocketTokenRETH.sol"; -import { Lib } from "test/utils/Lib.sol"; -import { RETHHyperdriveCoreDeployer } from "contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol"; -import { RETHHyperdriveDeployerCoordinator } from "contracts/src/deployers/reth/RETHHyperdriveDeployerCoordinator.sol"; -import { RETHTarget0Deployer } from "contracts/src/deployers/reth/RETHTarget0Deployer.sol"; -import { RETHTarget1Deployer } from "contracts/src/deployers/reth/RETHTarget1Deployer.sol"; -import { RETHTarget2Deployer } from "contracts/src/deployers/reth/RETHTarget2Deployer.sol"; -import { RETHTarget3Deployer } from "contracts/src/deployers/reth/RETHTarget3Deployer.sol"; -import { RETHTarget4Deployer } from "contracts/src/deployers/reth/RETHTarget4Deployer.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { InstanceTest } from "../../utils/InstanceTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IRocketDepositPool } from "../../../contracts/src/interfaces/IRocketDepositPool.sol"; +import { IRocketNetworkBalances } from "../../../contracts/src/interfaces/IRocketNetworkBalances.sol"; +import { IRocketPoolDAOProtocolSettingsDeposit } from "../../../contracts/src/interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol"; +import { IRocketStorage } from "../../../contracts/src/interfaces/IRocketStorage.sol"; +import { IRocketTokenRETH } from "../../../contracts/src/interfaces/IRocketTokenRETH.sol"; +import { Lib } from "../../utils/Lib.sol"; +import { RETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol"; +import { RETHHyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/reth/RETHHyperdriveDeployerCoordinator.sol"; +import { RETHTarget0Deployer } from "../../../contracts/src/deployers/reth/RETHTarget0Deployer.sol"; +import { RETHTarget1Deployer } from "../../../contracts/src/deployers/reth/RETHTarget1Deployer.sol"; +import { RETHTarget2Deployer } from "../../../contracts/src/deployers/reth/RETHTarget2Deployer.sol"; +import { RETHTarget3Deployer } from "../../../contracts/src/deployers/reth/RETHTarget3Deployer.sol"; +import { RETHTarget4Deployer } from "../../../contracts/src/deployers/reth/RETHTarget4Deployer.sol"; import { stdStorage, StdStorage } from "forge-std/Test.sol"; contract RETHHyperdriveTest is InstanceTest { diff --git a/test/instances/steth/StETHHyperdrive.t.sol b/test/instances/steth/StETHHyperdrive.t.sol index 843b20a4d..837ae342b 100644 --- a/test/instances/steth/StETHHyperdrive.t.sol +++ b/test/instances/steth/StETHHyperdrive.t.sol @@ -2,26 +2,26 @@ pragma solidity 0.8.20; import { stdStorage, StdStorage } from "forge-std/Test.sol"; -import { StETHHyperdriveCoreDeployer } from "contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol"; -import { StETHHyperdriveDeployerCoordinator } from "contracts/src/deployers/steth/StETHHyperdriveDeployerCoordinator.sol"; -import { StETHTarget0Deployer } from "contracts/src/deployers/steth/StETHTarget0Deployer.sol"; -import { StETHTarget1Deployer } from "contracts/src/deployers/steth/StETHTarget1Deployer.sol"; -import { StETHTarget2Deployer } from "contracts/src/deployers/steth/StETHTarget2Deployer.sol"; -import { StETHTarget3Deployer } from "contracts/src/deployers/steth/StETHTarget3Deployer.sol"; -import { StETHTarget4Deployer } from "contracts/src/deployers/steth/StETHTarget4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { ILido } from "contracts/src/interfaces/ILido.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { InstanceTest } from "test/utils/InstanceTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { StETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol"; +import { StETHHyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/steth/StETHHyperdriveDeployerCoordinator.sol"; +import { StETHTarget0Deployer } from "../../../contracts/src/deployers/steth/StETHTarget0Deployer.sol"; +import { StETHTarget1Deployer } from "../../../contracts/src/deployers/steth/StETHTarget1Deployer.sol"; +import { StETHTarget2Deployer } from "../../../contracts/src/deployers/steth/StETHTarget2Deployer.sol"; +import { StETHTarget3Deployer } from "../../../contracts/src/deployers/steth/StETHTarget3Deployer.sol"; +import { StETHTarget4Deployer } from "../../../contracts/src/deployers/steth/StETHTarget4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { ILido } from "../../../contracts/src/interfaces/ILido.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { InstanceTest } from "../../utils/InstanceTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract StETHHyperdriveTest is InstanceTest { using FixedPointMath for uint256; diff --git a/test/instances/steth/Sweep.t.sol b/test/instances/steth/Sweep.t.sol index b67e28465..7729a4fdf 100644 --- a/test/instances/steth/Sweep.t.sol +++ b/test/instances/steth/Sweep.t.sol @@ -1,23 +1,23 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { StETHHyperdrive } from "contracts/src/instances/steth/StETHHyperdrive.sol"; -import { StETHTarget0 } from "contracts/src/instances/steth/StETHTarget0.sol"; -import { StETHTarget1 } from "contracts/src/instances/steth/StETHTarget1.sol"; -import { StETHTarget2 } from "contracts/src/instances/steth/StETHTarget2.sol"; -import { StETHTarget3 } from "contracts/src/instances/steth/StETHTarget3.sol"; -import { StETHTarget4 } from "contracts/src/instances/steth/StETHTarget4.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdriveEvents } from "contracts/src/interfaces/IHyperdriveEvents.sol"; -import { ILido } from "contracts/src/interfaces/ILido.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockLido } from "contracts/test/MockLido.sol"; -import { BaseTest } from "test/utils/BaseTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; +import { StETHHyperdrive } from "../../../contracts/src/instances/steth/StETHHyperdrive.sol"; +import { StETHTarget0 } from "../../../contracts/src/instances/steth/StETHTarget0.sol"; +import { StETHTarget1 } from "../../../contracts/src/instances/steth/StETHTarget1.sol"; +import { StETHTarget2 } from "../../../contracts/src/instances/steth/StETHTarget2.sol"; +import { StETHTarget3 } from "../../../contracts/src/instances/steth/StETHTarget3.sol"; +import { StETHTarget4 } from "../../../contracts/src/instances/steth/StETHTarget4.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdriveEvents } from "../../../contracts/src/interfaces/IHyperdriveEvents.sol"; +import { ILido } from "../../../contracts/src/interfaces/ILido.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockLido } from "../../../contracts/test/MockLido.sol"; +import { BaseTest } from "../../utils/BaseTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; contract SweepTest is BaseTest, IHyperdriveEvents { string internal constant NAME = "Hyperdrive"; diff --git a/test/instances/susde/SUSDe.t.sol b/test/instances/susde/SUSDe.t.sol index 35f6efbed..12b220d61 100644 --- a/test/instances/susde/SUSDe.t.sol +++ b/test/instances/susde/SUSDe.t.sol @@ -2,28 +2,28 @@ pragma solidity 0.8.20; import { stdStorage, StdStorage } from "forge-std/Test.sol"; -import { ERC4626HyperdriveCoreDeployer } from "contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; -import { ERC4626HyperdriveDeployerCoordinator } from "contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; -import { ERC4626Target0Deployer } from "contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; -import { ERC4626Target1Deployer } from "contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; -import { ERC4626Target2Deployer } from "contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; -import { ERC4626Target3Deployer } from "contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; -import { ERC4626Target4Deployer } from "contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { ERC4626Conversions } from "contracts/src/instances/erc4626/ERC4626Conversions.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IERC4626 } from "contracts/src/interfaces/IERC4626.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { InstanceTest } from "test/utils/InstanceTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; +import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; +import { ERC4626Target0Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; +import { ERC4626Target1Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; +import { ERC4626Target2Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; +import { ERC4626Target3Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; +import { ERC4626Target4Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { ERC4626Conversions } from "../../../contracts/src/instances/erc4626/ERC4626Conversions.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IERC4626 } from "../../../contracts/src/interfaces/IERC4626.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { InstanceTest } from "../../utils/InstanceTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract SUSDeHyperdriveTest is InstanceTest { using FixedPointMath for uint256; diff --git a/test/integrations/deployers/DeployerCoordinator.t.sol b/test/integrations/deployers/DeployerCoordinator.t.sol index 1c292a836..ddabf82ac 100644 --- a/test/integrations/deployers/DeployerCoordinator.t.sol +++ b/test/integrations/deployers/DeployerCoordinator.t.sol @@ -1,17 +1,17 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { HyperdriveDeployerCoordinator } from "contracts/src/deployers/HyperdriveDeployerCoordinator.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { MockERC4626 } from "contracts/test/MockERC4626.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/HyperdriveDeployerCoordinator.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { MockERC4626 } from "../../../contracts/test/MockERC4626.sol"; +import { Lib } from "../../utils/Lib.sol"; contract MockHyperdriveDeployerCoordinator is HyperdriveDeployerCoordinator { string public constant override kind = "MockHyperdriveDeployerCoordinator"; diff --git a/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol b/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol index 753f92e52..381ff7680 100644 --- a/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol +++ b/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol @@ -1,24 +1,24 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { HyperdriveDeployerCoordinator } from "contracts/src/deployers/HyperdriveDeployerCoordinator.sol"; -import { ERC4626HyperdriveCoreDeployer } from "contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; -import { ERC4626Target0Deployer } from "contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; -import { ERC4626Target1Deployer } from "contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; -import { ERC4626Target2Deployer } from "contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; -import { ERC4626Target3Deployer } from "contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; -import { ERC4626Target4Deployer } from "contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockERC4626 } from "contracts/test/MockERC4626.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/HyperdriveDeployerCoordinator.sol"; +import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; +import { ERC4626Target0Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; +import { ERC4626Target1Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; +import { ERC4626Target2Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; +import { ERC4626Target3Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; +import { ERC4626Target4Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockERC4626 } from "../../../contracts/test/MockERC4626.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; import { DeployerCoordinatorTest, MockHyperdriveDeployerCoordinator } from "test/integrations/deployers/DeployerCoordinator.t.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { Lib } from "../../utils/Lib.sol"; contract ERC4626DeployerCoordinatorTest is DeployerCoordinatorTest { using FixedPointMath for *; diff --git a/test/integrations/deployers/RethDeployerCoordinator.t.sol b/test/integrations/deployers/RethDeployerCoordinator.t.sol index 082888744..7efd5a8d5 100644 --- a/test/integrations/deployers/RethDeployerCoordinator.t.sol +++ b/test/integrations/deployers/RethDeployerCoordinator.t.sol @@ -1,24 +1,24 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { HyperdriveDeployerCoordinator } from "contracts/src/deployers/HyperdriveDeployerCoordinator.sol"; -import { RETHHyperdriveCoreDeployer } from "contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol"; -import { RETHTarget0Deployer } from "contracts/src/deployers/reth/RETHTarget0Deployer.sol"; -import { RETHTarget1Deployer } from "contracts/src/deployers/reth/RETHTarget1Deployer.sol"; -import { RETHTarget2Deployer } from "contracts/src/deployers/reth/RETHTarget2Deployer.sol"; -import { RETHTarget3Deployer } from "contracts/src/deployers/reth/RETHTarget3Deployer.sol"; -import { RETHTarget4Deployer } from "contracts/src/deployers/reth/RETHTarget4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockRocketPool } from "contracts/test/MockRocketPool.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/HyperdriveDeployerCoordinator.sol"; +import { RETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol"; +import { RETHTarget0Deployer } from "../../../contracts/src/deployers/reth/RETHTarget0Deployer.sol"; +import { RETHTarget1Deployer } from "../../../contracts/src/deployers/reth/RETHTarget1Deployer.sol"; +import { RETHTarget2Deployer } from "../../../contracts/src/deployers/reth/RETHTarget2Deployer.sol"; +import { RETHTarget3Deployer } from "../../../contracts/src/deployers/reth/RETHTarget3Deployer.sol"; +import { RETHTarget4Deployer } from "../../../contracts/src/deployers/reth/RETHTarget4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockRocketPool } from "../../../contracts/test/MockRocketPool.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; import { DeployerCoordinatorTest, MockHyperdriveDeployerCoordinator } from "test/integrations/deployers/DeployerCoordinator.t.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { Lib } from "../../utils/Lib.sol"; contract RethDeployerCoordinatorTest is DeployerCoordinatorTest { using FixedPointMath for *; diff --git a/test/integrations/deployers/StethDeployerCoordinator.t.sol b/test/integrations/deployers/StethDeployerCoordinator.t.sol index 6c36e9530..68d7d3843 100644 --- a/test/integrations/deployers/StethDeployerCoordinator.t.sol +++ b/test/integrations/deployers/StethDeployerCoordinator.t.sol @@ -1,24 +1,24 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { HyperdriveDeployerCoordinator } from "contracts/src/deployers/HyperdriveDeployerCoordinator.sol"; -import { StETHHyperdriveCoreDeployer } from "contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol"; -import { StETHTarget0Deployer } from "contracts/src/deployers/steth/StETHTarget0Deployer.sol"; -import { StETHTarget1Deployer } from "contracts/src/deployers/steth/StETHTarget1Deployer.sol"; -import { StETHTarget2Deployer } from "contracts/src/deployers/steth/StETHTarget2Deployer.sol"; -import { StETHTarget3Deployer } from "contracts/src/deployers/steth/StETHTarget3Deployer.sol"; -import { StETHTarget4Deployer } from "contracts/src/deployers/steth/StETHTarget4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockLido } from "contracts/test/MockLido.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/HyperdriveDeployerCoordinator.sol"; +import { StETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol"; +import { StETHTarget0Deployer } from "../../../contracts/src/deployers/steth/StETHTarget0Deployer.sol"; +import { StETHTarget1Deployer } from "../../../contracts/src/deployers/steth/StETHTarget1Deployer.sol"; +import { StETHTarget2Deployer } from "../../../contracts/src/deployers/steth/StETHTarget2Deployer.sol"; +import { StETHTarget3Deployer } from "../../../contracts/src/deployers/steth/StETHTarget3Deployer.sol"; +import { StETHTarget4Deployer } from "../../../contracts/src/deployers/steth/StETHTarget4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockLido } from "../../../contracts/test/MockLido.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; import { DeployerCoordinatorTest, MockHyperdriveDeployerCoordinator } from "test/integrations/deployers/DeployerCoordinator.t.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { Lib } from "../../utils/Lib.sol"; contract StethDeployerCoordinatorTest is DeployerCoordinatorTest { using FixedPointMath for *; diff --git a/test/integrations/factory/HyperdriveFactory.t.sol b/test/integrations/factory/HyperdriveFactory.t.sol index 9e4665397..28880919b 100644 --- a/test/integrations/factory/HyperdriveFactory.t.sol +++ b/test/integrations/factory/HyperdriveFactory.t.sol @@ -1,39 +1,39 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { ERC4626HyperdriveCoreDeployer } from "contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; -import { ERC4626HyperdriveDeployerCoordinator } from "contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; -import { ERC4626Target0Deployer } from "contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; -import { ERC4626Target1Deployer } from "contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; -import { ERC4626Target2Deployer } from "contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; -import { ERC4626Target3Deployer } from "contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; -import { ERC4626Target4Deployer } from "contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; -import { StETHHyperdriveCoreDeployer } from "contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol"; -import { StETHHyperdriveDeployerCoordinator } from "contracts/src/deployers/steth/StETHHyperdriveDeployerCoordinator.sol"; -import { StETHTarget0Deployer } from "contracts/src/deployers/steth/StETHTarget0Deployer.sol"; -import { StETHTarget1Deployer } from "contracts/src/deployers/steth/StETHTarget1Deployer.sol"; -import { StETHTarget2Deployer } from "contracts/src/deployers/steth/StETHTarget2Deployer.sol"; -import { StETHTarget3Deployer } from "contracts/src/deployers/steth/StETHTarget3Deployer.sol"; -import { StETHTarget4Deployer } from "contracts/src/deployers/steth/StETHTarget4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IERC4626 } from "contracts/src/interfaces/IERC4626.sol"; -import { MockERC4626, ERC20 } from "contracts/test/MockERC4626.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { IHyperdriveFactory } from "contracts/src/interfaces/IHyperdriveFactory.sol"; -import { ILido } from "contracts/src/interfaces/ILido.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH, HYPERDRIVE_FACTORY_KIND, VERSION } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockHyperdriveDeployer, MockHyperdriveTargetDeployer } from "contracts/test/MockHyperdriveDeployer.sol"; -import { MockLido } from "contracts/test/MockLido.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; +import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; +import { ERC4626Target0Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; +import { ERC4626Target1Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; +import { ERC4626Target2Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; +import { ERC4626Target3Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; +import { ERC4626Target4Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; +import { StETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/steth/StETHHyperdriveCoreDeployer.sol"; +import { StETHHyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/steth/StETHHyperdriveDeployerCoordinator.sol"; +import { StETHTarget0Deployer } from "../../../contracts/src/deployers/steth/StETHTarget0Deployer.sol"; +import { StETHTarget1Deployer } from "../../../contracts/src/deployers/steth/StETHTarget1Deployer.sol"; +import { StETHTarget2Deployer } from "../../../contracts/src/deployers/steth/StETHTarget2Deployer.sol"; +import { StETHTarget3Deployer } from "../../../contracts/src/deployers/steth/StETHTarget3Deployer.sol"; +import { StETHTarget4Deployer } from "../../../contracts/src/deployers/steth/StETHTarget4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IERC4626 } from "../../../contracts/src/interfaces/IERC4626.sol"; +import { MockERC4626, ERC20 } from "../../../contracts/test/MockERC4626.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { IHyperdriveFactory } from "../../../contracts/src/interfaces/IHyperdriveFactory.sol"; +import { ILido } from "../../../contracts/src/interfaces/ILido.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ETH, HYPERDRIVE_FACTORY_KIND, VERSION } from "../../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockHyperdriveDeployer, MockHyperdriveTargetDeployer } from "../../../contracts/test/MockHyperdriveDeployer.sol"; +import { MockLido } from "../../../contracts/test/MockLido.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; string constant HYPERDRIVE_NAME = "Hyperdrive"; string constant COORDINATOR_NAME = "HyperdriveDeployerCoordinator"; diff --git a/test/integrations/hyperdrive/CheckpointRewards.t.sol b/test/integrations/hyperdrive/CheckpointRewards.t.sol index 4a2245f88..824ab2b21 100644 --- a/test/integrations/hyperdrive/CheckpointRewards.t.sol +++ b/test/integrations/hyperdrive/CheckpointRewards.t.sol @@ -2,15 +2,15 @@ pragma solidity 0.8.20; import { VmSafe } from "forge-std/Vm.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdriveCheckpointRewarder } from "contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol"; -import { IHyperdriveCheckpointSubrewarder } from "contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveCheckpointRewarder } from "contracts/src/rewarder/HyperdriveCheckpointRewarder.sol"; -import { HyperdriveCheckpointSubrewarder } from "contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdriveCheckpointRewarder } from "../../../contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol"; +import { IHyperdriveCheckpointSubrewarder } from "../../../contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveCheckpointRewarder } from "../../../contracts/src/rewarder/HyperdriveCheckpointRewarder.sol"; +import { HyperdriveCheckpointSubrewarder } from "../../../contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract CheckpointRewardsTest is HyperdriveTest { using FixedPointMath for *; diff --git a/test/integrations/hyperdrive/CircuitBreakerTest.t.sol b/test/integrations/hyperdrive/CircuitBreakerTest.t.sol index 11d7f45e7..69ae611b0 100644 --- a/test/integrations/hyperdrive/CircuitBreakerTest.t.sol +++ b/test/integrations/hyperdrive/CircuitBreakerTest.t.sol @@ -2,13 +2,13 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/YieldSpaceMath.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { YieldSpaceMath } from "../../../contracts/src/libraries/YieldSpaceMath.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract CircuitBreakerTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/integrations/hyperdrive/IntraCheckpointNettingTest.t.sol b/test/integrations/hyperdrive/IntraCheckpointNettingTest.t.sol index 4b2b07ffb..9218b612a 100644 --- a/test/integrations/hyperdrive/IntraCheckpointNettingTest.t.sol +++ b/test/integrations/hyperdrive/IntraCheckpointNettingTest.t.sol @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { MockHyperdrive, IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { MockHyperdrive, IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract IntraCheckpointNettingTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/integrations/hyperdrive/LPWithdrawalTest.t.sol b/test/integrations/hyperdrive/LPWithdrawalTest.t.sol index 8d7d999e6..e5aaaf27a 100644 --- a/test/integrations/hyperdrive/LPWithdrawalTest.t.sol +++ b/test/integrations/hyperdrive/LPWithdrawalTest.t.sol @@ -2,14 +2,14 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { LPMath } from "contracts/src/libraries/LPMath.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { LPMath } from "../../../contracts/src/libraries/LPMath.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract LPWithdrawalTest is HyperdriveTest { using FixedPointMath for int256; diff --git a/test/integrations/hyperdrive/NegativeInterestLongFeeTest.t.sol b/test/integrations/hyperdrive/NegativeInterestLongFeeTest.t.sol index f6f996f84..77f11294e 100644 --- a/test/integrations/hyperdrive/NegativeInterestLongFeeTest.t.sol +++ b/test/integrations/hyperdrive/NegativeInterestLongFeeTest.t.sol @@ -1,13 +1,13 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { MockHyperdrive, IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { MockHyperdrive, IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract NegativeInterestLongFeeTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/integrations/hyperdrive/NegativeInterestShortFeeTest.t.sol b/test/integrations/hyperdrive/NegativeInterestShortFeeTest.t.sol index edb6025a2..0e6aed859 100644 --- a/test/integrations/hyperdrive/NegativeInterestShortFeeTest.t.sol +++ b/test/integrations/hyperdrive/NegativeInterestShortFeeTest.t.sol @@ -1,13 +1,13 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { MockHyperdrive, IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { MockHyperdrive, IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract NegativeInterestShortFeeTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/integrations/hyperdrive/NonstandardDecimals.sol b/test/integrations/hyperdrive/NonstandardDecimals.sol index 018156b99..6d2bb164b 100644 --- a/test/integrations/hyperdrive/NonstandardDecimals.sol +++ b/test/integrations/hyperdrive/NonstandardDecimals.sol @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract NonstandardDecimalsTest is HyperdriveTest { using FixedPointMath for int256; diff --git a/test/integrations/hyperdrive/PresentValueTest.t.sol b/test/integrations/hyperdrive/PresentValueTest.t.sol index e63ac9715..eb16fd7f2 100644 --- a/test/integrations/hyperdrive/PresentValueTest.t.sol +++ b/test/integrations/hyperdrive/PresentValueTest.t.sol @@ -2,14 +2,14 @@ pragma solidity 0.8.20; import { console2 as console } from "forge-std/console2.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { MockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { MockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract PresentValueTest is HyperdriveTest { using FixedPointMath for *; diff --git a/test/integrations/hyperdrive/PriceDiscovery.t.sol b/test/integrations/hyperdrive/PriceDiscovery.t.sol index 71b470058..c50aefa84 100644 --- a/test/integrations/hyperdrive/PriceDiscovery.t.sol +++ b/test/integrations/hyperdrive/PriceDiscovery.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract PriceDiscoveryTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/integrations/hyperdrive/ReentrancyTest.t.sol b/test/integrations/hyperdrive/ReentrancyTest.t.sol index 8d18085c9..c8fa559aa 100644 --- a/test/integrations/hyperdrive/ReentrancyTest.t.sol +++ b/test/integrations/hyperdrive/ReentrancyTest.t.sol @@ -3,12 +3,12 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; import { ReentrancyGuard } from "openzeppelin/utils/ReentrancyGuard.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract ReentrancyTester { using Lib for *; diff --git a/test/integrations/hyperdrive/RoundTripTest.t.sol b/test/integrations/hyperdrive/RoundTripTest.t.sol index f13f006cc..e6a48ae1b 100644 --- a/test/integrations/hyperdrive/RoundTripTest.t.sol +++ b/test/integrations/hyperdrive/RoundTripTest.t.sol @@ -2,13 +2,13 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/YieldSpaceMath.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { YieldSpaceMath } from "../../../contracts/src/libraries/YieldSpaceMath.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract RoundTripTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/integrations/hyperdrive/SandwichTest.t.sol b/test/integrations/hyperdrive/SandwichTest.t.sol index 6c54eadf9..3fb473718 100644 --- a/test/integrations/hyperdrive/SandwichTest.t.sol +++ b/test/integrations/hyperdrive/SandwichTest.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract SandwichTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/integrations/hyperdrive/VariableInterestLongTest.t.sol b/test/integrations/hyperdrive/VariableInterestLongTest.t.sol index 42c258906..e31fa8a4f 100644 --- a/test/integrations/hyperdrive/VariableInterestLongTest.t.sol +++ b/test/integrations/hyperdrive/VariableInterestLongTest.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract VariableInterestLongTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/integrations/hyperdrive/VariableInterestShortTest.t.sol b/test/integrations/hyperdrive/VariableInterestShortTest.t.sol index 8449ed11a..e51ce4263 100644 --- a/test/integrations/hyperdrive/VariableInterestShortTest.t.sol +++ b/test/integrations/hyperdrive/VariableInterestShortTest.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract VariableInterestShortTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/integrations/hyperdrive/ZombieInterestTest.t.sol b/test/integrations/hyperdrive/ZombieInterestTest.t.sol index 6eac49a5c..571be1af0 100644 --- a/test/integrations/hyperdrive/ZombieInterestTest.t.sol +++ b/test/integrations/hyperdrive/ZombieInterestTest.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "test/utils/HyperdriveTest.sol"; -import { MockHyperdrive, IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "../../utils/HyperdriveTest.sol"; +import { MockHyperdrive, IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { Lib } from "../../utils/Lib.sol"; contract ZombieInterestTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/ERC20Forwarder.t.sol b/test/units/ERC20Forwarder.t.sol index c1ced0921..c1ff00f4a 100644 --- a/test/units/ERC20Forwarder.t.sol +++ b/test/units/ERC20Forwarder.t.sol @@ -1,16 +1,16 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.18; -import { IERC20Forwarder } from "contracts/src/interfaces/IERC20Forwarder.sol"; -import { IMultiToken } from "contracts/src/interfaces/IMultiToken.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ERC20_FORWARDER_KIND, ERC20_FORWARDER_FACTORY_KIND, VERSION } from "contracts/src/libraries/Constants.sol"; -import { ERC20Forwarder } from "contracts/src/token/ERC20Forwarder.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { MockAssetId } from "contracts/test/MockAssetId.sol"; -import { IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IERC20Forwarder } from "../../contracts/src/interfaces/IERC20Forwarder.sol"; +import { IMultiToken } from "../../contracts/src/interfaces/IMultiToken.sol"; +import { AssetId } from "../../contracts/src/libraries/AssetId.sol"; +import { ERC20_FORWARDER_KIND, ERC20_FORWARDER_FACTORY_KIND, VERSION } from "../../contracts/src/libraries/Constants.sol"; +import { ERC20Forwarder } from "../../contracts/src/token/ERC20Forwarder.sol"; +import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { MockAssetId } from "../../contracts/test/MockAssetId.sol"; +import { IMockHyperdrive } from "../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest } from "../utils/HyperdriveTest.sol"; +import { Lib } from "../utils/Lib.sol"; contract ERC20ForwarderFactoryTest is HyperdriveTest { using Lib for *; diff --git a/test/units/ERC20ForwarderFactory.t.sol b/test/units/ERC20ForwarderFactory.t.sol index f5050090d..08a47875d 100644 --- a/test/units/ERC20ForwarderFactory.t.sol +++ b/test/units/ERC20ForwarderFactory.t.sol @@ -1,16 +1,16 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.18; -import { IERC20Forwarder } from "contracts/src/interfaces/IERC20Forwarder.sol"; -import { IERC20ForwarderFactory } from "contracts/src/interfaces/IERC20ForwarderFactory.sol"; -import { IMultiToken } from "contracts/src/interfaces/IMultiToken.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ERC20Forwarder } from "contracts/src/token/ERC20Forwarder.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { MockAssetId } from "contracts/test/MockAssetId.sol"; -import { IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IERC20Forwarder } from "../../contracts/src/interfaces/IERC20Forwarder.sol"; +import { IERC20ForwarderFactory } from "../../contracts/src/interfaces/IERC20ForwarderFactory.sol"; +import { IMultiToken } from "../../contracts/src/interfaces/IMultiToken.sol"; +import { AssetId } from "../../contracts/src/libraries/AssetId.sol"; +import { ERC20Forwarder } from "../../contracts/src/token/ERC20Forwarder.sol"; +import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { MockAssetId } from "../../contracts/test/MockAssetId.sol"; +import { IMockHyperdrive } from "../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest } from "../utils/HyperdriveTest.sol"; +import { Lib } from "../utils/Lib.sol"; contract DummyForwarderFactory is ERC20ForwarderFactory { constructor() ERC20ForwarderFactory("ForwarderFactory") {} diff --git a/test/units/ForceRevertDelegatecall.t.sol b/test/units/ForceRevertDelegatecall.t.sol index a8eabafa8..5416493b2 100644 --- a/test/units/ForceRevertDelegatecall.t.sol +++ b/test/units/ForceRevertDelegatecall.t.sol @@ -2,13 +2,13 @@ pragma solidity ^0.8.18; import { Test } from "forge-std/Test.sol"; -import { Hyperdrive } from "contracts/src/external/Hyperdrive.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { HyperdriveStorage } from "contracts/src/internal/HyperdriveStorage.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { MockHyperdriveBase } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; +import { Hyperdrive } from "../../contracts/src/external/Hyperdrive.sol"; +import { IERC20 } from "../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../contracts/src/interfaces/IHyperdrive.sol"; +import { HyperdriveStorage } from "../../contracts/src/internal/HyperdriveStorage.sol"; +import { HyperdriveMath } from "../../contracts/src/libraries/HyperdriveMath.sol"; +import { MockHyperdriveBase } from "../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveUtils } from "../utils/HyperdriveUtils.sol"; contract DummyProvider { function get() external pure returns (uint256) { diff --git a/test/units/MultiToken.t.sol b/test/units/MultiToken.t.sol index 880a71296..f6ee91dfd 100644 --- a/test/units/MultiToken.t.sol +++ b/test/units/MultiToken.t.sol @@ -1,17 +1,17 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { MockAssetId } from "contracts/test/MockAssetId.sol"; -import { HyperdriveMultiToken } from "contracts/src/internal/HyperdriveMultiToken.sol"; -import { MockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { IMockHyperdrive, MockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../contracts/src/interfaces/IHyperdrive.sol"; +import { IERC20 } from "../../contracts/src/interfaces/IERC20.sol"; +import { ERC20Mintable } from "../../contracts/test/ERC20Mintable.sol"; +import { AssetId } from "../../contracts/src/libraries/AssetId.sol"; +import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { MockAssetId } from "../../contracts/test/MockAssetId.sol"; +import { HyperdriveMultiToken } from "../../contracts/src/internal/HyperdriveMultiToken.sol"; +import { MockHyperdrive } from "../../contracts/test/MockHyperdrive.sol"; +import { IMockHyperdrive, MockHyperdrive } from "../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest } from "../utils/HyperdriveTest.sol"; +import { Lib } from "../utils/Lib.sol"; contract DummyHyperdriveMultiToken is HyperdriveMultiToken, MockHyperdrive { constructor( diff --git a/test/units/hyperdrive/AddLiquidityTest.t.sol b/test/units/hyperdrive/AddLiquidityTest.t.sol index 349bcfb8c..fdfae275c 100644 --- a/test/units/hyperdrive/AddLiquidityTest.t.sol +++ b/test/units/hyperdrive/AddLiquidityTest.t.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.20; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract AddLiquidityTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/Admin.t.sol b/test/units/hyperdrive/Admin.t.sol index cd4d9338f..b32a1137e 100644 --- a/test/units/hyperdrive/Admin.t.sol +++ b/test/units/hyperdrive/Admin.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; contract AdminTest is HyperdriveTest { function test_pause_failure_unauthorized() external { diff --git a/test/units/hyperdrive/CheckpointTest.t.sol b/test/units/hyperdrive/CheckpointTest.t.sol index 3beb2ed0c..2357a1289 100644 --- a/test/units/hyperdrive/CheckpointTest.t.sol +++ b/test/units/hyperdrive/CheckpointTest.t.sol @@ -2,10 +2,10 @@ pragma solidity 0.8.20; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveTest, HyperdriveUtils, MockHyperdrive, IHyperdrive } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveTest, HyperdriveUtils, MockHyperdrive, IHyperdrive } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract CheckpointTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/CloseLongTest.t.sol b/test/units/hyperdrive/CloseLongTest.t.sol index 09440df3d..50b40f722 100644 --- a/test/units/hyperdrive/CloseLongTest.t.sol +++ b/test/units/hyperdrive/CloseLongTest.t.sol @@ -3,14 +3,14 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/YieldSpaceMath.sol"; -import { MockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { YieldSpaceMath } from "../../../contracts/src/libraries/YieldSpaceMath.sol"; +import { MockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract CloseLongTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/CloseShortTest.t.sol b/test/units/hyperdrive/CloseShortTest.t.sol index e3568c6a6..e5aa898e2 100644 --- a/test/units/hyperdrive/CloseShortTest.t.sol +++ b/test/units/hyperdrive/CloseShortTest.t.sol @@ -3,13 +3,13 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/YieldSpaceMath.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { YieldSpaceMath } from "../../../contracts/src/libraries/YieldSpaceMath.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract CloseShortTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/DataProvider.t.sol b/test/units/hyperdrive/DataProvider.t.sol index 6ebc73bed..772cfbce7 100644 --- a/test/units/hyperdrive/DataProvider.t.sol +++ b/test/units/hyperdrive/DataProvider.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; contract HyperdriveDataProviderTest is HyperdriveTest { function testLoadSlots() public view { diff --git a/test/units/hyperdrive/ExtremeInputs.t.sol b/test/units/hyperdrive/ExtremeInputs.t.sol index 93a579b34..872118237 100644 --- a/test/units/hyperdrive/ExtremeInputs.t.sol +++ b/test/units/hyperdrive/ExtremeInputs.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/YieldSpaceMath.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { YieldSpaceMath } from "../../../contracts/src/libraries/YieldSpaceMath.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract ExtremeInputs is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/FeeTest.t.sol b/test/units/hyperdrive/FeeTest.t.sol index 79b1f4ca6..7672e7277 100644 --- a/test/units/hyperdrive/FeeTest.t.sol +++ b/test/units/hyperdrive/FeeTest.t.sol @@ -3,13 +3,13 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { MockHyperdrive, IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { MockHyperdrive, IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract FeeTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/InitializeTest.t.sol b/test/units/hyperdrive/InitializeTest.t.sol index 08e7007ec..1e98b7b99 100644 --- a/test/units/hyperdrive/InitializeTest.t.sol +++ b/test/units/hyperdrive/InitializeTest.t.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.20; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract InitializeTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/OpenLongTest.t.sol b/test/units/hyperdrive/OpenLongTest.t.sol index 5227ddbf8..5f5a040c8 100644 --- a/test/units/hyperdrive/OpenLongTest.t.sol +++ b/test/units/hyperdrive/OpenLongTest.t.sol @@ -3,15 +3,15 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { SafeCast } from "contracts/src/libraries/SafeCast.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/YieldSpaceMath.sol"; -import { MockHyperdrive, IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { SafeCast } from "../../../contracts/src/libraries/SafeCast.sol"; +import { YieldSpaceMath } from "../../../contracts/src/libraries/YieldSpaceMath.sol"; +import { MockHyperdrive, IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract OpenLongTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/OpenShortTest.t.sol b/test/units/hyperdrive/OpenShortTest.t.sol index 891ee6bb3..1cefc05a3 100644 --- a/test/units/hyperdrive/OpenShortTest.t.sol +++ b/test/units/hyperdrive/OpenShortTest.t.sol @@ -3,13 +3,13 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract OpenShortTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/RedeemWithdrawalSharesTest.t.sol b/test/units/hyperdrive/RedeemWithdrawalSharesTest.t.sol index ffcba9b5d..15696cc1d 100644 --- a/test/units/hyperdrive/RedeemWithdrawalSharesTest.t.sol +++ b/test/units/hyperdrive/RedeemWithdrawalSharesTest.t.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.20; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { HyperdriveTest, HyperdriveUtils } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract RedeemWithdrawalSharesTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/RemoveLiquidityTest.t.sol b/test/units/hyperdrive/RemoveLiquidityTest.t.sol index 92b99ef7e..b242cda53 100644 --- a/test/units/hyperdrive/RemoveLiquidityTest.t.sol +++ b/test/units/hyperdrive/RemoveLiquidityTest.t.sol @@ -3,14 +3,14 @@ pragma solidity 0.8.20; import { stdError } from "forge-std/StdError.sol"; import { VmSafe } from "forge-std/Vm.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { LPMath } from "contracts/src/libraries/LPMath.sol"; -import { MockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { LPMath } from "../../../contracts/src/libraries/LPMath.sol"; +import { MockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract RemoveLiquidityTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/hyperdrive/UpdateLiquidityTest.t.sol b/test/units/hyperdrive/UpdateLiquidityTest.t.sol index 648f738b9..d761213c8 100644 --- a/test/units/hyperdrive/UpdateLiquidityTest.t.sol +++ b/test/units/hyperdrive/UpdateLiquidityTest.t.sol @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockHyperdrive, MockHyperdriveTarget0, MockHyperdriveTarget1 } from "contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockHyperdrive, MockHyperdriveTarget0, MockHyperdriveTarget1 } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract UpdateLiquidityTest is HyperdriveTest { using FixedPointMath for *; diff --git a/test/units/libraries/AssetId.t.sol b/test/units/libraries/AssetId.t.sol index 51f87901f..44786acb2 100644 --- a/test/units/libraries/AssetId.t.sol +++ b/test/units/libraries/AssetId.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { MockAssetId } from "contracts/test/MockAssetId.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { MockAssetId } from "../../../contracts/test/MockAssetId.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract AssetIdTest is HyperdriveTest { using Lib for *; diff --git a/test/units/libraries/FixedPointMath.t.sol b/test/units/libraries/FixedPointMath.t.sol index 88723565c..e768d4c33 100644 --- a/test/units/libraries/FixedPointMath.t.sol +++ b/test/units/libraries/FixedPointMath.t.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.20; import { stdError, Test } from "forge-std/Test.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { MockFixedPointMath } from "contracts/test/MockFixedPointMath.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { MockFixedPointMath } from "../../../contracts/test/MockFixedPointMath.sol"; import { LogExpMath } from "test/3rdPartyLibs/LogExpMath.sol"; import { BalancerErrors } from "test/3rdPartyLibs/BalancerErrors.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { Lib } from "../../utils/Lib.sol"; contract FixedPointMathTest is Test { using FixedPointMath for uint256; diff --git a/test/units/libraries/HyperdriveMath.t.sol b/test/units/libraries/HyperdriveMath.t.sol index f886c86d1..e98f5eef9 100644 --- a/test/units/libraries/HyperdriveMath.t.sol +++ b/test/units/libraries/HyperdriveMath.t.sol @@ -1,16 +1,16 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { LPMath } from "contracts/src/libraries/LPMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { IMockHyperdrive } from "contracts/test/MockHyperdrive.sol"; -import { MockHyperdriveMath } from "contracts/test/MockHyperdriveMath.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { LPMath } from "../../../contracts/src/libraries/LPMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { MockHyperdriveMath } from "../../../contracts/test/MockHyperdriveMath.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract HyperdriveMathTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/libraries/HyperdriveUtilsTest.t.sol b/test/units/libraries/HyperdriveUtilsTest.t.sol index 8bfff59f0..88594ef86 100644 --- a/test/units/libraries/HyperdriveUtilsTest.t.sol +++ b/test/units/libraries/HyperdriveUtilsTest.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract HyperdriveUtilsTest is HyperdriveTest { using FixedPointMath for *; diff --git a/test/units/libraries/LPMath.t.sol b/test/units/libraries/LPMath.t.sol index c318f4d29..1c6d1bc5e 100644 --- a/test/units/libraries/LPMath.t.sol +++ b/test/units/libraries/LPMath.t.sol @@ -1,14 +1,14 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { LPMath } from "contracts/src/libraries/LPMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/YieldSpaceMath.sol"; -import { MockLPMath } from "contracts/test/MockLPMath.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { LPMath } from "../../../contracts/src/libraries/LPMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { YieldSpaceMath } from "../../../contracts/src/libraries/YieldSpaceMath.sol"; +import { MockLPMath } from "../../../contracts/test/MockLPMath.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract LPMathTest is HyperdriveTest { using FixedPointMath for uint256; diff --git a/test/units/libraries/SafeCast.t.sol b/test/units/libraries/SafeCast.t.sol index c8f78e279..b41ade9c0 100644 --- a/test/units/libraries/SafeCast.t.sol +++ b/test/units/libraries/SafeCast.t.sol @@ -2,9 +2,9 @@ pragma solidity ^0.8.18; import { Vm } from "forge-std/Vm.sol"; -import { SafeCast } from "contracts/src/libraries/SafeCast.sol"; -import { MockSafeCast } from "contracts/test/MockSafeCast.sol"; -import { BaseTest } from "test/utils/BaseTest.sol"; +import { SafeCast } from "../../../contracts/src/libraries/SafeCast.sol"; +import { MockSafeCast } from "../../../contracts/test/MockSafeCast.sol"; +import { BaseTest } from "../../utils/BaseTest.sol"; contract SafeCastTest is BaseTest { function test_toUint128_fuzz(uint256 num) public { diff --git a/test/units/libraries/YieldSpaceMath.t.sol b/test/units/libraries/YieldSpaceMath.t.sol index 6e2157d9f..57b19a04b 100644 --- a/test/units/libraries/YieldSpaceMath.t.sol +++ b/test/units/libraries/YieldSpaceMath.t.sol @@ -2,14 +2,14 @@ pragma solidity 0.8.20; import { Test } from "forge-std/Test.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { LPMath } from "contracts/src/libraries/LPMath.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { MockYieldSpaceMath } from "contracts/test/MockYieldSpaceMath.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { LPMath } from "../../../contracts/src/libraries/LPMath.sol"; +import { YieldSpaceMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { MockYieldSpaceMath } from "../../../contracts/test/MockYieldSpaceMath.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract YieldSpaceMathTest is Test { using FixedPointMath for uint256; diff --git a/test/units/registry/HyperdriveRegistry.t.sol b/test/units/registry/HyperdriveRegistry.t.sol index ce8a8ddf8..39c30ff16 100644 --- a/test/units/registry/HyperdriveRegistry.t.sol +++ b/test/units/registry/HyperdriveRegistry.t.sol @@ -2,27 +2,27 @@ pragma solidity 0.8.20; import { VmSafe } from "forge-std/Vm.sol"; -import { ERC4626HyperdriveCoreDeployer } from "contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; -import { ERC4626HyperdriveDeployerCoordinator } from "contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; -import { ERC4626Target0Deployer } from "contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; -import { ERC4626Target1Deployer } from "contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; -import { ERC4626Target2Deployer } from "contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; -import { ERC4626Target3Deployer } from "contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; -import { ERC4626Target4Deployer } from "contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { HyperdriveRegistry } from "contracts/src/factory/HyperdriveRegistry.sol"; -import { IERC4626 } from "contracts/src/interfaces/IERC4626.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { IHyperdriveFactory } from "contracts/src/interfaces/IHyperdriveFactory.sol"; -import { IHyperdriveGovernedRegistry } from "contracts/src/interfaces/IHyperdriveGovernedRegistry.sol"; -import { IHyperdriveRegistry } from "contracts/src/interfaces/IHyperdriveRegistry.sol"; -import { VERSION } from "contracts/src/libraries/Constants.sol"; -import { ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockERC4626 } from "contracts/test/MockERC4626.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ERC4626HyperdriveCoreDeployer } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveCoreDeployer.sol"; +import { ERC4626HyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/erc4626/ERC4626HyperdriveDeployerCoordinator.sol"; +import { ERC4626Target0Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target0Deployer.sol"; +import { ERC4626Target1Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target1Deployer.sol"; +import { ERC4626Target2Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target2Deployer.sol"; +import { ERC4626Target3Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target3Deployer.sol"; +import { ERC4626Target4Deployer } from "../../../contracts/src/deployers/erc4626/ERC4626Target4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { HyperdriveRegistry } from "../../../contracts/src/factory/HyperdriveRegistry.sol"; +import { IERC4626 } from "../../../contracts/src/interfaces/IERC4626.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { IHyperdriveFactory } from "../../../contracts/src/interfaces/IHyperdriveFactory.sol"; +import { IHyperdriveGovernedRegistry } from "../../../contracts/src/interfaces/IHyperdriveGovernedRegistry.sol"; +import { IHyperdriveRegistry } from "../../../contracts/src/interfaces/IHyperdriveRegistry.sol"; +import { VERSION } from "../../../contracts/src/libraries/Constants.sol"; +import { ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { MockERC4626 } from "../../../contracts/test/MockERC4626.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract HyperdriveRegistryTest is HyperdriveTest { using Lib for *; diff --git a/test/units/rewarder/HyperdriveCheckpointRewarder.t.sol b/test/units/rewarder/HyperdriveCheckpointRewarder.t.sol index 1a8b4d227..168832a74 100644 --- a/test/units/rewarder/HyperdriveCheckpointRewarder.t.sol +++ b/test/units/rewarder/HyperdriveCheckpointRewarder.t.sol @@ -2,14 +2,14 @@ pragma solidity 0.8.20; import { VmSafe } from "forge-std/Vm.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdriveCheckpointRewarder } from "contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol"; -import { IHyperdriveCheckpointSubrewarder } from "contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol"; -import { HYPERDRIVE_CHECKPOINT_REWARDER_KIND, VERSION } from "contracts/src/libraries/Constants.sol"; -import { HyperdriveCheckpointRewarder } from "contracts/src/rewarder/HyperdriveCheckpointRewarder.sol"; -import { HyperdriveCheckpointSubrewarder } from "contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol"; -import { BaseTest } from "test/utils/BaseTest.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdriveCheckpointRewarder } from "../../../contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol"; +import { IHyperdriveCheckpointSubrewarder } from "../../../contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol"; +import { HYPERDRIVE_CHECKPOINT_REWARDER_KIND, VERSION } from "../../../contracts/src/libraries/Constants.sol"; +import { HyperdriveCheckpointRewarder } from "../../../contracts/src/rewarder/HyperdriveCheckpointRewarder.sol"; +import { HyperdriveCheckpointSubrewarder } from "../../../contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol"; +import { BaseTest } from "../../utils/BaseTest.sol"; +import { Lib } from "../../utils/Lib.sol"; contract MockHyperdriveCheckpointSubrewarder { IERC20 public rewardToken; diff --git a/test/units/rewarder/HyperdriveCheckpointSubrewarder.t.sol b/test/units/rewarder/HyperdriveCheckpointSubrewarder.t.sol index 03f3b1f8c..a64ae693b 100644 --- a/test/units/rewarder/HyperdriveCheckpointSubrewarder.t.sol +++ b/test/units/rewarder/HyperdriveCheckpointSubrewarder.t.sol @@ -2,18 +2,18 @@ pragma solidity 0.8.20; import { VmSafe } from "forge-std/Vm.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdriveCheckpointSubrewarder } from "contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol"; -import { IHyperdriveRegistry } from "contracts/src/interfaces/IHyperdriveRegistry.sol"; -import { IHyperdriveGovernedRegistry } from "contracts/src/interfaces/IHyperdriveGovernedRegistry.sol"; -import { HYPERDRIVE_CHECKPOINT_SUBREWARDER_KIND, VERSION } from "contracts/src/libraries/Constants.sol"; -import { HyperdriveRegistry } from "contracts/src/factory/HyperdriveRegistry.sol"; -import { HyperdriveCheckpointRewarder } from "contracts/src/rewarder/HyperdriveCheckpointRewarder.sol"; -import { HyperdriveCheckpointSubrewarder } from "contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdriveCheckpointSubrewarder } from "../../../contracts/src/interfaces/IHyperdriveCheckpointSubrewarder.sol"; +import { IHyperdriveRegistry } from "../../../contracts/src/interfaces/IHyperdriveRegistry.sol"; +import { IHyperdriveGovernedRegistry } from "../../../contracts/src/interfaces/IHyperdriveGovernedRegistry.sol"; +import { HYPERDRIVE_CHECKPOINT_SUBREWARDER_KIND, VERSION } from "../../../contracts/src/libraries/Constants.sol"; +import { HyperdriveRegistry } from "../../../contracts/src/factory/HyperdriveRegistry.sol"; +import { HyperdriveCheckpointRewarder } from "../../../contracts/src/rewarder/HyperdriveCheckpointRewarder.sol"; +import { HyperdriveCheckpointSubrewarder } from "../../../contracts/src/rewarder/HyperdriveCheckpointSubrewarder.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract HyperdriveCheckpointSubrewarderTest is HyperdriveTest { using HyperdriveUtils for *; diff --git a/test/utils/BaseTest.sol b/test/utils/BaseTest.sol index d6ed5356f..2e06fcb4e 100644 --- a/test/utils/BaseTest.sol +++ b/test/utils/BaseTest.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.20; import { console2 } from "forge-std/console2.sol"; import { Test } from "forge-std/Test.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; +import { IERC20 } from "../../contracts/src/interfaces/IERC20.sol"; +import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol"; contract BaseTest is Test { address alice; diff --git a/test/utils/EtchingUtils.sol b/test/utils/EtchingUtils.sol index 3104d9ded..4ec168855 100644 --- a/test/utils/EtchingUtils.sol +++ b/test/utils/EtchingUtils.sol @@ -2,47 +2,47 @@ pragma solidity 0.8.20; import { Test } from "forge-std/Test.sol"; -import { ERC4626Hyperdrive } from "contracts/src/instances/erc4626/ERC4626Hyperdrive.sol"; -import { ERC4626Target0 } from "contracts/src/instances/erc4626/ERC4626Target0.sol"; -import { ERC4626Target1 } from "contracts/src/instances/erc4626/ERC4626Target1.sol"; -import { ERC4626Target2 } from "contracts/src/instances/erc4626/ERC4626Target2.sol"; -import { ERC4626Target3 } from "contracts/src/instances/erc4626/ERC4626Target3.sol"; -import { ERC4626Target4 } from "contracts/src/instances/erc4626/ERC4626Target4.sol"; -import { EzETHHyperdrive } from "contracts/src/instances/ezeth/EzETHHyperdrive.sol"; -import { EzETHTarget0 } from "contracts/src/instances/ezeth/EzETHTarget0.sol"; -import { EzETHTarget1 } from "contracts/src/instances/ezeth/EzETHTarget1.sol"; -import { EzETHTarget2 } from "contracts/src/instances/ezeth/EzETHTarget2.sol"; -import { EzETHTarget3 } from "contracts/src/instances/ezeth/EzETHTarget3.sol"; -import { EzETHTarget4 } from "contracts/src/instances/ezeth/EzETHTarget4.sol"; -import { LsETHHyperdrive } from "contracts/src/instances/lseth/LsETHHyperdrive.sol"; -import { LsETHTarget0 } from "contracts/src/instances/lseth/LsETHTarget0.sol"; -import { LsETHTarget1 } from "contracts/src/instances/lseth/LsETHTarget1.sol"; -import { LsETHTarget2 } from "contracts/src/instances/lseth/LsETHTarget2.sol"; -import { LsETHTarget3 } from "contracts/src/instances/lseth/LsETHTarget3.sol"; -import { LsETHTarget4 } from "contracts/src/instances/lseth/LsETHTarget4.sol"; -import { RETHHyperdrive } from "contracts/src/instances/reth/RETHHyperdrive.sol"; -import { RETHTarget0 } from "contracts/src/instances/reth/RETHTarget0.sol"; -import { RETHTarget1 } from "contracts/src/instances/reth/RETHTarget1.sol"; -import { RETHTarget2 } from "contracts/src/instances/reth/RETHTarget2.sol"; -import { RETHTarget3 } from "contracts/src/instances/reth/RETHTarget3.sol"; -import { RETHTarget4 } from "contracts/src/instances/reth/RETHTarget4.sol"; -import { StETHHyperdrive } from "contracts/src/instances/steth/StETHHyperdrive.sol"; -import { StETHTarget0 } from "contracts/src/instances/steth/StETHTarget0.sol"; -import { StETHTarget1 } from "contracts/src/instances/steth/StETHTarget1.sol"; -import { StETHTarget2 } from "contracts/src/instances/steth/StETHTarget2.sol"; -import { StETHTarget3 } from "contracts/src/instances/steth/StETHTarget3.sol"; -import { StETHTarget4 } from "contracts/src/instances/steth/StETHTarget4.sol"; -import { IEzETHHyperdrive } from "contracts/src/interfaces/IEzETHHyperdrive.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IRestakeManager } from "contracts/src/interfaces/IRenzo.sol"; -import { ERC4626_HYPERDRIVE_KIND, EZETH_HYPERDRIVE_KIND, LSETH_HYPERDRIVE_KIND, RETH_HYPERDRIVE_KIND, STETH_HYPERDRIVE_KIND, VERSION } from "contracts/src/libraries/Constants.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { EtchingVault } from "contracts/test/EtchingVault.sol"; -import { MockERC4626 } from "contracts/test/MockERC4626.sol"; -import { MockEzEthPool } from "contracts/test/MockEzEthPool.sol"; -import { MockLido } from "contracts/test/MockLido.sol"; -import { MockRocketPool } from "contracts/test/MockRocketPool.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ERC4626Hyperdrive } from "../../contracts/src/instances/erc4626/ERC4626Hyperdrive.sol"; +import { ERC4626Target0 } from "../../contracts/src/instances/erc4626/ERC4626Target0.sol"; +import { ERC4626Target1 } from "../../contracts/src/instances/erc4626/ERC4626Target1.sol"; +import { ERC4626Target2 } from "../../contracts/src/instances/erc4626/ERC4626Target2.sol"; +import { ERC4626Target3 } from "../../contracts/src/instances/erc4626/ERC4626Target3.sol"; +import { ERC4626Target4 } from "../../contracts/src/instances/erc4626/ERC4626Target4.sol"; +import { EzETHHyperdrive } from "../../contracts/src/instances/ezeth/EzETHHyperdrive.sol"; +import { EzETHTarget0 } from "../../contracts/src/instances/ezeth/EzETHTarget0.sol"; +import { EzETHTarget1 } from "../../contracts/src/instances/ezeth/EzETHTarget1.sol"; +import { EzETHTarget2 } from "../../contracts/src/instances/ezeth/EzETHTarget2.sol"; +import { EzETHTarget3 } from "../../contracts/src/instances/ezeth/EzETHTarget3.sol"; +import { EzETHTarget4 } from "../../contracts/src/instances/ezeth/EzETHTarget4.sol"; +import { LsETHHyperdrive } from "../../contracts/src/instances/lseth/LsETHHyperdrive.sol"; +import { LsETHTarget0 } from "../../contracts/src/instances/lseth/LsETHTarget0.sol"; +import { LsETHTarget1 } from "../../contracts/src/instances/lseth/LsETHTarget1.sol"; +import { LsETHTarget2 } from "../../contracts/src/instances/lseth/LsETHTarget2.sol"; +import { LsETHTarget3 } from "../../contracts/src/instances/lseth/LsETHTarget3.sol"; +import { LsETHTarget4 } from "../../contracts/src/instances/lseth/LsETHTarget4.sol"; +import { RETHHyperdrive } from "../../contracts/src/instances/reth/RETHHyperdrive.sol"; +import { RETHTarget0 } from "../../contracts/src/instances/reth/RETHTarget0.sol"; +import { RETHTarget1 } from "../../contracts/src/instances/reth/RETHTarget1.sol"; +import { RETHTarget2 } from "../../contracts/src/instances/reth/RETHTarget2.sol"; +import { RETHTarget3 } from "../../contracts/src/instances/reth/RETHTarget3.sol"; +import { RETHTarget4 } from "../../contracts/src/instances/reth/RETHTarget4.sol"; +import { StETHHyperdrive } from "../../contracts/src/instances/steth/StETHHyperdrive.sol"; +import { StETHTarget0 } from "../../contracts/src/instances/steth/StETHTarget0.sol"; +import { StETHTarget1 } from "../../contracts/src/instances/steth/StETHTarget1.sol"; +import { StETHTarget2 } from "../../contracts/src/instances/steth/StETHTarget2.sol"; +import { StETHTarget3 } from "../../contracts/src/instances/steth/StETHTarget3.sol"; +import { StETHTarget4 } from "../../contracts/src/instances/steth/StETHTarget4.sol"; +import { IEzETHHyperdrive } from "../../contracts/src/interfaces/IEzETHHyperdrive.sol"; +import { IHyperdrive } from "../../contracts/src/interfaces/IHyperdrive.sol"; +import { IRestakeManager } from "../../contracts/src/interfaces/IRenzo.sol"; +import { ERC4626_HYPERDRIVE_KIND, EZETH_HYPERDRIVE_KIND, LSETH_HYPERDRIVE_KIND, RETH_HYPERDRIVE_KIND, STETH_HYPERDRIVE_KIND, VERSION } from "../../contracts/src/libraries/Constants.sol"; +import { ERC20Mintable } from "../../contracts/test/ERC20Mintable.sol"; +import { EtchingVault } from "../../contracts/test/EtchingVault.sol"; +import { MockERC4626 } from "../../contracts/test/MockERC4626.sol"; +import { MockEzEthPool } from "../../contracts/test/MockEzEthPool.sol"; +import { MockLido } from "../../contracts/test/MockLido.sol"; +import { MockRocketPool } from "../../contracts/test/MockRocketPool.sol"; +import { Lib } from "./Lib.sol"; contract EtchingUtils is Test { using Lib for *; diff --git a/test/utils/HyperdriveTest.sol b/test/utils/HyperdriveTest.sol index 09ea905b3..fab45d2cb 100644 --- a/test/utils/HyperdriveTest.sol +++ b/test/utils/HyperdriveTest.sol @@ -2,25 +2,25 @@ pragma solidity 0.8.20; import { VmSafe } from "forge-std/Vm.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveCheckpointRewarder } from "contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol"; -import { IHyperdriveEvents } from "contracts/src/interfaces/IHyperdriveEvents.sol"; -import { IHyperdriveGovernedRegistry } from "contracts/src/interfaces/IHyperdriveGovernedRegistry.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { LPMath } from "contracts/src/libraries/LPMath.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/YieldSpaceMath.sol"; -import { HyperdriveRegistry } from "contracts/src/factory/HyperdriveRegistry.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { MockHyperdrive, MockHyperdriveTarget0, MockHyperdriveTarget1 } from "contracts/test/MockHyperdrive.sol"; -import { BaseTest } from "test/utils/BaseTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { HyperdriveFactory } from "../../contracts/src/factory/HyperdriveFactory.sol"; +import { IERC20 } from "../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveCheckpointRewarder } from "../../contracts/src/interfaces/IHyperdriveCheckpointRewarder.sol"; +import { IHyperdriveEvents } from "../../contracts/src/interfaces/IHyperdriveEvents.sol"; +import { IHyperdriveGovernedRegistry } from "../../contracts/src/interfaces/IHyperdriveGovernedRegistry.sol"; +import { AssetId } from "../../contracts/src/libraries/AssetId.sol"; +import { ETH } from "../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../contracts/src/libraries/HyperdriveMath.sol"; +import { LPMath } from "../../contracts/src/libraries/LPMath.sol"; +import { YieldSpaceMath } from "../../contracts/src/libraries/YieldSpaceMath.sol"; +import { HyperdriveRegistry } from "../../contracts/src/factory/HyperdriveRegistry.sol"; +import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../contracts/test/ERC20Mintable.sol"; +import { MockHyperdrive, MockHyperdriveTarget0, MockHyperdriveTarget1 } from "../../contracts/test/MockHyperdrive.sol"; +import { BaseTest } from "./BaseTest.sol"; +import { HyperdriveUtils } from "./HyperdriveUtils.sol"; +import { Lib } from "./Lib.sol"; contract HyperdriveTest is IHyperdriveEvents, BaseTest { using FixedPointMath for uint256; diff --git a/test/utils/HyperdriveUtils.sol b/test/utils/HyperdriveUtils.sol index f9cb3260b..a120bc95b 100644 --- a/test/utils/HyperdriveUtils.sol +++ b/test/utils/HyperdriveUtils.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { LPMath } from "contracts/src/libraries/LPMath.sol"; -import { YieldSpaceMath } from "contracts/src/libraries/YieldSpaceMath.sol"; +import { IHyperdrive } from "../../contracts/src/interfaces/IHyperdrive.sol"; +import { AssetId } from "../../contracts/src/libraries/AssetId.sol"; +import { FixedPointMath, ONE } from "../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../contracts/src/libraries/HyperdriveMath.sol"; +import { LPMath } from "../../contracts/src/libraries/LPMath.sol"; +import { YieldSpaceMath } from "../../contracts/src/libraries/YieldSpaceMath.sol"; library HyperdriveUtils { using FixedPointMath for uint256; diff --git a/test/utils/InstanceTest.sol b/test/utils/InstanceTest.sol index 463415cdc..6224a556e 100644 --- a/test/utils/InstanceTest.sol +++ b/test/utils/InstanceTest.sol @@ -1,19 +1,19 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { IHyperdriveFactory } from "contracts/src/interfaces/IHyperdriveFactory.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH, VERSION } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { HyperdriveTest } from "test/utils/HyperdriveTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { HyperdriveFactory } from "../../contracts/src/factory/HyperdriveFactory.sol"; +import { IERC20 } from "../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../contracts/src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../../contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { IHyperdriveFactory } from "../../contracts/src/interfaces/IHyperdriveFactory.sol"; +import { AssetId } from "../../contracts/src/libraries/AssetId.sol"; +import { ETH, VERSION } from "../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../contracts/src/libraries/FixedPointMath.sol"; +import { ERC20Mintable } from "../../contracts/test/ERC20Mintable.sol"; +import { HyperdriveTest } from "./HyperdriveTest.sol"; +import { HyperdriveUtils } from "./HyperdriveUtils.sol"; +import { Lib } from "./Lib.sol"; /// @author DELV /// @title InstanceTest From 726135a482463204bc58466a62166b78047a3d4b Mon Sep 17 00:00:00 2001 From: "John McClure (pickleback)" Date: Thu, 25 Jul 2024 13:29:15 -0500 Subject: [PATCH 2/8] missed a few --- contracts/test/MockAssetId.sol | 2 +- contracts/test/MockERC4626Hyperdrive.sol | 4 ++-- contracts/test/MockHyperdrive.sol | 24 +++++++++++------------ contracts/test/MockHyperdriveDeployer.sol | 10 +++++----- contracts/test/MockHyperdriveMath.sol | 4 ++-- contracts/test/MockLPMath.sol | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/contracts/test/MockAssetId.sol b/contracts/test/MockAssetId.sol index 94d128f33..b8a331660 100644 --- a/contracts/test/MockAssetId.sol +++ b/contracts/test/MockAssetId.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; +import { AssetId } from "../src/libraries/AssetId.sol"; contract MockAssetId { function encodeAssetId( diff --git a/contracts/test/MockERC4626Hyperdrive.sol b/contracts/test/MockERC4626Hyperdrive.sol index 8d96b4847..4b111573d 100644 --- a/contracts/test/MockERC4626Hyperdrive.sol +++ b/contracts/test/MockERC4626Hyperdrive.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { ERC4626Hyperdrive } from "contracts/src/instances/erc4626/ERC4626Hyperdrive.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; +import { ERC4626Hyperdrive } from "../src/instances/erc4626/ERC4626Hyperdrive.sol"; +import { IHyperdrive } from "../src/interfaces/IHyperdrive.sol"; // This contract stubs out the yield source implementations of `ERC4626Hyperdrive` // so that we can test the `ERC4626Hyperdrive` contract in isolation. diff --git a/contracts/test/MockHyperdrive.sol b/contracts/test/MockHyperdrive.sol index ca7e3176c..928f4f93d 100644 --- a/contracts/test/MockHyperdrive.sol +++ b/contracts/test/MockHyperdrive.sol @@ -1,18 +1,18 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { Hyperdrive } from "contracts/src/external/Hyperdrive.sol"; -import { HyperdriveTarget0 } from "contracts/src/external/HyperdriveTarget0.sol"; -import { HyperdriveTarget1 } from "contracts/src/external/HyperdriveTarget1.sol"; -import { HyperdriveTarget2 } from "contracts/src/external/HyperdriveTarget2.sol"; -import { HyperdriveTarget3 } from "contracts/src/external/HyperdriveTarget3.sol"; -import { HyperdriveTarget4 } from "contracts/src/external/HyperdriveTarget4.sol"; -import { HyperdriveBase } from "contracts/src/internal/HyperdriveBase.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath } from "contracts/src/libraries/FixedPointMath.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; +import { Hyperdrive } from "../src/external/Hyperdrive.sol"; +import { HyperdriveTarget0 } from "../src/external/HyperdriveTarget0.sol"; +import { HyperdriveTarget1 } from "../src/external/HyperdriveTarget1.sol"; +import { HyperdriveTarget2 } from "../src/external/HyperdriveTarget2.sol"; +import { HyperdriveTarget3 } from "../src/external/HyperdriveTarget3.sol"; +import { HyperdriveTarget4 } from "../src/external/HyperdriveTarget4.sol"; +import { HyperdriveBase } from "../src/internal/HyperdriveBase.sol"; +import { IHyperdrive } from "../src/interfaces/IHyperdrive.sol"; +import { ETH } from "../src/libraries/Constants.sol"; +import { FixedPointMath } from "../src/libraries/FixedPointMath.sol"; +import { ERC20Mintable } from "../test/ERC20Mintable.sol"; +import { HyperdriveUtils } from "../../test/utils/HyperdriveUtils.sol"; interface IMockHyperdrive { function accrue(uint256 time, int256 apr) external; diff --git a/contracts/test/MockHyperdriveDeployer.sol b/contracts/test/MockHyperdriveDeployer.sol index 29c97dfdc..42c431ed4 100644 --- a/contracts/test/MockHyperdriveDeployer.sol +++ b/contracts/test/MockHyperdriveDeployer.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IHyperdriveDeployerCoordinator } from "contracts/src/interfaces/IHyperdriveDeployerCoordinator.sol"; -import { IHyperdriveTargetDeployer } from "contracts/src/interfaces/IHyperdriveTargetDeployer.sol"; -import { VERSION, NUM_TARGETS } from "contracts/src/libraries/Constants.sol"; +import { IERC20 } from "../src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../src/interfaces/IHyperdrive.sol"; +import { IHyperdriveDeployerCoordinator } from "../src/interfaces/IHyperdriveDeployerCoordinator.sol"; +import { IHyperdriveTargetDeployer } from "../src/interfaces/IHyperdriveTargetDeployer.sol"; +import { VERSION, NUM_TARGETS } from "../src/libraries/Constants.sol"; import { MockHyperdrive } from "./MockHyperdrive.sol"; contract MockHyperdriveDeployer is IHyperdriveDeployerCoordinator { diff --git a/contracts/test/MockHyperdriveMath.sol b/contracts/test/MockHyperdriveMath.sol index f0e6e4681..0314373da 100644 --- a/contracts/test/MockHyperdriveMath.sol +++ b/contracts/test/MockHyperdriveMath.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; +import { HyperdriveMath } from "../src/libraries/HyperdriveMath.sol"; +import { HyperdriveUtils } from "../../test/utils/HyperdriveUtils.sol"; contract MockHyperdriveMath { function calculateSpotAPR( diff --git a/contracts/test/MockLPMath.sol b/contracts/test/MockLPMath.sol index 6c144d8b1..6889c08cd 100644 --- a/contracts/test/MockLPMath.sol +++ b/contracts/test/MockLPMath.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { LPMath } from "contracts/src/libraries/LPMath.sol"; +import { LPMath } from "../src/libraries/LPMath.sol"; contract MockLPMath { function calculateInitialReserves( From 23a5a8afd9e06a9d5ad1b06116011e70ae169616 Mon Sep 17 00:00:00 2001 From: "John McClure (pickleback)" Date: Fri, 26 Jul 2024 01:36:45 -0500 Subject: [PATCH 3/8] missed a few --- test/3rdPartyLibs/LogExpMath.sol | 2 +- test/integrations/deployers/ERC4626DeployerCoordinator.t.sol | 2 +- test/integrations/deployers/RethDeployerCoordinator.t.sol | 2 +- test/integrations/deployers/StethDeployerCoordinator.t.sol | 2 +- test/units/libraries/FixedPointMath.t.sol | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/3rdPartyLibs/LogExpMath.sol b/test/3rdPartyLibs/LogExpMath.sol index 591dbb76d..242b713af 100644 --- a/test/3rdPartyLibs/LogExpMath.sol +++ b/test/3rdPartyLibs/LogExpMath.sol @@ -14,7 +14,7 @@ pragma solidity 0.8.20; -import { BalancerErrors, _require } from "test/3rdPartyLibs/BalancerErrors.sol"; +import { BalancerErrors, _require } from "./BalancerErrors.sol"; /* solhint-disable */ diff --git a/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol b/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol index 381ff7680..92303dc08 100644 --- a/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol +++ b/test/integrations/deployers/ERC4626DeployerCoordinator.t.sol @@ -17,7 +17,7 @@ import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPoint import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; import { MockERC4626 } from "../../../contracts/test/MockERC4626.sol"; import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; -import { DeployerCoordinatorTest, MockHyperdriveDeployerCoordinator } from "test/integrations/deployers/DeployerCoordinator.t.sol"; +import { DeployerCoordinatorTest, MockHyperdriveDeployerCoordinator } from "./DeployerCoordinator.t.sol"; import { Lib } from "../../utils/Lib.sol"; contract ERC4626DeployerCoordinatorTest is DeployerCoordinatorTest { diff --git a/test/integrations/deployers/RethDeployerCoordinator.t.sol b/test/integrations/deployers/RethDeployerCoordinator.t.sol index 7efd5a8d5..1d04ac79c 100644 --- a/test/integrations/deployers/RethDeployerCoordinator.t.sol +++ b/test/integrations/deployers/RethDeployerCoordinator.t.sol @@ -17,7 +17,7 @@ import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPoint import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; import { MockRocketPool } from "../../../contracts/test/MockRocketPool.sol"; import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; -import { DeployerCoordinatorTest, MockHyperdriveDeployerCoordinator } from "test/integrations/deployers/DeployerCoordinator.t.sol"; +import { DeployerCoordinatorTest, MockHyperdriveDeployerCoordinator } from "./DeployerCoordinator.t.sol"; import { Lib } from "../../utils/Lib.sol"; contract RethDeployerCoordinatorTest is DeployerCoordinatorTest { diff --git a/test/integrations/deployers/StethDeployerCoordinator.t.sol b/test/integrations/deployers/StethDeployerCoordinator.t.sol index 68d7d3843..0632315af 100644 --- a/test/integrations/deployers/StethDeployerCoordinator.t.sol +++ b/test/integrations/deployers/StethDeployerCoordinator.t.sol @@ -17,7 +17,7 @@ import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPoint import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; import { MockLido } from "../../../contracts/test/MockLido.sol"; import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; -import { DeployerCoordinatorTest, MockHyperdriveDeployerCoordinator } from "test/integrations/deployers/DeployerCoordinator.t.sol"; +import { DeployerCoordinatorTest, MockHyperdriveDeployerCoordinator } from "./DeployerCoordinator.t.sol"; import { Lib } from "../../utils/Lib.sol"; contract StethDeployerCoordinatorTest is DeployerCoordinatorTest { diff --git a/test/units/libraries/FixedPointMath.t.sol b/test/units/libraries/FixedPointMath.t.sol index e768d4c33..ec377f370 100644 --- a/test/units/libraries/FixedPointMath.t.sol +++ b/test/units/libraries/FixedPointMath.t.sol @@ -5,8 +5,8 @@ import { stdError, Test } from "forge-std/Test.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { MockFixedPointMath } from "../../../contracts/test/MockFixedPointMath.sol"; -import { LogExpMath } from "test/3rdPartyLibs/LogExpMath.sol"; -import { BalancerErrors } from "test/3rdPartyLibs/BalancerErrors.sol"; +import { LogExpMath } from "../../3rdPartyLibs/LogExpMath.sol"; +import { BalancerErrors } from "../../3rdPartyLibs/BalancerErrors.sol"; import { Lib } from "../../utils/Lib.sol"; contract FixedPointMathTest is Test { From cfc14ff21419144ae0a5c3258be996141b7d18e5 Mon Sep 17 00:00:00 2001 From: "John McClure (pickleback)" Date: Fri, 26 Jul 2024 01:38:03 -0500 Subject: [PATCH 4/8] responding to feedback: reorder imports --- test/integrations/hyperdrive/ZombieInterestTest.t.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integrations/hyperdrive/ZombieInterestTest.t.sol b/test/integrations/hyperdrive/ZombieInterestTest.t.sol index 571be1af0..91ea8630b 100644 --- a/test/integrations/hyperdrive/ZombieInterestTest.t.sol +++ b/test/integrations/hyperdrive/ZombieInterestTest.t.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.20; import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "../../utils/HyperdriveTest.sol"; import { MockHyperdrive, IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; +import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "../../utils/HyperdriveTest.sol"; import { Lib } from "../../utils/Lib.sol"; contract ZombieInterestTest is HyperdriveTest { From e7f6f5f40654c94c805accc3563b1a474f21a773 Mon Sep 17 00:00:00 2001 From: "John McClure (pickleback)" Date: Fri, 26 Jul 2024 01:44:11 -0500 Subject: [PATCH 5/8] reorder imports --- test/instances/reth/RETHHyperdrive.t.sol | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/instances/reth/RETHHyperdrive.t.sol b/test/instances/reth/RETHHyperdrive.t.sol index b172365b6..4b91ef46b 100644 --- a/test/instances/reth/RETHHyperdrive.t.sol +++ b/test/instances/reth/RETHHyperdrive.t.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; +import { stdStorage, StdStorage } from "forge-std/Test.sol"; import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; @@ -8,8 +9,6 @@ import { ETH } from "../../../contracts/src/libraries/Constants.sol"; import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; -import { InstanceTest } from "../../utils/InstanceTest.sol"; -import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; import { IRocketDepositPool } from "../../../contracts/src/interfaces/IRocketDepositPool.sol"; @@ -17,7 +16,6 @@ import { IRocketNetworkBalances } from "../../../contracts/src/interfaces/IRocke import { IRocketPoolDAOProtocolSettingsDeposit } from "../../../contracts/src/interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol"; import { IRocketStorage } from "../../../contracts/src/interfaces/IRocketStorage.sol"; import { IRocketTokenRETH } from "../../../contracts/src/interfaces/IRocketTokenRETH.sol"; -import { Lib } from "../../utils/Lib.sol"; import { RETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol"; import { RETHHyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/reth/RETHHyperdriveDeployerCoordinator.sol"; import { RETHTarget0Deployer } from "../../../contracts/src/deployers/reth/RETHTarget0Deployer.sol"; @@ -25,7 +23,9 @@ import { RETHTarget1Deployer } from "../../../contracts/src/deployers/reth/RETHT import { RETHTarget2Deployer } from "../../../contracts/src/deployers/reth/RETHTarget2Deployer.sol"; import { RETHTarget3Deployer } from "../../../contracts/src/deployers/reth/RETHTarget3Deployer.sol"; import { RETHTarget4Deployer } from "../../../contracts/src/deployers/reth/RETHTarget4Deployer.sol"; -import { stdStorage, StdStorage } from "forge-std/Test.sol"; +import { InstanceTest } from "../../utils/InstanceTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract RETHHyperdriveTest is InstanceTest { using FixedPointMath for uint256; From 0f4a98d778bd78cf0c37af6b0736542eb56a6064 Mon Sep 17 00:00:00 2001 From: "John McClure (pickleback)" Date: Fri, 26 Jul 2024 01:45:54 -0500 Subject: [PATCH 6/8] remove unused imports --- test/instances/aave/AaveHyperdrive.t.sol | 8 +------- test/instances/reth/RETHHyperdrive.t.sol | 8 +------- test/integrations/hyperdrive/ZombieInterestTest.t.sol | 4 +--- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/test/instances/aave/AaveHyperdrive.t.sol b/test/instances/aave/AaveHyperdrive.t.sol index 74e706cf7..0a12a956e 100644 --- a/test/instances/aave/AaveHyperdrive.t.sol +++ b/test/instances/aave/AaveHyperdrive.t.sol @@ -11,17 +11,11 @@ import { AaveTarget1Deployer } from "../../../contracts/src/deployers/aave/AaveT import { AaveTarget2Deployer } from "../../../contracts/src/deployers/aave/AaveTarget2Deployer.sol"; import { AaveTarget3Deployer } from "../../../contracts/src/deployers/aave/AaveTarget3Deployer.sol"; import { AaveTarget4Deployer } from "../../../contracts/src/deployers/aave/AaveTarget4Deployer.sol"; -import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; import { IAToken } from "../../../contracts/src/interfaces/IAToken.sol"; import { IAaveHyperdrive } from "../../../contracts/src/interfaces/IAaveHyperdrive.sol"; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; -import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; -import { ETH } from "../../../contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { InstanceTest } from "../../utils/InstanceTest.sol"; import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; import { Lib } from "../../utils/Lib.sol"; diff --git a/test/instances/reth/RETHHyperdrive.t.sol b/test/instances/reth/RETHHyperdrive.t.sol index 4b91ef46b..22fe8b665 100644 --- a/test/instances/reth/RETHHyperdrive.t.sol +++ b/test/instances/reth/RETHHyperdrive.t.sol @@ -2,18 +2,12 @@ pragma solidity 0.8.20; import { stdStorage, StdStorage } from "forge-std/Test.sol"; -import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; -import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; import { ETH } from "../../../contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; -import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; import { IRocketDepositPool } from "../../../contracts/src/interfaces/IRocketDepositPool.sol"; import { IRocketNetworkBalances } from "../../../contracts/src/interfaces/IRocketNetworkBalances.sol"; -import { IRocketPoolDAOProtocolSettingsDeposit } from "../../../contracts/src/interfaces/IRocketPoolDAOProtocolSettingsDeposit.sol"; import { IRocketStorage } from "../../../contracts/src/interfaces/IRocketStorage.sol"; import { IRocketTokenRETH } from "../../../contracts/src/interfaces/IRocketTokenRETH.sol"; import { RETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/reth/RETHHyperdriveCoreDeployer.sol"; diff --git a/test/integrations/hyperdrive/ZombieInterestTest.t.sol b/test/integrations/hyperdrive/ZombieInterestTest.t.sol index 91ea8630b..4c5f97b21 100644 --- a/test/integrations/hyperdrive/ZombieInterestTest.t.sol +++ b/test/integrations/hyperdrive/ZombieInterestTest.t.sol @@ -1,10 +1,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; import { FixedPointMath } from "../../../contracts/src/libraries/FixedPointMath.sol"; -import { MockHyperdrive, IMockHyperdrive } from "../../../contracts/test/MockHyperdrive.sol"; -import { HyperdriveTest, HyperdriveUtils, IHyperdrive } from "../../utils/HyperdriveTest.sol"; +import { HyperdriveTest, HyperdriveUtils } from "../../utils/HyperdriveTest.sol"; import { Lib } from "../../utils/Lib.sol"; contract ZombieInterestTest is HyperdriveTest { From 17cf5721b2d3a8d10b75a046a54667cb42116c2e Mon Sep 17 00:00:00 2001 From: "John McClure (pickleback)" Date: Tue, 30 Jul 2024 09:04:52 -0500 Subject: [PATCH 7/8] update etherfi files --- test/instances/eeth/EETHHyperdrive.t.sol | 46 ++++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/test/instances/eeth/EETHHyperdrive.t.sol b/test/instances/eeth/EETHHyperdrive.t.sol index 93f58bf23..317ae725e 100644 --- a/test/instances/eeth/EETHHyperdrive.t.sol +++ b/test/instances/eeth/EETHHyperdrive.t.sol @@ -1,29 +1,29 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity 0.8.20; -import { ILiquidityPool } from "contracts/src/interfaces/ILiquidityPool.sol"; -import { IEETH } from "contracts/src/interfaces/IEETH.sol"; -import { EETHHyperdriveCoreDeployer } from "contracts/src/deployers/eeth/EETHHyperdriveCoreDeployer.sol"; -import { EETHHyperdriveDeployerCoordinator } from "contracts/src/deployers/eeth/EETHHyperdriveDeployerCoordinator.sol"; -import { EETHTarget0Deployer } from "contracts/src/deployers/eeth/EETHTarget0Deployer.sol"; -import { EETHTarget1Deployer } from "contracts/src/deployers/eeth/EETHTarget1Deployer.sol"; -import { EETHTarget2Deployer } from "contracts/src/deployers/eeth/EETHTarget2Deployer.sol"; -import { EETHTarget3Deployer } from "contracts/src/deployers/eeth/EETHTarget3Deployer.sol"; -import { EETHTarget4Deployer } from "contracts/src/deployers/eeth/EETHTarget4Deployer.sol"; -import { HyperdriveFactory } from "contracts/src/factory/HyperdriveFactory.sol"; -import { EETHConversions } from "contracts/src/instances/eeth/EETHConversions.sol"; -import { IERC20 } from "contracts/src/interfaces/IERC20.sol"; -import { IHyperdrive } from "contracts/src/interfaces/IHyperdrive.sol"; -import { IEETHHyperdrive } from "contracts/src/interfaces/IEETHHyperdrive.sol"; -import { AssetId } from "contracts/src/libraries/AssetId.sol"; -import { ETH } from "contracts/src/libraries/Constants.sol"; -import { FixedPointMath, ONE } from "contracts/src/libraries/FixedPointMath.sol"; -import { HyperdriveMath } from "contracts/src/libraries/HyperdriveMath.sol"; -import { ERC20ForwarderFactory } from "contracts/src/token/ERC20ForwarderFactory.sol"; -import { ERC20Mintable } from "contracts/test/ERC20Mintable.sol"; -import { InstanceTest } from "test/utils/InstanceTest.sol"; -import { HyperdriveUtils } from "test/utils/HyperdriveUtils.sol"; -import { Lib } from "test/utils/Lib.sol"; +import { ILiquidityPool } from "../../../contracts/src/interfaces/ILiquidityPool.sol"; +import { IEETH } from "../../../contracts/src/interfaces/IEETH.sol"; +import { EETHHyperdriveCoreDeployer } from "../../../contracts/src/deployers/eeth/EETHHyperdriveCoreDeployer.sol"; +import { EETHHyperdriveDeployerCoordinator } from "../../../contracts/src/deployers/eeth/EETHHyperdriveDeployerCoordinator.sol"; +import { EETHTarget0Deployer } from "../../../contracts/src/deployers/eeth/EETHTarget0Deployer.sol"; +import { EETHTarget1Deployer } from "../../../contracts/src/deployers/eeth/EETHTarget1Deployer.sol"; +import { EETHTarget2Deployer } from "../../../contracts/src/deployers/eeth/EETHTarget2Deployer.sol"; +import { EETHTarget3Deployer } from "../../../contracts/src/deployers/eeth/EETHTarget3Deployer.sol"; +import { EETHTarget4Deployer } from "../../../contracts/src/deployers/eeth/EETHTarget4Deployer.sol"; +import { HyperdriveFactory } from "../../../contracts/src/factory/HyperdriveFactory.sol"; +import { EETHConversions } from "../../../contracts/src/instances/eeth/EETHConversions.sol"; +import { IERC20 } from "../../../contracts/src/interfaces/IERC20.sol"; +import { IHyperdrive } from "../../../contracts/src/interfaces/IHyperdrive.sol"; +import { IEETHHyperdrive } from "../../../contracts/src/interfaces/IEETHHyperdrive.sol"; +import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; +import { ETH } from "../../../contracts/src/libraries/Constants.sol"; +import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; +import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; +import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; +import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; +import { InstanceTest } from "../../utils/InstanceTest.sol"; +import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; +import { Lib } from "../../utils/Lib.sol"; contract EETHHyperdriveTest is InstanceTest { using FixedPointMath for uint256; From 25713acdfee48645114f940afab9a5f7bf79f955 Mon Sep 17 00:00:00 2001 From: "John McClure (pickleback)" Date: Tue, 30 Jul 2024 09:18:43 -0500 Subject: [PATCH 8/8] import ordering --- test/instances/erc4626/UsdcERC4626.t.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/instances/erc4626/UsdcERC4626.t.sol b/test/instances/erc4626/UsdcERC4626.t.sol index d59489f61..6c383ffd2 100644 --- a/test/instances/erc4626/UsdcERC4626.t.sol +++ b/test/instances/erc4626/UsdcERC4626.t.sol @@ -18,10 +18,10 @@ import { AssetId } from "../../../contracts/src/libraries/AssetId.sol"; import { FixedPointMath, ONE } from "../../../contracts/src/libraries/FixedPointMath.sol"; import { HyperdriveMath } from "../../../contracts/src/libraries/HyperdriveMath.sol"; import { ERC20ForwarderFactory } from "../../../contracts/src/token/ERC20ForwarderFactory.sol"; -import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; import { MockERC4626Hyperdrive } from "../../../contracts/test/MockERC4626Hyperdrive.sol"; import { ERC20Mintable } from "../../../contracts/test/ERC20Mintable.sol"; import { MockERC4626 } from "../../../contracts/test/MockERC4626.sol"; +import { HyperdriveTest } from "../../utils/HyperdriveTest.sol"; import { HyperdriveUtils } from "../../utils/HyperdriveUtils.sol"; import { Lib } from "../../utils/Lib.sol"; import { ERC4626ValidationTest } from "./ERC4626Validation.t.sol";