feat: consolidate dependencies to 1 file

aave · Jul 20, 2024 · d358066 · d358066
1 parent cd06a01
commit d358066
Show file tree

Hide file tree

Showing 24 changed files with 1,115 additions and 1,190 deletions.
diff --git a/src/contracts/misc/ArbGhoSteward.sol b/src/contracts/misc/ArbGhoSteward.sol
@@ -2,7 +2,6 @@
 pragma solidity ^0.8.10;
 
 import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol';
-import {IOwnable} from './mocks/IOwnable.sol';
 import {EnumerableSet} from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 import {IPoolAddressesProvider} from '@aave/core-v3/contracts/interfaces/IPoolAddressesProvider.sol';
 import {IPoolConfigurator} from '@aave/core-v3/contracts/interfaces/IPoolConfigurator.sol';
@@ -16,8 +15,7 @@ import {IGsm} from '../facilitators/gsm/interfaces/IGsm.sol';
 import {IGsmFeeStrategy} from '../facilitators/gsm/feeStrategy/interfaces/IGsmFeeStrategy.sol';
 import {IGhoToken} from '../gho/interfaces/IGhoToken.sol';
 import {IArbGhoSteward} from './interfaces/IArbGhoSteward.sol';
-import {UpgradeableBurnMintTokenPool} from './mocks/UpgradeableBurnMintTokenPool.sol';
-import {RateLimiter} from './mocks/RateLimiter.sol';
+import {IOwnable, RateLimiter, UpgradeableBurnMintTokenPool} from './mocks/Dependencies.sol';
 
 /**
  * @title ArbGhoSteward

diff --git a/src/contracts/misc/GhoStewardV2.sol b/src/contracts/misc/GhoStewardV2.sol
@@ -15,8 +15,7 @@ import {IGsm} from '../facilitators/gsm/interfaces/IGsm.sol';
 import {IGsmFeeStrategy} from '../facilitators/gsm/feeStrategy/interfaces/IGsmFeeStrategy.sol';
 import {IGhoToken} from '../gho/interfaces/IGhoToken.sol';
 import {IGhoStewardV2} from './interfaces/IGhoStewardV2.sol';
-import {UpgradeableLockReleaseTokenPool} from './mocks/UpgradeableLockReleaseTokenPool.sol';
-import {RateLimiter} from './mocks/RateLimiter.sol';
+import {UpgradeableLockReleaseTokenPool, RateLimiter} from './mocks/Dependencies.sol';
 
 /**
  * @title GhoStewardV2

diff --git a/src/contracts/misc/interfaces/IArbGhoSteward.sol b/src/contracts/misc/interfaces/IArbGhoSteward.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {RateLimiter} from '../mocks/RateLimiter.sol';
+import {RateLimiter} from '../mocks/Dependencies.sol';
 
 /**
  * @title IGhoStewardV2

diff --git a/src/contracts/misc/interfaces/IGhoStewardV2.sol b/src/contracts/misc/interfaces/IGhoStewardV2.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.10;
 
-import {RateLimiter} from '../mocks/RateLimiter.sol';
+import {RateLimiter} from '../mocks/Dependencies.sol';
 
 /**
  * @title IGhoStewardV2

diff --git a/src/contracts/misc/mocks/Client.sol b/src/contracts/misc/mocks/Client.sol
diff --git a/src/contracts/misc/mocks/ConfirmedOwner.sol b/src/contracts/misc/mocks/ConfirmedOwner.sol
diff --git a/src/contracts/misc/mocks/ConfirmedOwnerWithProposal.sol b/src/contracts/misc/mocks/ConfirmedOwnerWithProposal.sol