Merge remote-tracking branch 'origin/feat/fixed-rate' into feat/fixed…

…-rate
morpho-org · Feb 19, 2024 · bab3be0 · bab3be0
2 parents 7e17db2 + a2b57ce
commit bab3be0
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 21 deletions.
diff --git a/src/AdaptiveCurveIrm.sol → src/adaptive-curve-irm/AdaptiveCurveIrm.sol b/src/AdaptiveCurveIrm.sol → src/adaptive-curve-irm/AdaptiveCurveIrm.sol
@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {IIrm} from "../lib/morpho-blue/src/interfaces/IIrm.sol";
+import {IIrm} from "../../lib/morpho-blue/src/interfaces/IIrm.sol";
 import {IAdaptiveCurveIrm} from "./interfaces/IAdaptiveCurveIrm.sol";
 
 import {UtilsLib} from "./libraries/UtilsLib.sol";
 import {ErrorsLib} from "./libraries/ErrorsLib.sol";
-import {ExpLib} from "./libraries/adaptive-curve/ExpLib.sol";
+import {ExpLib} from "./libraries/ExpLib.sol";
 import {MathLib, WAD_INT as WAD} from "./libraries/MathLib.sol";
-import {ConstantsLib} from "./libraries/adaptive-curve/ConstantsLib.sol";
-import {MarketParamsLib} from "../lib/morpho-blue/src/libraries/MarketParamsLib.sol";
-import {Id, MarketParams, Market} from "../lib/morpho-blue/src/interfaces/IMorpho.sol";
-import {MathLib as MorphoMathLib} from "../lib/morpho-blue/src/libraries/MathLib.sol";
+import {ConstantsLib} from "./libraries/ConstantsLib.sol";
+import {MarketParamsLib} from "../../lib/morpho-blue/src/libraries/MarketParamsLib.sol";
+import {Id, MarketParams, Market} from "../../lib/morpho-blue/src/interfaces/IMorpho.sol";
+import {MathLib as MorphoMathLib} from "../../lib/morpho-blue/src/libraries/MathLib.sol";
 
 /// @title AdaptiveCurveIrm
 /// @author Morpho Labs

diff --git a/src/interfaces/IAdaptiveCurveIrm.sol → ...urve-irm/interfaces/IAdaptiveCurveIrm.sol b/src/interfaces/IAdaptiveCurveIrm.sol → ...urve-irm/interfaces/IAdaptiveCurveIrm.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.5.0;
 
-import {IIrm} from "../../lib/morpho-blue/src/interfaces/IIrm.sol";
-import {Id} from "../../lib/morpho-blue/src/interfaces/IMorpho.sol";
+import {IIrm} from "../../../lib/morpho-blue/src/interfaces/IIrm.sol";
+import {Id} from "../../../lib/morpho-blue/src/interfaces/IMorpho.sol";
 
 /// @title IAdaptiveCurveIrm
 /// @author Morpho Labs

diff --git a/...libraries/adaptive-curve/ConstantsLib.sol → ...tive-curve-irm/libraries/ConstantsLib.sol b/...libraries/adaptive-curve/ConstantsLib.sol → ...tive-curve-irm/libraries/ConstantsLib.sol
diff --git a/src/libraries/ErrorsLib.sol → ...daptive-curve-irm/libraries/ErrorsLib.sol b/src/libraries/ErrorsLib.sol → ...daptive-curve-irm/libraries/ErrorsLib.sol
diff --git a/src/libraries/adaptive-curve/ExpLib.sol → src/adaptive-curve-irm/libraries/ExpLib.sol b/src/libraries/adaptive-curve/ExpLib.sol → src/adaptive-curve-irm/libraries/ExpLib.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {WAD_INT} from "../MathLib.sol";
+import {WAD_INT} from "./MathLib.sol";
 
 /// @title ExpLib
 /// @author Morpho Labs

diff --git a/src/libraries/MathLib.sol → src/adaptive-curve-irm/libraries/MathLib.sol b/src/libraries/MathLib.sol → src/adaptive-curve-irm/libraries/MathLib.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {WAD} from "../../lib/morpho-blue/src/libraries/MathLib.sol";
+import {WAD} from "../../../lib/morpho-blue/src/libraries/MathLib.sol";
 
 int256 constant WAD_INT = int256(WAD);
 

diff --git a/src/libraries/UtilsLib.sol → ...adaptive-curve-irm/libraries/UtilsLib.sol b/src/libraries/UtilsLib.sol → ...adaptive-curve-irm/libraries/UtilsLib.sol
diff --git a/src/FixedRateIrm.sol → src/fixed-rate-irm/FixedRateIrm.sol b/src/FixedRateIrm.sol → src/fixed-rate-irm/FixedRateIrm.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import {IIrm} from "../lib/morpho-blue/src/interfaces/IIrm.sol";
+import {IIrm} from "../../lib/morpho-blue/src/interfaces/IIrm.sol";
 import {IFixedRateIrm} from "./interfaces/IFixedRateIrm.sol";
 
-import {MarketParamsLib} from "../lib/morpho-blue/src/libraries/MarketParamsLib.sol";
-import {Id, MarketParams, Market} from "../lib/morpho-blue/src/interfaces/IMorpho.sol";
+import {MarketParamsLib} from "../../lib/morpho-blue/src/libraries/MarketParamsLib.sol";
+import {Id, MarketParams, Market} from "../../lib/morpho-blue/src/interfaces/IMorpho.sol";
 
 /* ERRORS */
 

diff --git a/src/interfaces/IFixedRateIrm.sol → ...xed-rate-irm/interfaces/IFixedRateIrm.sol b/src/interfaces/IFixedRateIrm.sol → ...xed-rate-irm/interfaces/IFixedRateIrm.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.5.0;
 
-import {IIrm} from "../../lib/morpho-blue/src/interfaces/IIrm.sol";
-import {Id} from "../../lib/morpho-blue/src/interfaces/IMorpho.sol";
+import {IIrm} from "../../../lib/morpho-blue/src/interfaces/IIrm.sol";
+import {Id} from "../../../lib/morpho-blue/src/interfaces/IMorpho.sol";
 
 /// @title IFixedRateIrm
 /// @author Morpho Labs

diff --git a/test/forge/AdaptiveCurveIrmTest.sol b/test/forge/AdaptiveCurveIrmTest.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "../../src/AdaptiveCurveIrm.sol";
+import "../../src/adaptive-curve-irm/AdaptiveCurveIrm.sol";
 
 import "../../lib/forge-std/src/Test.sol";
 

diff --git a/test/forge/ExpLibTest.sol b/test/forge/ExpLibTest.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {MathLib, WAD_INT} from "../../src/libraries/MathLib.sol";
-import {ExpLib} from "../../src/libraries/adaptive-curve/ExpLib.sol";
+import {MathLib, WAD_INT} from "../../src/adaptive-curve-irm/libraries/MathLib.sol";
+import {ExpLib} from "../../src/adaptive-curve-irm/libraries/ExpLib.sol";
 import {wadExp} from "../../lib/solmate/src/utils/SignedWadMath.sol";
-import {ConstantsLib} from "../../src/libraries/adaptive-curve/ConstantsLib.sol";
+import {ConstantsLib} from "../../src/adaptive-curve-irm/libraries/ConstantsLib.sol";
 import {MathLib as MorphoMathLib} from "../../lib/morpho-blue/src/libraries/MathLib.sol";
 
 import "../../lib/forge-std/src/Test.sol";

diff --git a/test/forge/FixedRateIrmTest.sol b/test/forge/FixedRateIrmTest.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "../../src/FixedRateIrm.sol";
+import "../../src/fixed-rate-irm/FixedRateIrm.sol";
 
 import "../../lib/forge-std/src/Test.sol";
 

diff --git a/test/forge/UtilsLibTest.sol b/test/forge/UtilsLibTest.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "../../src/libraries/UtilsLib.sol";
+import "../../src/adaptive-curve-irm/libraries/UtilsLib.sol";
 
 import "../../lib/forge-std/src/Test.sol";