From 9a572283d6b0fd6fcc3d9a8d9a9142ab37c295df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Fingen?= <bingen@liquity.org>
Date: Wed, 28 Aug 2024 10:04:03 +0100
Subject: [PATCH] fix: Remove unused BorrowerOperations from StabilityPool

---
 contracts/src/Interfaces/IStabilityPool.sol | 2 --
 contracts/src/Interfaces/ITroveManager.sol  | 1 +
 contracts/src/StabilityPool.sol             | 9 ---------
 contracts/src/test/deployment.t.sol         | 6 ------
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/contracts/src/Interfaces/IStabilityPool.sol b/contracts/src/Interfaces/IStabilityPool.sol
index 370c9b575..d4d7d5674 100644
--- a/contracts/src/Interfaces/IStabilityPool.sol
+++ b/contracts/src/Interfaces/IStabilityPool.sol
@@ -4,7 +4,6 @@ pragma solidity ^0.8.0;
 
 import "./IActivePool.sol";
 import "./ILiquityBase.sol";
-import "./IBorrowerOperations.sol";
 import "./IBoldToken.sol";
 import "./ITroveManager.sol";
 import "./IBoldRewardsReceiver.sol";
@@ -30,7 +29,6 @@ import "./IBoldRewardsReceiver.sol";
  *
 */
 interface IStabilityPool is ILiquityBase, IBoldRewardsReceiver {
-    function borrowerOperations() external view returns (IBorrowerOperations);
     function boldToken() external view returns (IBoldToken);
     function troveManager() external view returns (ITroveManager);
 
diff --git a/contracts/src/Interfaces/ITroveManager.sol b/contracts/src/Interfaces/ITroveManager.sol
index 73cac44bb..e5a62631a 100644
--- a/contracts/src/Interfaces/ITroveManager.sol
+++ b/contracts/src/Interfaces/ITroveManager.sol
@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import "./ILiquityBase.sol";
 import "./ITroveNFT.sol";
+import "./IBorrowerOperations.sol";
 import "./IStabilityPool.sol";
 import "./IBoldToken.sol";
 import "./ISortedTroves.sol";
diff --git a/contracts/src/StabilityPool.sol b/contracts/src/StabilityPool.sol
index 895ef9a4e..f0c55dd3a 100644
--- a/contracts/src/StabilityPool.sol
+++ b/contracts/src/StabilityPool.sol
@@ -6,9 +6,7 @@ import "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import "./Interfaces/IStabilityPool.sol";
 import "./Interfaces/IAddressesRegistry.sol";
-import "./Interfaces/IBorrowerOperations.sol";
 import "./Interfaces/IStabilityPoolEvents.sol";
-import "./Interfaces/IBorrowerOperations.sol";
 import "./Interfaces/ITroveManager.sol";
 import "./Interfaces/IBoldToken.sol";
 import "./Interfaces/ISortedTroves.sol";
@@ -136,7 +134,6 @@ contract StabilityPool is LiquityBase, IStabilityPool, IStabilityPoolEvents {
     string public constant NAME = "StabilityPool";
 
     IERC20 public immutable collToken;
-    IBorrowerOperations public immutable borrowerOperations;
     ITroveManager public immutable troveManager;
     IBoldToken public immutable boldToken;
     // Needed to check if there are pending liquidations
@@ -206,25 +203,19 @@ contract StabilityPool is LiquityBase, IStabilityPool, IStabilityPoolEvents {
 
     // --- Events ---
 
-    event BorrowerOperationsAddressChanged(address _newBorrowerOperationsAddress);
     event TroveManagerAddressChanged(address _newTroveManagerAddress);
     event BoldTokenAddressChanged(address _newBoldTokenAddress);
     event SortedTrovesAddressChanged(address _newSortedTrovesAddress);
 
     constructor(IAddressesRegistry _addressesRegistry) LiquityBase(_addressesRegistry) {
         collToken = _addressesRegistry.collToken();
-        borrowerOperations = _addressesRegistry.borrowerOperations();
         troveManager = _addressesRegistry.troveManager();
         boldToken = _addressesRegistry.boldToken();
         sortedTroves = _addressesRegistry.sortedTroves();
 
-        emit BorrowerOperationsAddressChanged(address(borrowerOperations));
         emit TroveManagerAddressChanged(address(troveManager));
         emit BoldTokenAddressChanged(address(boldToken));
         emit SortedTrovesAddressChanged(address(sortedTroves));
-
-        // Allow funds movements between Liquity contracts
-        collToken.approve(address(borrowerOperations), type(uint256).max);
     }
 
     // --- Getters for public variables. Required by IPool interface ---
diff --git a/contracts/src/test/deployment.t.sol b/contracts/src/test/deployment.t.sol
index 6d0d64bf5..2dbfa4955 100644
--- a/contracts/src/test/deployment.t.sol
+++ b/contracts/src/test/deployment.t.sol
@@ -110,12 +110,6 @@ contract Deployment is DevTestSetup {
         assertEq(activePoolAddress, recordedActivePoolAddress);
     }
 
-    function testStabilityPoolHasCorrectCorrectBorrowerOpsAddress() public view {
-        address borrowerOperationsAddress = address(borrowerOperations);
-        address recordedBorrowerOperationsAddress = address(stabilityPool.borrowerOperations());
-        assertEq(borrowerOperationsAddress, recordedBorrowerOperationsAddress);
-    }
-
     function testStabilityPoolHasCorrectCorrectBoldTokenAddress() public view {
         address boldTokenAddress = address(boldToken);
         address recordedBoldTokenAddress = address(stabilityPool.boldToken());