fix: components imports

QuantWealth · Jul 8, 2024 · 558d183 · 558d183
1 parent edfae0d
commit 558d183
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 14 deletions.
diff --git a/script/child/DeployQWAaveV2.s.sol b/script/child/DeployQWAaveV2.s.sol
@@ -5,7 +5,7 @@ import {DeployBase} from '../helpers/DeployBase.sol';
 
 import {QWManager} from 'contracts/QWManager.sol';
 import {QWRegistry} from 'contracts/QWRegistry.sol';
-import {QWAaveV2} from 'contracts/child/QWAaveV2.sol';
+import {QWAaveV2} from 'contracts/components/QWAaveV2.sol';
 import {Script} from 'forge-std/Script.sol';
 
 /**

diff --git a/script/child/DeployQWAaveV3.s.sol b/script/child/DeployQWAaveV3.s.sol
@@ -5,7 +5,7 @@ import {DeployBase} from '../helpers/DeployBase.sol';
 
 import {QWManager} from 'contracts/QWManager.sol';
 import {QWRegistry} from 'contracts/QWRegistry.sol';
-import {QWAaveV3} from 'contracts/child/QWAaveV3.sol';
+import {QWAaveV3} from 'contracts/components/QWAaveV3.sol';
 import {Script} from 'forge-std/Script.sol';
 
 /**

diff --git a/script/child/DeployQWCompound.s.sol b/script/child/DeployQWCompound.s.sol
@@ -5,7 +5,7 @@ import {DeployBase} from '../helpers/DeployBase.sol';
 
 import {QWManager} from 'contracts/QWManager.sol';
 import {QWRegistry} from 'contracts/QWRegistry.sol';
-import {QWCompound} from 'contracts/child/QWCompound.sol';
+import {QWCompound} from 'contracts/components/QWCompound.sol';
 import {Script} from 'forge-std/Script.sol';
 
 /**

diff --git a/script/child/DeployQWUniswapV3Stable.s.sol b/script/child/DeployQWUniswapV3Stable.s.sol
@@ -5,7 +5,7 @@ import {DeployBase} from '../helpers/DeployBase.sol';
 
 import {QWManager} from 'contracts/QWManager.sol';
 import {QWRegistry} from 'contracts/QWRegistry.sol';
-import {QWUniswapV3Stable} from 'contracts/child/QWUniswapV3Stable.sol';
+import {QWUniswapV3Stable} from 'contracts/components/QWUniswapV3Stable.sol';
 import {Script} from 'forge-std/Script.sol';
 
 /**

diff --git a/src/contracts/child/QWAaveV2.sol → src/contracts/components/QWAaveV2.sol b/src/contracts/child/QWAaveV2.sol → src/contracts/components/QWAaveV2.sol
diff --git a/src/contracts/child/QWAaveV3.sol → src/contracts/components/QWAaveV3.sol b/src/contracts/child/QWAaveV3.sol → src/contracts/components/QWAaveV3.sol
diff --git a/src/contracts/child/QWComponentBase.sol → src/contracts/components/QWComponentBase.sol b/src/contracts/child/QWComponentBase.sol → src/contracts/components/QWComponentBase.sol
diff --git a/src/contracts/child/QWCompound.sol → src/contracts/components/QWCompound.sol b/src/contracts/child/QWCompound.sol → src/contracts/components/QWCompound.sol
diff --git a/src/contracts/child/QWUniswapV3Stable.sol → ...ontracts/components/QWUniswapV3Stable.sol b/src/contracts/child/QWUniswapV3Stable.sol → ...ontracts/components/QWUniswapV3Stable.sol
diff --git a/test/integration/child/QWAaveV2.t.sol → test/integration/components/QWAaveV2.t.sol b/test/integration/child/QWAaveV2.t.sol → test/integration/components/QWAaveV2.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.23;
 
 import {IntegrationBase} from '../IntegrationBase.t.sol';
 import {IQWManager} from 'interfaces/IQWManager.sol';
-import {IERC20, ILendingPool, QWAaveV2} from 'contracts/child/QWAaveV2.sol';
+import {IERC20, ILendingPool, QWAaveV2} from 'contracts/components/QWAaveV2.sol';
 
 import {IIncentivesController} from 'interfaces/aave-v2/IIncentivesController.sol';
 

diff --git a/test/integration/child/QWAaveV3.t.sol → test/integration/components/QWAaveV3.t.sol b/test/integration/child/QWAaveV3.t.sol → test/integration/components/QWAaveV3.t.sol
@@ -4,13 +4,14 @@ pragma solidity 0.8.23;
 import {IntegrationBase} from '../IntegrationBase.t.sol';
 
 import {IRewardsController} from '@aave/periphery-v3/contracts/rewards/interfaces/IRewardsController.sol';
-import {IERC20, IPool, IQWChild, QWAaveV3} from 'contracts/child/QWAaveV3.sol';
+import {IERC20, IPool, QWAaveV3} from 'contracts/components/QWAaveV3.sol';
+import {IQWComponent} from 'interfaces/IQWComponent.sol';
 
 contract AaveIntegrationV3 is IntegrationBase {
   IPool internal _aavePool = IPool(0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2);
   IERC20 internal _aUsdc = IERC20(0x98C23E9d8f34FEFb1B7BD6a91B7FF122F4e16F5c);
   IRewardsController internal _rewards = IRewardsController(0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb);
-  IQWChild internal _QWAaveV3;
+  IQWComponent internal _QWAaveV3;
 
   function setUp() public virtual override {
     IntegrationBase.setUp();
@@ -20,7 +21,7 @@ contract AaveIntegrationV3 is IntegrationBase {
 
     _QWAaveV3 = new QWAaveV3(address(_qwManager), address(_aavePool), investmentToken, assetToken);
     vm.prank(_owner);
-    _qwRegistry.registerChild(address(_QWAaveV3));
+    _qwRegistry.registerComponent(address(_QWAaveV3));
   }
 
   function test_CreateAaveV3() public {

diff --git a/test/integration/child/QWCompound.t.sol → test/integration/components/QWCompound.t.sol b/test/integration/child/QWCompound.t.sol → test/integration/components/QWCompound.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.23;
 
 import {IntegrationBase} from '../IntegrationBase.t.sol';
-import {IComet, IERC20, IQWChild, QWCompound} from 'contracts/child/QWCompound.sol';
+import {IComet, IERC20, IQWChild, QWCompound} from 'contracts/components/QWCompound.sol';
 import {Test, console2} from 'forge-std/Test.sol';
 
 contract CompoundIntegration is IntegrationBase {

diff --git a/...integration/child/QWUniswapV3Stable.t.sol → ...ration/components/QWUniswapV3Stable.t.sol b/...integration/child/QWUniswapV3Stable.t.sol → ...ration/components/QWUniswapV3Stable.t.sol
@@ -10,7 +10,7 @@ import {
   IQWChild,
   IUniswapV3Pool,
   QWUniswapV3Stable
-} from 'contracts/child/QWUniswapV3Stable.sol';
+} from 'contracts/components/QWUniswapV3Stable.sol';
 
 contract UniswapV3stableIntegration is IntegrationBase {
   IUniswapV3Pool internal _uniswapUSDCUSDTPool = IUniswapV3Pool(0x7858E59e0C01EA06Df3aF3D20aC7B0003275D4Bf);

diff --git a/test/unit/child/QWAaveV3.t.sol b/test/unit/child/QWAaveV3.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: APACHE
 pragma solidity 0.8.23;
 
-import {IERC20, IPool, IQWChild, QWAaveV3} from 'contracts/child/QWAaveV3.sol';
+import {IERC20, IPool, IQWChild, QWAaveV3} from 'contracts/components/QWAaveV3.sol';
 import {Test} from 'forge-std/Test.sol';
-import {MockQWAaveV3} from 'test/smock/child/MockQWAaveV3.sol';
+import {MockQWAaveV3} from 'test/smock/components/MockQWAaveV3.sol';
 
 contract UnitQWAaveV3Test is Test {
   MockQWAaveV3 public mockQWAaveV3;

diff --git a/test/unit/child/QWCompound.t.sol b/test/unit/child/QWCompound.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: APACHE
 pragma solidity 0.8.23;
 
-import {IComet, IERC20, IQWChild, QWCompound} from 'contracts/child/QWCompound.sol';
+import {IComet, IERC20, IQWChild, QWCompound} from 'contracts/components/QWCompound.sol';
 import {Test} from 'forge-std/Test.sol';
-import {MockQWCompound} from 'test/smock/child/MockQWCompound.sol';
+import {MockQWCompound} from 'test/smock/components/MockQWCompound.sol';
 
 contract UnitQWAaveV3Test is Test {
   MockQWCompound public mockQWCompund;