morpho-org · MathisGD · Aug 2, 2023 · Aug 2, 2023
diff --git a/src/Blue.sol b/src/Blue.sol
@@ -7,15 +7,15 @@ import {
     IBlueSupplyCallback,
     IBlueSupplyCollateralCallback
 } from "./interfaces/IBlueCallbacks.sol";
-import {IBlue} from "./interfaces/IBlue.sol";
+import {Id, Market, Signature, IBlue} from "./interfaces/IBlue.sol";
 import {IIrm} from "./interfaces/IIrm.sol";
 import {IERC20} from "./interfaces/IERC20.sol";
 import {IFlashBorrower} from "./interfaces/IFlashBorrower.sol";
 
 import {Errors} from "./libraries/Errors.sol";
 import {SharesMath} from "./libraries/SharesMath.sol";
 import {FixedPointMathLib} from "./libraries/FixedPointMathLib.sol";
-import {Id, Market, MarketLib} from "./libraries/MarketLib.sol";
+import {MarketLib} from "./libraries/MarketLib.sol";
 import {SafeTransferLib} from "./libraries/SafeTransferLib.sol";
 
 uint256 constant MAX_FEE = 0.25e18;

diff --git a/src/interfaces/IBlue.sol b/src/interfaces/IBlue.sol
@@ -2,19 +2,29 @@
 pragma solidity >=0.5.0;
 
 import {IIrm} from "./IIrm.sol";
+import {IOracle} from "./IOracle.sol";
 import {IFlashLender} from "./IFlashLender.sol";
 import {IFlashBorrower} from "./IFlashBorrower.sol";
 
-import {Id, Market} from "../libraries/MarketLib.sol";
+type Id is bytes32;
 
-interface IBlue is IFlashLender {
-    /// @notice Contains the `v`, `r` and `s` parameters of an ECDSA signature.
-    struct Signature {
-        uint8 v;
-        bytes32 r;
-        bytes32 s;
-    }
+struct Market {
+    address borrowableAsset;
+    address collateralAsset;
+    IOracle borrowableOracle;
+    IOracle collateralOracle;
+    IIrm irm;
+    uint256 lltv;
+}
 
+/// @notice Contains the `v`, `r` and `s` parameters of an ECDSA signature.
+struct Signature {
+    uint8 v;
+    bytes32 r;
+    bytes32 s;
+}
+
+interface IBlue is IFlashLender {
     function DOMAIN_SEPARATOR() external view returns (bytes32);
 
     function owner() external view returns (address);

diff --git a/src/interfaces/IIrm.sol b/src/interfaces/IIrm.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.5.0;
 
-import {Market} from "../libraries/MarketLib.sol";
+import {Market} from "../interfaces/IBlue.sol";
 
 interface IIrm {
     function borrowRate(Market memory market) external returns (uint256);

diff --git a/src/libraries/MarketLib.sol b/src/libraries/MarketLib.sol
@@ -1,19 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.0;
 
-import {IIrm} from "../interfaces/IIrm.sol";
-import {IOracle} from "../interfaces/IOracle.sol";
-
-type Id is bytes32;
-
-struct Market {
-    address borrowableAsset;
-    address collateralAsset;
-    IOracle borrowableOracle;
-    IOracle collateralOracle;
-    IIrm irm;
-    uint256 lltv;
-}
+import {Id, Market, IBlue} from "../interfaces/IBlue.sol";
 
 library MarketLib {
     function id(Market memory market) internal pure returns (Id) {

diff --git a/src/mocks/IrmMock.sol b/src/mocks/IrmMock.sol
@@ -2,10 +2,10 @@
 pragma solidity ^0.8.0;
    <
8000
span class='blob-code-inner blob-code-marker ' data-code-marker=" ">
 import {IIrm} from "../interfaces/IIrm.sol";
-import {IBlue} from "../interfaces/IBlue.sol";
+import {Id, Market, IBlue} from "../interfaces/IBlue.sol";
 
 import {FixedPointMathLib} from "../libraries/FixedPointMathLib.sol";
-import {Id, Market, MarketLib} from "../libraries/MarketLib.sol";
+import {MarketLib} from "../libraries/MarketLib.sol";
 
 contract IrmMock is IIrm {
     using FixedPointMathLib for uint256;

diff --git a/test/forge/Blue.t.sol b/test/forge/Blue.t.sol
@@ -718,7 +718,7 @@ contract BlueTest is
 
         bytes32 digest = SigUtils.getTypedDataHash(blue.DOMAIN_SEPARATOR(), authorization);
 
-        IBlue.Signature memory sig;
+        Signature memory sig;
         (sig.v, sig.r, sig.s) = vm.sign(privateKey, digest);
 
         blue.setAuthorization(