test: Remove redundant test contracts folder

liquity · Mar 6, 2024 · 24928ba · 24928ba
1 parent a7f19ff
commit 24928ba
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 292 deletions.
diff --git a/contracts/src/TestContracts/ActivePoolTester.sol b/contracts/src/TestContracts/ActivePoolTester.sol
diff --git a/contracts/src/TestContracts/BoldTokenCaller.sol b/contracts/src/TestContracts/BoldTokenCaller.sol
diff --git a/contracts/src/TestContracts/BoldTokenTester.sol b/contracts/src/TestContracts/BoldTokenTester.sol
diff --git a/contracts/src/TestContracts/DefaultPoolTester.sol b/contracts/src/TestContracts/DefaultPoolTester.sol
diff --git a/contracts/src/TestContracts/Destructible.sol b/contracts/src/TestContracts/Destructible.sol
diff --git a/contracts/src/TestContracts/FunctionCaller.sol b/contracts/src/TestContracts/FunctionCaller.sol
diff --git a/contracts/src/TestContracts/MockTellor.sol b/contracts/src/TestContracts/MockTellor.sol
diff --git a/contracts/src/TestContracts/PriceFeedTester.sol b/contracts/src/TestContracts/PriceFeedTester.sol
diff --git a/contracts/src/TestContracts/StabilityPoolTester.sol b/contracts/src/TestContracts/StabilityPoolTester.sol
diff --git a/contracts/src/TroveManager.sol b/contracts/src/TroveManager.sol
@@ -1197,8 +1197,8 @@ contract TroveManager is LiquityBase, Ownable, CheckContract, ITroveManager {
     function _updateSystemSnapshots_excludeCollRemainder(IActivePool _activePool, uint _collRemainder) internal {
         totalStakesSnapshot = totalStakes;
 
-        uint activeColl = _activePool.getETH();
-        uint liquidatedColl = defaultPool.getETH();
+        uint activeColl = _activePool.getETHBalance();
+        uint liquidatedColl = defaultPool.getETHBalance();
         totalCollateralSnapshot = activeColl - _collRemainder + liquidatedColl;
 
         emit SystemSnapshotsUpdated(totalStakesSnapshot, totalCollateralSnapshot);

diff --git a/contracts/src/test/TestContracts/BaseTest.sol b/contracts/src/test/TestContracts/BaseTest.sol
@@ -11,6 +11,7 @@ import "../../Interfaces/IPriceFeed.sol";
 import "../../Interfaces/ISortedTroves.sol";
 import "../../Interfaces/IStabilityPool.sol";
 import "../../Interfaces/ITroveManager.sol";
+import "./PriceFeedTestnet.sol";
 
 import "../../GasPool.sol";
 
@@ -44,6 +45,7 @@ contract BaseTest is Test {
     IStabilityPool stabilityPool;
     ITroveManager troveManager;
     IBoldToken boldToken;
+    IPriceFeedTestnet priceFeed;
 
     GasPool gasPool;
 

diff --git a/...estContracts/BorrowerOperationsTester.sol → ...estContracts/BorrowerOperationsTester.sol b/...estContracts/BorrowerOperationsTester.sol → ...estContracts/BorrowerOperationsTester.sol
@@ -2,12 +2,14 @@
 
 pragma solidity 0.8.18;
 
-import "../BorrowerOperations.sol";
+import "../../BorrowerOperations.sol";
 
 /* Tester contract inherits from BorrowerOperations, and provides external functions 
 for testing the parent's internal functions. */
 contract BorrowerOperationsTester is BorrowerOperations {
 
+    constructor(address _ETHAddress) BorrowerOperations(_ETHAddress) {}
+
     function getNewICRFromTroveChange
     (
         uint _coll, 
@@ -53,9 +55,7 @@ contract BorrowerOperationsTester is BorrowerOperations {
     )
         external 
     {
-        _adjustTrove(_borrower, _collWithdrawal, _debtChange, _isDebtIncrease, 0);
+        // TODO: Add coll increase
+        _adjustTrove(_borrower, _collWithdrawal, false, _debtChange, _isDebtIncrease, 0);
     }
-
-    // Payable fallback function
-    receive() external payable { }
 }
diff --git a/contracts/src/test/TestContracts/DevTestSetup.sol b/contracts/src/test/TestContracts/DevTestSetup.sol
@@ -14,7 +14,7 @@ import "../../DefaultPool.sol";
 import "../../GasPool.sol";
 import "../../HintHelpers.sol";
 import "../../MultiTroveGetter.sol";
-import "../../TestContracts/PriceFeedTestnet.sol";
+import "./PriceFeedTestnet.sol";
 import "../../SortedTroves.sol";
 import "../../StabilityPool.sol";
 import "../../TroveManager.sol";

diff --git a/contracts/src/test/TestContracts/ERC20MinterMock.sol b/contracts/src/test/TestContracts/ERC20MinterMock.sol
@@ -0,0 +1,8 @@
+pragma solidity ^0.8.18;
+
+import "openzeppelin-contracts/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
+
+
+contract ERC20MinterMock is ERC20PresetMinterPauser {
+    constructor(string memory name, string memory symbol) ERC20PresetMinterPauser(name, symbol) {}
+}
diff --git a/contracts/src/test/TestContracts/Interfaces/IPriceFeedTestnet.sol b/contracts/src/test/TestContracts/Interfaces/IPriceFeedTestnet.sol
@@ -6,4 +6,5 @@ import "../../../Interfaces/IPriceFeed.sol";
 
 interface IPriceFeedTestnet is IPriceFeed {
     function setPrice(uint256 _price) external returns (bool);
-}
+    function getPrice() external view returns (uint256);
+}
diff --git a/...s/src/TestContracts/LiquityMathTester.sol → .../test/TestContracts/LiquityMathTester.sol b/...s/src/TestContracts/LiquityMathTester.sol → .../test/TestContracts/LiquityMathTester.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.18;
 
-import "../Dependencies/LiquityMath.sol";
+import "../../Dependencies/LiquityMath.sol";
 
 /* Tester contract for math functions in Math.sol library. */
 

diff --git a/contracts/src/TestContracts/NonPayable.sol → ...cts/src/test/TestContracts/NonPayable.sol b/contracts/src/TestContracts/NonPayable.sol → ...cts/src/test/TestContracts/NonPayable.sol
diff --git a/...ts/src/TestContracts/PriceFeedTestnet.sol → ...c/test/TestContracts/PriceFeedTestnet.sol b/...ts/src/TestContracts/PriceFeedTestnet.sol → ...c/test/TestContracts/PriceFeedTestnet.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.18;
 
-import "../test/TestContracts/Interfaces/IPriceFeedTestnet.sol";
+import "./Interfaces/IPriceFeedTestnet.sol";
 
 /*
 * PriceFeed placeholder for testnet and development. The price is simply set manually and saved in a state 
@@ -16,7 +16,7 @@ contract PriceFeedTestnet is IPriceFeedTestnet {
     // --- Functions ---
 
     // View price getter for simplicity in tests
-    function getPrice() external view returns (uint256) {
+    function getPrice() external view override returns (uint256) {
         return _price;
     }