chore: move strategies into their own folders

primitivefinance · Dec 15, 2023 · 90b331f · 90b331f
1 parent e3594aa
commit 90b331f
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/contracts/PositionRenderer.sol b/contracts/PositionRenderer.sol
@@ -8,7 +8,7 @@ import "./libraries/StringsLib.sol";
 import "./libraries/AssemblyLib.sol";
 import { PoolIdLib } from "./libraries/PoolLib.sol";
 import "./interfaces/IPortfolio.sol";
-import "./strategies/NormalStrategy.sol";
+import "./strategies/NormalStrategy/NormalStrategy.sol";
 
 /**
  * @title

diff --git a/contracts/strategies/G3MStrategy.sol → ...ts/strategies/G3MStrategy/G3MStrategy.sol b/contracts/strategies/G3MStrategy.sol → ...ts/strategies/G3MStrategy/G3MStrategy.sol
@@ -3,10 +3,10 @@ pragma solidity 0.8.19;
 
 import "./IG3MStrategy.sol";
 import "./G3MStrategyLib.sol";
-import "../interfaces/IPortfolio.sol";
-import "../libraries/SwapLib.sol";
-import "../libraries/AssemblyLib.sol";
-import "../libraries/PoolLib.sol";
+import "../../interfaces/IPortfolio.sol";
+import "../../libraries/SwapLib.sol";
+import "../../libraries/AssemblyLib.sol";
+import "../../libraries/PoolLib.sol";
 
 contract G3MStrategy is IG3MStrategy {
     using AssemblyLib for *;

diff --git a/contracts/strategies/G3MStrategyLib.sol → ...strategies/G3MStrategy/G3MStrategyLib.sol b/contracts/strategies/G3MStrategyLib.sol → ...strategies/G3MStrategy/G3MStrategyLib.sol
diff --git a/contracts/strategies/IG3MStrategy.sol → ...s/strategies/G3MStrategy/IG3MStrategy.sol b/contracts/strategies/IG3MStrategy.sol → ...s/strategies/G3MStrategy/IG3MStrategy.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0;
 
-import "../interfaces/IStrategy.sol";
+import "../../interfaces/IStrategy.sol";
 
 interface IG3MStrategy is IStrategy {
     error NotPortfolio();

diff --git a/contracts/libraries/BisectionLib.sol → ...trategies/NormalStrategy/BisectionLib.sol b/contracts/libraries/BisectionLib.sol → ...trategies/NormalStrategy/BisectionLib.sol
diff --git a/contracts/strategies/INormalStrategy.sol → ...tegies/NormalStrategy/INormalStrategy.sol b/contracts/strategies/INormalStrategy.sol → ...tegies/NormalStrategy/INormalStrategy.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0;
 
-import "../interfaces/IStrategy.sol";
+import "../../interfaces/IStrategy.sol";
 
 /**
  * @title

diff --git a/contracts/strategies/NormalStrategy.sol → ...ategies/NormalStrategy/NormalStrategy.sol b/contracts/strategies/NormalStrategy.sol → ...ategies/NormalStrategy/NormalStrategy.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import "../interfaces/IPortfolio.sol";
-import "../libraries/BisectionLib.sol";
-import "../libraries/PortfolioLib.sol";
+import "../../interfaces/IPortfolio.sol";
+import "../../libraries/PortfolioLib.sol";
+import "./BisectionLib.sol";
 import "./INormalStrategy.sol";
 import "./NormalStrategyLib.sol";
 

diff --git a/contracts/strategies/NormalStrategyLib.sol → ...gies/NormalStrategy/NormalStrategyLib.sol b/contracts/strategies/NormalStrategyLib.sol → ...gies/NormalStrategy/NormalStrategyLib.sol
@@ -4,16 +4,16 @@ pragma solidity ^0.8.18;
 import "solstat/Gaussian.sol";
 import "solmate/utils/FixedPointMathLib.sol";
 import "solmate/utils/SafeCastLib.sol";
-import "../libraries/AssemblyLib.sol";
-import "../libraries/BisectionLib.sol";
-import { PortfolioPool } from "../libraries/PoolLib.sol";
-import { Order } from "../libraries/SwapLib.sol";
+import "../../libraries/AssemblyLib.sol";
+import "./BisectionLib.sol";
+import { PortfolioPool } from "../../libraries/PoolLib.sol";
+import { Order } from "../../libraries/SwapLib.sol";
 import {
     SQRT_WAD,
     SECONDS_PER_YEAR,
     SECONDS_PER_DAY,
     DOUBLE_WAD
-} from "../libraries/ConstantsLib.sol";
+} from "../../libraries/ConstantsLib.sol";
 
 using FixedPointMathLib for uint256;
 using FixedPointMathLib for uint128;

diff --git a/test/Setup.sol b/test/Setup.sol
@@ -25,8 +25,8 @@ import "contracts/test/SimpleRegistry.sol";
 import "contracts/Portfolio.sol";
 
 // Strategy to test
-import "contracts/strategies/NormalStrategy.sol";
-import "contracts/strategies/G3MStrategy.sol";
+import "contracts/strategies/NormalStrategy/NormalStrategy.sol";
+import "contracts/strategies/G3MStrategy/G3MStrategy.sol";
 
 // Contracts in the test environment
 struct SubjectsType {

diff --git a/test/TestBisectionLib.t.sol b/test/TestBisectionLib.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.4;
 
 import "forge-std/Test.sol";
-import "contracts/libraries/BisectionLib.sol" as BisectionLib;
+import "contracts/strategies/NormalStrategy/BisectionLib.sol" as BisectionLib;
 
 contract TestBisectionLib is Test {
     function simplePolynomial(

diff --git a/test/TestPortfolioBalanceOf.t.sol b/test/TestPortfolioBalanceOf.t.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.4;
 import "solmate/tokens/ERC1155.sol";
 import "../contracts/libraries/AssemblyLib.sol";
 import "./Setup.sol";
-import "../contracts/strategies/NormalStrategy.sol";
+import "../contracts/strategies/NormalStrategy/NormalStrategy.sol";
 
 contract TestPortfolioBalanceOf is Setup {
     function test_balanceOf_allocating_increases_balance()

diff --git a/test/TestPositionRendererUri.t.sol b/test/TestPositionRendererUri.t.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.4;
 import "solmate/tokens/ERC1155.sol";
 import "../contracts/libraries/AssemblyLib.sol";
 import "./Setup.sol";
-import "../contracts/strategies/NormalStrategy.sol";
+import "../contracts/strategies/NormalStrategy/NormalStrategy.sol";
 
 contract TestPositionRendererUri is Setup {
     struct MetaContext {

diff --git a/test/strategies/NormalStrategy/NormalConfiguration.sol b/test/strategies/NormalStrategy/NormalConfiguration.sol
@@ -16,7 +16,7 @@ using AssemblyLib for uint128;
 using AssemblyLib for uint32;
 
 // Strategy contract
-import "contracts/strategies/NormalStrategyLib.sol";
+import "contracts/strategies/NormalStrategy/NormalStrategyLib.sol";
 
 uint256 constant NormalConfiguration_DEFAULT_PRICE = 1 ether;
 uint256 constant NormalConfiguration_DEFAULT_STRIKE_WAD = 1 ether;

diff --git a/test/utils/GhostType.sol b/test/utils/GhostType.sol
@@ -6,7 +6,7 @@ import "contracts/interfaces/IStrategy.sol";
 import "contracts/interfaces/IPortfolio.sol";
 import "contracts/libraries/PortfolioLib.sol";
 import "solmate/test/utils/mocks/MockERC20.sol";
-import "contracts/strategies/NormalStrategyLib.sol";
+import "contracts/strategies/NormalStrategy/NormalStrategyLib.sol";
 import "contracts/Portfolio.sol";
 
 import { Coin } from "./CoinType.sol";