chore: Move test and script out of src

liquity · Dec 12, 2024 · 1fc309f · 1fc309f
1 parent 65926b1
commit 1fc309f
Show file tree

Hide file tree

Showing 104 changed files with 136 additions and 136 deletions.
diff --git a/contracts/src/scripts/DeployGovernance.s.sol → contracts/scripts/DeployGovernance.s.sol b/contracts/src/scripts/DeployGovernance.s.sol → contracts/scripts/DeployGovernance.s.sol
diff --git a/contracts/src/scripts/DeployLiquity2.s.sol → contracts/scripts/DeployLiquity2.s.sol b/contracts/src/scripts/DeployLiquity2.s.sol → contracts/scripts/DeployLiquity2.s.sol
diff --git a/...c/scripts/DeployOnlyExchangeHelpers.s.sol → ...s/scripts/DeployOnlyExchangeHelpers.s.sol b/...c/scripts/DeployOnlyExchangeHelpers.s.sol → ...s/scripts/DeployOnlyExchangeHelpers.s.sol
diff --git a/...ts/src/scripts/DeployOnlyGovernance.s.sol → contracts/scripts/DeployOnlyGovernance.s.sol b/...ts/src/scripts/DeployOnlyGovernance.s.sol → contracts/scripts/DeployOnlyGovernance.s.sol
diff --git a/...rc/scripts/Interfaces/Balancer/IVault.sol → ...ts/scripts/Interfaces/Balancer/IVault.sol b/...rc/scripts/Interfaces/Balancer/IVault.sol → ...ts/scripts/Interfaces/Balancer/IVault.sol
diff --git a/...pts/Interfaces/Balancer/IWeightedPool.sol → ...pts/Interfaces/Balancer/IWeightedPool.sol b/...pts/Interfaces/Balancer/IWeightedPool.sol → ...pts/Interfaces/Balancer/IWeightedPool.sol
diff --git a/contracts/src/scripts/LiquidateTrove.s.sol → contracts/scripts/LiquidateTrove.s.sol b/contracts/src/scripts/LiquidateTrove.s.sol → contracts/scripts/LiquidateTrove.s.sol
diff --git a/contracts/src/scripts/OpenTroves.s.sol → contracts/scripts/OpenTroves.s.sol b/contracts/src/scripts/OpenTroves.s.sol → contracts/scripts/OpenTroves.s.sol
diff --git a/...s/src/scripts/ProvideUniV3Liquidity.s.sol → ...racts/scripts/ProvideUniV3Liquidity.s.sol b/...s/src/scripts/ProvideUniV3Liquidity.s.sol → ...racts/scripts/ProvideUniV3Liquidity.s.sol
diff --git a/contracts/src/scripts/RedeemCollateral.s.sol → contracts/scripts/RedeemCollateral.s.sol b/contracts/src/scripts/RedeemCollateral.s.sol → contracts/scripts/RedeemCollateral.s.sol
diff --git a/contracts/test/AccessControlTest.js → contracts/test-js/AccessControlTest.js b/contracts/test/AccessControlTest.js → contracts/test-js/AccessControlTest.js
diff --git a/contracts/test/BorrowerOperationsTest.js → contracts/test-js/BorrowerOperationsTest.js b/contracts/test/BorrowerOperationsTest.js → contracts/test-js/BorrowerOperationsTest.js
diff --git a/contracts/test/CollSurplusPool.js → contracts/test-js/CollSurplusPool.js b/contracts/test/CollSurplusPool.js → contracts/test-js/CollSurplusPool.js
diff --git a/contracts/test/ConnectContractsTest.js → contracts/test-js/ConnectContractsTest.js b/contracts/test/ConnectContractsTest.js → contracts/test-js/ConnectContractsTest.js
diff --git a/contracts/test/FeeArithmeticTest.js → contracts/test-js/FeeArithmeticTest.js b/contracts/test/FeeArithmeticTest.js → contracts/test-js/FeeArithmeticTest.js
diff --git a/contracts/test/GasCompensationTest.js → contracts/test-js/GasCompensationTest.js b/contracts/test/GasCompensationTest.js → contracts/test-js/GasCompensationTest.js
diff --git a/...cts/test/HintHelpers_getApproxHintTest.js → .../test-js/HintHelpers_getApproxHintTest.js b/...cts/test/HintHelpers_getApproxHintTest.js → .../test-js/HintHelpers_getApproxHintTest.js
diff --git a/contracts/test/LiquityMathTest.js → contracts/test-js/LiquityMathTest.js b/contracts/test/LiquityMathTest.js → contracts/test-js/LiquityMathTest.js
diff --git a/contracts/test/OwnershipTest.js → contracts/test-js/OwnershipTest.js b/contracts/test/OwnershipTest.js → contracts/test-js/OwnershipTest.js
diff --git a/contracts/test/PoolsTest.js → contracts/test-js/PoolsTest.js b/contracts/test/PoolsTest.js → contracts/test-js/PoolsTest.js
diff --git a/contracts/test/SP_P_TruncationTest.js → contracts/test-js/SP_P_TruncationTest.js b/contracts/test/SP_P_TruncationTest.js → contracts/test-js/SP_P_TruncationTest.js
diff --git a/contracts/test/SortedTrovesTest.js → contracts/test-js/SortedTrovesTest.js b/contracts/test/SortedTrovesTest.js → contracts/test-js/SortedTrovesTest.js
diff --git a/contracts/test/StabilityPoolTest.js → contracts/test-js/StabilityPoolTest.js b/contracts/test/StabilityPoolTest.js → contracts/test-js/StabilityPoolTest.js
diff --git a/...ts/test/StabilityPool_SPWithdrawalTest.js → ...test-js/StabilityPool_SPWithdrawalTest.js b/...ts/test/StabilityPool_SPWithdrawalTest.js → ...test-js/StabilityPool_SPWithdrawalTest.js
diff --git a/contracts/test/TroveManagerTest.js → contracts/test-js/TroveManagerTest.js b/contracts/test/TroveManagerTest.js → contracts/test-js/TroveManagerTest.js
diff --git a/...st/TroveManager_LiquidationRewardsTest.js → ...js/TroveManager_LiquidationRewardsTest.js b/...st/TroveManager_LiquidationRewardsTest.js → ...js/TroveManager_LiquidationRewardsTest.js
diff --git a/contracts/test/stakeDeclineTest.js → contracts/test-js/stakeDeclineTest.js b/contracts/test/stakeDeclineTest.js → contracts/test-js/stakeDeclineTest.js
diff --git a/contracts/src/test/.gitignore → contracts/test/.gitignore b/contracts/src/test/.gitignore → contracts/test/.gitignore
diff --git a/...cts/src/test/AnchoredInvariantsTest.t.sol → contracts/test/AnchoredInvariantsTest.t.sol b/...cts/src/test/AnchoredInvariantsTest.t.sol → contracts/test/AnchoredInvariantsTest.t.sol
diff --git a/...s/src/test/AnchoredSPInvariantsTest.t.sol → ...racts/test/AnchoredSPInvariantsTest.t.sol b/...s/src/test/AnchoredSPInvariantsTest.t.sol → ...racts/test/AnchoredSPInvariantsTest.t.sol
diff --git a/contracts/src/test/BoldToken.t.sol → contracts/test/BoldToken.t.sol b/contracts/src/test/BoldToken.t.sol → contracts/test/BoldToken.t.sol
diff --git a/contracts/src/test/HintHelpers.t.sol → contracts/test/HintHelpers.t.sol b/contracts/src/test/HintHelpers.t.sol → contracts/test/HintHelpers.t.sol
diff --git a/contracts/src/test/Invariants.t.sol → contracts/test/Invariants.t.sol b/contracts/src/test/Invariants.t.sol → contracts/test/Invariants.t.sol
@@ -4,12 +4,12 @@ pragma solidity 0.8.24;
 import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
 import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
-import {BatchId} from "../Types/BatchId.sol";
-import {LatestBatchData} from "../Types/LatestBatchData.sol";
-import {LatestTroveData} from "../Types/LatestTroveData.sol";
-import {ISortedTroves} from "../Interfaces/ISortedTroves.sol";
-import {IStabilityPool} from "../Interfaces/IStabilityPool.sol";
-import {ITroveManager} from "../Interfaces/ITroveManager.sol";
+import {BatchId} from "src/Types/BatchId.sol";
+import {LatestBatchData} from "src/Types/LatestBatchData.sol";
+import {LatestTroveData} from "src/Types/LatestTroveData.sol";
+import {ISortedTroves} from "src/Interfaces/ISortedTroves.sol";
+import {IStabilityPool} from "src/Interfaces/IStabilityPool.sol";
+import {ITroveManager} from "src/Interfaces/ITroveManager.sol";
 import {BatchIdSet} from "./Utils/BatchIdSet.sol";
 import {Logging} from "./Utils/Logging.sol";
 import {StringFormatting} from "./Utils/StringFormatting.sol";

diff --git a/contracts/src/test/OracleMainnet.t.sol → contracts/test/OracleMainnet.t.sol b/contracts/src/test/OracleMainnet.t.sol → contracts/test/OracleMainnet.t.sol
@@ -2,23 +2,23 @@
 
 pragma solidity 0.8.24;
 
-import "../PriceFeeds/WSTETHPriceFeed.sol";
-import "../PriceFeeds/MainnetPriceFeedBase.sol";
-import "../PriceFeeds/RETHPriceFeed.sol";
-import "../PriceFeeds/WETHPriceFeed.sol";
+import "src/PriceFeeds/WSTETHPriceFeed.sol";
+import "src/PriceFeeds/MainnetPriceFeedBase.sol";
+import "src/PriceFeeds/RETHPriceFeed.sol";
+import "src/PriceFeeds/WETHPriceFeed.sol";
 
 import "./TestContracts/Accounts.sol";
 import "./TestContracts/ChainlinkOracleMock.sol";
 import "./TestContracts/RETHTokenMock.sol";
 import "./TestContracts/WSTETHTokenMock.sol";
 import "./TestContracts/Deployment.t.sol";
 
-import "../Dependencies/AggregatorV3Interface.sol";
-import "../Interfaces/IRETHPriceFeed.sol";
-import "../Interfaces/IWSTETHPriceFeed.sol";
+import "src/Dependencies/AggregatorV3Interface.sol";
+import "src/Interfaces/IRETHPriceFeed.sol";
+import "src/Interfaces/IWSTETHPriceFeed.sol";
 
-import "../Interfaces/IRETHToken.sol";
-import "../Interfaces/IWSTETH.sol";
+import "src/Interfaces/IRETHToken.sol";
+import "src/Interfaces/IWSTETH.sol";
 
 import "forge-std/Test.sol";
 import "lib/forge-std/src/console2.sol";

diff --git a/contracts/src/test/SPInvariants.t.sol → contracts/test/SPInvariants.t.sol b/contracts/src/test/SPInvariants.t.sol → contracts/test/SPInvariants.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import {IBoldToken} from "../Interfaces/IBoldToken.sol";
-import {IStabilityPool} from "../Interfaces/IStabilityPool.sol";
-import {HintHelpers} from "../HintHelpers.sol";
+import {IBoldToken} from "src/Interfaces/IBoldToken.sol";
+import {IStabilityPool} from "src/Interfaces/IStabilityPool.sol";
+import {HintHelpers} from "src/HintHelpers.sol";
 import {Assertions} from "./TestContracts/Assertions.sol";
 import {BaseInvariantTest} from "./TestContracts/BaseInvariantTest.sol";
 import {TestDeployer} from "./TestContracts/Deployment.t.sol";

diff --git a/contracts/src/test/SortedTroves.t.sol → contracts/test/SortedTroves.t.sol b/contracts/src/test/SortedTroves.t.sol → contracts/test/SortedTroves.t.sol
@@ -2,9 +2,9 @@
 pragma solidity 0.8.24;
 
 import "forge-std/Test.sol";
-import "../SortedTroves.sol";
-import "../AddressesRegistry.sol";
-import "../Types/TroveId.sol";
+import "src/SortedTroves.sol";
+import "src/AddressesRegistry.sol";
+import "src/Types/TroveId.sol";
 
 uint256 constant FUZZ_INPUT_LENGTH = 9;
 

diff --git a/...racts/src/test/TestContracts/Accounts.sol → contracts/test/TestContracts/Accounts.sol b/...racts/src/test/TestContracts/Accounts.sol → contracts/test/TestContracts/Accounts.sol
diff --git a/...TestContracts/AddRemoveManagersTester.sol → ...TestContracts/AddRemoveManagersTester.sol b/...TestContracts/AddRemoveManagersTester.sol → ...TestContracts/AddRemoveManagersTester.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "../../Dependencies/AddRemoveManagers.sol";
+import "src/Dependencies/AddRemoveManagers.sol";
 
 contract AddRemoveManagersTester is AddRemoveManagers {
     constructor(IAddressesRegistry _addressesRegistry) AddRemoveManagers(_addressesRegistry) {}

diff --git a/...cts/src/test/TestContracts/Assertions.sol → contracts/test/TestContracts/Assertions.sol b/...cts/src/test/TestContracts/Assertions.sol → contracts/test/TestContracts/Assertions.sol
diff --git a/...ts/src/test/TestContracts/BaseHandler.sol → contracts/test/TestContracts/BaseHandler.sol b/...ts/src/test/TestContracts/BaseHandler.sol → contracts/test/TestContracts/BaseHandler.sol
diff --git a/.../test/TestContracts/BaseInvariantTest.sol → .../test/TestContracts/BaseInvariantTest.sol b/.../test/TestContracts/BaseInvariantTest.sol → .../test/TestContracts/BaseInvariantTest.sol
diff --git a/...TestContracts/BaseMultiCollateralTest.sol → ...TestContracts/BaseMultiCollateralTest.sol b/...TestContracts/BaseMultiCollateralTest.sol → ...TestContracts/BaseMultiCollateralTest.sol
@@ -2,10 +2,10 @@
 pragma solidity 0.8.24;
 
 import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import {IBoldToken} from "../../Interfaces/IBoldToken.sol";
-import {ICollateralRegistry} from "../../Interfaces/ICollateralRegistry.sol";
-import {IWETH} from "../../Interfaces/IWETH.sol";
-import {HintHelpers} from "../../HintHelpers.sol";
+import {IBoldToken} from "src/Interfaces/IBoldToken.sol";
+import {ICollateralRegistry} from "src/Interfaces/ICollateralRegistry.sol";
+import {IWETH} from "src/Interfaces/IWETH.sol";
+import {HintHelpers} from "src/HintHelpers.sol";
 import {TestDeployer} from "./Deployment.t.sol";
 
 contract BaseMultiCollateralTest {

diff --git a/...racts/src/test/TestContracts/BaseTest.sol → contracts/test/TestContracts/BaseTest.sol b/...racts/src/test/TestContracts/BaseTest.sol → contracts/test/TestContracts/BaseTest.sol
@@ -2,23 +2,23 @@
 pragma solidity 0.8.24;
 
 import "./Accounts.sol";
-import "../../Interfaces/IActivePool.sol";
-import "../../Interfaces/IBoldToken.sol";
-import "../../Interfaces/ICollSurplusPool.sol";
-import "../../Interfaces/IDefaultPool.sol";
-import "../../Interfaces/IPriceFeed.sol";
-import "../../Interfaces/ISortedTroves.sol";
-import "../../Interfaces/IStabilityPool.sol";
+import "src/Interfaces/IActivePool.sol";
+import "src/Interfaces/IBoldToken.sol";
+import "src/Interfaces/ICollSurplusPool.sol";
+import "src/Interfaces/IDefaultPool.sol";
+import "src/Interfaces/IPriceFeed.sol";
+import "src/Interfaces/ISortedTroves.sol";
+import "src/Interfaces/IStabilityPool.sol";
 import "./BorrowerOperationsTester.t.sol";
 import "./TroveManagerTester.t.sol";
-import "../../Interfaces/ICollateralRegistry.sol";
+import "src/Interfaces/ICollateralRegistry.sol";
 import "./PriceFeedTestnet.sol";
-import "../../Interfaces/IInterestRouter.sol";
-import "../../GasPool.sol";
-import "../../HintHelpers.sol";
-import "../../Zappers/WETHZapper.sol";
-import "../../Zappers/GasCompZapper.sol";
-import "../../Zappers/LeverageLSTZapper.sol";
+import "src/Interfaces/IInterestRouter.sol";
+import "src/GasPool.sol";
+import "src/HintHelpers.sol";
+import "src/Zappers/WETHZapper.sol";
+import "src/Zappers/GasCompZapper.sol";
+import "src/Zappers/LeverageLSTZapper.sol";
 import {mulDivCeil} from "../Utils/Math.sol";
 import {Logging} from "../Utils/Logging.sol";
 import {StringFormatting} from "../Utils/StringFormatting.sol";

diff --git a/...rc/test/TestContracts/BoldTokenTester.sol → ...ts/test/TestContracts/BoldTokenTester.sol b/...rc/test/TestContracts/BoldTokenTester.sol → ...ts/test/TestContracts/BoldTokenTester.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import "../../BoldToken.sol";
+import "src/BoldToken.sol";
 
 contract BoldTokenTester is BoldToken {
     constructor(address _owner) BoldToken(_owner) {}

diff --git a/...tContracts/BorrowerOperationsTester.t.sol → ...tContracts/BorrowerOperationsTester.t.sol b/...tContracts/BorrowerOperationsTester.t.sol → ...tContracts/BorrowerOperationsTester.t.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.24;
 
-import "../../Interfaces/IAddressesRegistry.sol";
-import "../../BorrowerOperations.sol";
+import "src/Interfaces/IAddressesRegistry.sol";
+import "src/BorrowerOperations.sol";
 import "./Interfaces/IBorrowerOperationsTester.sol";
 
 /* Tester contract inherits from BorrowerOperations, and provides external functions

diff --git a/...est/TestContracts/ChainlinkOracleMock.sol → ...est/TestContracts/ChainlinkOracleMock.sol b/...est/TestContracts/ChainlinkOracleMock.sol → ...est/TestContracts/ChainlinkOracleMock.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import "../../Dependencies/AggregatorV3Interface.sol";
+import "src/Dependencies/AggregatorV3Interface.sol";
 
 // Mock Chainlink oracle that returns a stale price answer.
 // this contract code is etched over mainnet oracle addresses in mainnet fork tests.

diff --git a/...estContracts/CollateralRegistryTester.sol → ...estContracts/CollateralRegistryTester.sol b/...estContracts/CollateralRegistryTester.sol → ...estContracts/CollateralRegistryTester.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import "../../CollateralRegistry.sol";
+import "src/CollateralRegistry.sol";
 
 /* Tester contract inherits from CollateralRegistry, and provides external functions
 for testing the parent's internal functions. */

diff --git a/...t/TestContracts/CommunityIssuanceMock.sol → ...t/TestContracts/CommunityIssuanceMock.sol b/...t/TestContracts/CommunityIssuanceMock.sol → ...t/TestContracts/CommunityIssuanceMock.sol
diff --git a/...s/src/test/TestContracts/Deployment.t.sol → ...racts/test/TestContracts/Deployment.t.sol b/...s/src/test/TestContracts/Deployment.t.sol → ...racts/test/TestContracts/Deployment.t.sol
@@ -2,47 +2,47 @@
 
 pragma solidity 0.8.24;
 
-import "../../AddressesRegistry.sol";
-import "../../ActivePool.sol";
-import "../../BoldToken.sol";
-import "../../BorrowerOperations.sol";
-import "../../CollSurplusPool.sol";
-import "../../DefaultPool.sol";
-import "../../GasPool.sol";
-import "../../HintHelpers.sol";
-import "../../MultiTroveGetter.sol";
-import "../../SortedTroves.sol";
-import "../../StabilityPool.sol";
+import "src/AddressesRegistry.sol";
+import "src/ActivePool.sol";
+import "src/BoldToken.sol";
+import "src/BorrowerOperations.sol";
+import "src/CollSurplusPool.sol";
+import "src/DefaultPool.sol";
+import "src/GasPool.sol";
+import "src/HintHelpers.sol";
+import "src/MultiTroveGetter.sol";
+import "src/SortedTroves.sol";
+import "src/StabilityPool.sol";
 import "./BorrowerOperationsTester.t.sol";
 import "./TroveManagerTester.t.sol";
-import "../../TroveNFT.sol";
-import "../../NFTMetadata/MetadataNFT.sol";
-import "../../CollateralRegistry.sol";
+import "src/TroveNFT.sol";
+import "src/NFTMetadata/MetadataNFT.sol";
+import "src/CollateralRegistry.sol";
 import "./MockInterestRouter.sol";
 import "./PriceFeedTestnet.sol";
 import "./MetadataDeployment.sol";
-import "../../Zappers/WETHZapper.sol";
-import "../../Zappers/GasCompZapper.sol";
-import "../../Zappers/LeverageLSTZapper.sol";
-import "../../Zappers/LeverageWETHZapper.sol";
-import "../../Zappers/Modules/FlashLoans/BalancerFlashLoan.sol";
-import "../../Zappers/Interfaces/IFlashLoanProvider.sol";
-import "../../Zappers/Interfaces/IExchange.sol";
-import "../../Zappers/Modules/Exchanges/Curve/ICurveFactory.sol";
-import "../../Zappers/Modules/Exchanges/Curve/ICurveStableswapNGFactory.sol";
-import "../../Zappers/Modules/Exchanges/Curve/ICurvePool.sol";
-import "../../Zappers/Modules/Exchanges/Curve/ICurveStableswapNGPool.sol";
-import "../../Zappers/Modules/Exchanges/CurveExchange.sol";
-import "../../Zappers/Modules/Exchanges/UniswapV3/ISwapRouter.sol";
-import "../../Zappers/Modules/Exchanges/UniV3Exchange.sol";
-import "../../Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol";
-import "../../Zappers/Modules/Exchanges/HybridCurveUniV3Exchange.sol";
+import "src/Zappers/WETHZapper.sol";
+import "src/Zappers/GasCompZapper.sol";
+import "src/Zappers/LeverageLSTZapper.sol";
+import "src/Zappers/LeverageWETHZapper.sol";
+import "src/Zappers/Modules/FlashLoans/BalancerFlashLoan.sol";
+import "src/Zappers/Interfaces/IFlashLoanProvider.sol";
+import "src/Zappers/Interfaces/IExchange.sol";
+import "src/Zappers/Modules/Exchanges/Curve/ICurveFactory.sol";
+import "src/Zappers/Modules/Exchanges/Curve/ICurveStableswapNGFactory.sol";
+import "src/Zappers/Modules/Exchanges/Curve/ICurvePool.sol";
+import "src/Zappers/Modules/Exchanges/Curve/ICurveStableswapNGPool.sol";
+import "src/Zappers/Modules/Exchanges/CurveExchange.sol";
+import "src/Zappers/Modules/Exchanges/UniswapV3/ISwapRouter.sol";
+import "src/Zappers/Modules/Exchanges/UniV3Exchange.sol";
+import "src/Zappers/Modules/Exchanges/UniswapV3/INonfungiblePositionManager.sol";
+import "src/Zappers/Modules/Exchanges/HybridCurveUniV3Exchange.sol";
 import {WETHTester} from "./WETHTester.sol";
 import {ERC20Faucet} from "./ERC20Faucet.sol";
 
-import "../../PriceFeeds/WETHPriceFeed.sol";
-import "../../PriceFeeds/WSTETHPriceFeed.sol";
-import "../../PriceFeeds/RETHPriceFeed.sol";
+import "src/PriceFeeds/WETHPriceFeed.sol";
+import "src/PriceFeeds/WSTETHPriceFeed.sol";
+import "src/PriceFeeds/RETHPriceFeed.sol";
 
 import "forge-std/console2.sol";
 

diff --git a/...s/src/test/TestContracts/DevTestSetup.sol → ...racts/test/TestContracts/DevTestSetup.sol b/...s/src/test/TestContracts/DevTestSetup.sol → ...racts/test/TestContracts/DevTestSetup.sol
diff --git a/...ts/src/test/TestContracts/ERC20Faucet.sol → contracts/test/TestContracts/ERC20Faucet.sol b/...ts/src/test/TestContracts/ERC20Faucet.sol → contracts/test/TestContracts/ERC20Faucet.sol
diff --git a/...rc/test/TestContracts/ERC20MinterMock.sol → ...ts/test/TestContracts/ERC20MinterMock.sol b/...rc/test/TestContracts/ERC20MinterMock.sol → ...ts/test/TestContracts/ERC20MinterMock.sol
diff --git a/.../Interfaces/IBorrowerOperationsTester.sol → .../Interfaces/IBorrowerOperationsTester.sol b/.../Interfaces/IBorrowerOperationsTester.sol → .../Interfaces/IBorrowerOperationsTester.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import "../../../Interfaces/IBorrowerOperations.sol";
+import "src/Interfaces/IBorrowerOperations.sol";
 
 interface IBorrowerOperationsTester is IBorrowerOperations {
     function getCollToken() external view returns (IERC20);

diff --git a/...stContracts/Interfaces/IPriceFeedMock.sol → ...stContracts/Interfaces/IPriceFeedMock.sol b/...stContracts/Interfaces/IPriceFeedMock.sol → ...stContracts/Interfaces/IPriceFeedMock.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.18;
 
-import "../../../Interfaces/IPriceFeed.sol";
+import "src/Interfaces/IPriceFeed.sol";
 
 interface IPriceFeedMock is IPriceFeed {
     function setPrice(uint256 _price) external;

diff --git a/...ontracts/Interfaces/IPriceFeedTestnet.sol → ...ontracts/Interfaces/IPriceFeedTestnet.sol b/...ontracts/Interfaces/IPriceFeedTestnet.sol → ...ontracts/Interfaces/IPriceFeedTestnet.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import "../../../Interfaces/IPriceFeed.sol";
+import "src/Interfaces/IPriceFeed.sol";
 
 interface IPriceFeedTestnet is IPriceFeed {
     function setPrice(uint256 _price) external returns (bool);

diff --git a/...tracts/Interfaces/ITroveManagerTester.sol → ...tracts/Interfaces/ITroveManagerTester.sol b/...tracts/Interfaces/ITroveManagerTester.sol → ...tracts/Interfaces/ITroveManagerTester.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import "../../../Interfaces/ITroveManager.sol";
+import "src/Interfaces/ITroveManager.sol";
 
 interface ITroveManagerTester is ITroveManager {
     function liquidate(uint256 _troveId) external;

diff --git a/...TestContracts/InvariantsTestHandler.t.sol → ...TestContracts/InvariantsTestHandler.t.sol b/...TestContracts/InvariantsTestHandler.t.sol → ...TestContracts/InvariantsTestHandler.t.sol
@@ -6,15 +6,15 @@ import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
 import {Address} from "openzeppelin-contracts/contracts/utils/Address.sol";
 import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";
-import {LatestBatchData} from "../../Types/LatestBatchData.sol";
-import {LatestTroveData} from "../../Types/LatestTroveData.sol";
-import {IBorrowerOperations} from "../../Interfaces/IBorrowerOperations.sol";
-import {ISortedTroves} from "../../Interfaces/ISortedTroves.sol";
-import {ITroveManager} from "../../Interfaces/ITroveManager.sol";
-import {AddressesRegistry} from "../../AddressesRegistry.sol";
-import {AddRemoveManagers} from "../../Dependencies/AddRemoveManagers.sol";
-import {BorrowerOperations} from "../../BorrowerOperations.sol";
-import {TroveManager} from "../../TroveManager.sol";
+import {LatestBatchData} from "src/Types/LatestBatchData.sol";
+import {LatestTroveData} from "src/Types/LatestTroveData.sol";
+import {IBorrowerOperations} from "src/Interfaces/IBorrowerOperations.sol";
+import {ISortedTroves} from "src/Interfaces/ISortedTroves.sol";
+import {ITroveManager} from "src/Interfaces/ITroveManager.sol";
+import {AddressesRegistry} from "src/AddressesRegistry.sol";
+import {AddRemoveManagers} from "src/Dependencies/AddRemoveManagers.sol";
+import {BorrowerOperations} from "src/BorrowerOperations.sol";
+import {TroveManager} from "src/TroveManager.sol";
 import {EnumerableAddressSet, EnumerableSet} from "../Utils/EnumerableSet.sol";
 import {pow} from "../Utils/Math.sol";
 import {StringFormatting} from "../Utils/StringFormatting.sol";
@@ -48,7 +48,7 @@ import {
     SP_YIELD_SPLIT,
     UPFRONT_INTEREST_PERIOD,
     URGENT_REDEMPTION_BONUS
-} from "../../Dependencies/Constants.sol";
+} from "src/Dependencies/Constants.sol";
 
 uint256 constant TIME_DELTA_MIN = 0;
 uint256 constant TIME_DELTA_MAX = ONE_YEAR;

diff --git a/...rc/test/TestContracts/LQTYStakingMock.sol → ...ts/test/TestContracts/LQTYStakingMock.sol b/...rc/test/TestContracts/LQTYStakingMock.sol → ...ts/test/TestContracts/LQTYStakingMock.sol
diff --git a/.../src/test/TestContracts/LQTYTokenMock.sol → ...acts/test/TestContracts/LQTYTokenMock.sol b/.../src/test/TestContracts/LQTYTokenMock.sol → ...acts/test/TestContracts/LQTYTokenMock.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.24;
 
-//import "../../Dependencies/IERC20.sol";
-//import "../../Dependencies/IERC2612.sol";
+//import "src/Dependencies/IERC20.sol";
+//import "src/Dependencies/IERC2612.sol";
 
 contract LQTYTokenMock { /*is IERC20, IERC2612*/
     function sendToLQTYStaking(address _sender, uint256 _amount) external {}

diff --git a/.../test/TestContracts/LiquityMathTester.sol → .../test/TestContracts/LiquityMathTester.sol b/.../test/TestContracts/LiquityMathTester.sol → .../test/TestContracts/LiquityMathTester.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import "../../Dependencies/LiquityMath.sol";
+import "src/Dependencies/LiquityMath.sol";
 
 /* Tester contract for math functions in Math.sol library. */
 

diff --git a/...test/TestContracts/MetadataDeployment.sol → ...test/TestContracts/MetadataDeployment.sol b/...test/TestContracts/MetadataDeployment.sol → ...test/TestContracts/MetadataDeployment.sol
diff --git a/...test/TestContracts/MockInterestRouter.sol → ...test/TestContracts/MockInterestRouter.sol b/...test/TestContracts/MockInterestRouter.sol → ...test/TestContracts/MockInterestRouter.sol
@@ -2,6 +2,6 @@
 
 pragma solidity 0.8.24;
 
-import "../../Interfaces/IInterestRouter.sol";
+import "src/Interfaces/IInterestRouter.sol";
 
 contract MockInterestRouter is IInterestRouter {}
diff --git a/...c/test/TestContracts/NonPayableSwitch.sol → ...s/test/TestContracts/NonPayableSwitch.sol b/...c/test/TestContracts/NonPayableSwitch.sol → ...s/test/TestContracts/NonPayableSwitch.sol
diff --git a/.../src/test/TestContracts/PriceFeedMock.sol → ...acts/test/TestContracts/PriceFeedMock.sol b/.../src/test/TestContracts/PriceFeedMock.sol → ...acts/test/TestContracts/PriceFeedMock.sol
diff --git a/...c/test/TestContracts/PriceFeedTestnet.sol → ...s/test/TestContracts/PriceFeedTestnet.sol b/...c/test/TestContracts/PriceFeedTestnet.sol → ...s/test/TestContracts/PriceFeedTestnet.sol
diff --git a/.../src/test/TestContracts/RETHTokenMock.sol → ...acts/test/TestContracts/RETHTokenMock.sol b/.../src/test/TestContracts/RETHTokenMock.sol → ...acts/test/TestContracts/RETHTokenMock.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import "../../Interfaces/IRETHToken.sol";
+import "src/Interfaces/IRETHToken.sol";
 
 contract RETHTokenMock is IRETHToken {
     function getExchangeRate() external pure returns (uint256) {

diff --git a/...stContracts/SPInvariantsTestHandler.t.sol → ...stContracts/SPInvariantsTestHandler.t.sol b/...stContracts/SPInvariantsTestHandler.t.sol → ...stContracts/SPInvariantsTestHandler.t.sol
@@ -2,12 +2,12 @@
 pragma solidity 0.8.24;
 
 import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import {IBorrowerOperations} from "../../Interfaces/IBorrowerOperations.sol";
-import {IBoldToken} from "../../Interfaces/IBoldToken.sol";
-import {IStabilityPool} from "../../Interfaces/IStabilityPool.sol";
-import {ITroveManager} from "../../Interfaces/ITroveManager.sol";
-import {ICollSurplusPool} from "../../Interfaces/ICollSurplusPool.sol";
-import {HintHelpers} from "../../HintHelpers.sol";
+import {IBorrowerOperations} from "src/Interfaces/IBorrowerOperations.sol";
+import {IBoldToken} from "src/Interfaces/IBoldToken.sol";
+import {IStabilityPool} from "src/Interfaces/IStabilityPool.sol";
+import {ITroveManager} from "src/Interfaces/ITroveManager.sol";
+import {ICollSurplusPool} from "src/Interfaces/ICollSurplusPool.sol";
+import {HintHelpers} from "src/HintHelpers.sol";
 import {IPriceFeedTestnet} from "./Interfaces/IPriceFeedTestnet.sol";
 import {ITroveManagerTester} from "./Interfaces/ITroveManagerTester.sol";
 import {mulDivCeil} from "../Utils/Math.sol";
@@ -21,7 +21,7 @@ import {
     ETH_GAS_COMPENSATION,
     COLL_GAS_COMPENSATION_DIVISOR,
     MIN_ANNUAL_INTEREST_RATE
-} from "../../Dependencies/Constants.sol";
+} from "src/Dependencies/Constants.sol";
 
 using {mulDivCeil} for uint256;