From ba5e7911b2d63ac9a30495174bb4a7ab1d65426f Mon Sep 17 00:00:00 2001
From: RickGriff <rick@liquity.org>
Date: Sat, 20 Jan 2024 14:05:34 +0700
Subject: [PATCH] Remove gas pool interface and fix tests

---
 contracts/src/GasPool.sol                     | 4 +---
 contracts/src/Interfaces/IGasPool.sol         | 7 -------
 contracts/src/test/TestContracts/BaseTest.sol | 6 ++++--
 contracts/src/test/deployment.t.sol           | 6 +++---
 4 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 contracts/src/Interfaces/IGasPool.sol

diff --git a/contracts/src/GasPool.sol b/contracts/src/GasPool.sol
index 6a68a508..40ed1af1 100644
--- a/contracts/src/GasPool.sol
+++ b/contracts/src/GasPool.sol
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import './Interfaces/IGasPool.sol';
-
 /**
  * The purpose of this contract is to hold Bold tokens for gas compensation:
  * https://github.com/liquity/dev#gas-compensation
@@ -13,6 +11,6 @@ import './Interfaces/IGasPool.sol';
  * 50 Bold debt on the trove is cancelled.
  * See this issue for more context: https://github.com/liquity/dev/issues/186
  */
-contract GasPool is IGasPool {
+contract GasPool {
     // do nothing, as the core contracts have permission to send to and burn from this address
 }
diff --git a/contracts/src/Interfaces/IGasPool.sol b/contracts/src/Interfaces/IGasPool.sol
deleted file mode 100644
index 2438d9dd..00000000
--- a/contracts/src/Interfaces/IGasPool.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity 0.8.18;
-
-interface IGasPool { 
-   // empty
-}
diff --git a/contracts/src/test/TestContracts/BaseTest.sol b/contracts/src/test/TestContracts/BaseTest.sol
index ade12cc9..8973d834 100644
--- a/contracts/src/test/TestContracts/BaseTest.sol
+++ b/contracts/src/test/TestContracts/BaseTest.sol
@@ -6,13 +6,14 @@ import "../../Interfaces/IActivePool.sol";
 import "../../Interfaces/IBoldToken.sol";
 import "../../Interfaces/IBorrowerOperations.sol";
 import "../../Interfaces/ICollSurplusPool.sol";
-import "../../Interfaces/IGasPool.sol";
 import "../../Interfaces/IDefaultPool.sol";
 import "../../Interfaces/IPriceFeed.sol";
 import "../../Interfaces/ISortedTroves.sol";
 import "../../Interfaces/IStabilityPool.sol";
 import "../../Interfaces/ITroveManager.sol";
 
+import "../../GasPool.sol";
+
 import "forge-std/Test.sol";
 import "forge-std/console2.sol";
 
@@ -35,7 +36,6 @@ contract BaseTest is Test {
     IActivePool activePool;
     IBorrowerOperations borrowerOperations;
     ICollSurplusPool collSurplusPool;
-    IGasPool gasPool;
     IDefaultPool defaultPool;
     IPriceFeed priceFeed;
     ISortedTroves sortedTroves;
@@ -43,6 +43,8 @@ contract BaseTest is Test {
     ITroveManager troveManager;
     IBoldToken boldToken;
 
+    GasPool gasPool;
+
     function createAccounts() public {
         address[10] memory tempAccounts;
         for (uint256 i = 0; i < accounts.getAccountsCount(); i++) {
diff --git a/contracts/src/test/deployment.t.sol b/contracts/src/test/deployment.t.sol
index 5841b137..d8992215 100644
--- a/contracts/src/test/deployment.t.sol
+++ b/contracts/src/test/deployment.t.sol
@@ -65,7 +65,7 @@ contract Deployment is DevTestSetup {
 
     // Active Pool
 
-    function testActivePoolHasCorrectActivePoolAddress() public {
+    function testActivePoolHasCorrectStabilityPoolAddress() public {
         address stabilityPoolAddress = address(stabilityPool);
         address recordedStabilityPoolAddress = activePool.stabilityPoolAddress();
         assertEq(stabilityPoolAddress, recordedStabilityPoolAddress);
@@ -131,13 +131,13 @@ contract Deployment is DevTestSetup {
 
     // Sorted Troves
 
-    function testSortedTrovesHasCorrectTroveManagerAddress() public {
+    function testSortedTrovesHasCorrectBorrowerOperationsAddress() public {
         address borrowerOperationsAddress = address(borrowerOperations);
         address recordedBorrowerOperationsAddress = sortedTroves.borrowerOperationsAddress();
         assertEq(borrowerOperationsAddress, recordedBorrowerOperationsAddress);
     }
 
-    function testSortedTrovesHasCorrectBorrowerOperationsAddress() public {
+    function testSortedTrovesHasCorrectTroveManagerAddress() public {
         address troveManagerAddress = address(troveManager);
         address recordedTroveManagerAddress = address(sortedTroves.troveManager());
         assertEq(troveManagerAddress, recordedTroveManagerAddress);