Skip to content

Commit 5c2bcdc

Browse files
MathisGDMathisGD
committed
wierd
1 parent 22c57db commit 5c2bcdc

11 files changed

Lines changed: 38 additions & 38 deletions

‎test/ERC4626Test.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity ^0.8.0;
33

4-
import {IERC20Errors} from "../../lib/openzeppelin-contracts/contracts/interfaces/draft-IERC6093.sol";
5-
import {IMorphoFlashLoanCallback} from "../../lib/morpho-blue/src/interfaces/IMorphoCallbacks.sol";
4+
import {IERC20Errors} from "../lib/openzeppelin-contracts/contracts/interfaces/draft-IERC6093.sol";
5+
import {IMorphoFlashLoanCallback} from "../lib/morpho-blue/src/interfaces/IMorphoCallbacks.sol";
66

77
import "./helpers/IntegrationTest.sol";
88

‎test/MarketTest.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity ^0.8.0;
33

4-
import {stdError} from "../../lib/forge-std/src/StdError.sol";
4+
import {stdError} from "../lib/forge-std/src/StdError.sol";
55

6-
import {SafeCast} from "../../lib/openzeppelin-contracts/contracts/utils/math/SafeCast.sol";
6+
import {SafeCast} from "../lib/openzeppelin-contracts/contracts/utils/math/SafeCast.sol";
77
import "./helpers/IntegrationTest.sol";
88

99
contract MarketTest is IntegrationTest {

‎test/MetaMorphoFactoryTest.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
import "./helpers/IntegrationTest.sol";
55

6-
import "../../src/MetaMorphoFactory.sol";
6+
import "../src/MetaMorphoFactory.sol";
77

88
contract MetaMorphoFactoryTest is IntegrationTest {
99
MetaMorphoFactory factory;

‎test/MetaMorphoInternalTest.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity ^0.8.0;
33

4-
import {UtilsLib} from "../../lib/morpho-blue/src/libraries/UtilsLib.sol";
5-
import {SharesMathLib} from "../../lib/morpho-blue/src/libraries/SharesMathLib.sol";
4+
import {UtilsLib} from "../lib/morpho-blue/src/libraries/UtilsLib.sol";
5+
import {SharesMathLib} from "../lib/morpho-blue/src/libraries/SharesMathLib.sol";
66

77
import "./helpers/BaseTest.sol";
8-
import {MetaMorphoMock} from "../../src/mocks/MetaMorphoMock.sol";
8+
import {MetaMorphoMock} from "../src/mocks/MetaMorphoMock.sol";
99

1010
contract MetaMorphoInternalTest is BaseTest {
1111
using MathLib for uint256;

‎test/PermitTest.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
33

44
import "./helpers/SigUtils.sol";
55

6-
import {ERC20Permit} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Permit.sol";
7-
import {IERC20Errors} from "../../lib/openzeppelin-contracts/contracts/interfaces/draft-IERC6093.sol";
6+
import {ERC20Permit} from "../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Permit.sol";
7+
import {IERC20Errors} from "../lib/openzeppelin-contracts/contracts/interfaces/draft-IERC6093.sol";
88
import "./helpers/IntegrationTest.sol";
99

1010
contract PermitTest is IntegrationTest {

‎test/ReallocateIdleTest.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity ^0.8.0;
33

4-
import {SharesMathLib} from "../../lib/morpho-blue/src/libraries/SharesMathLib.sol";
4+
import {SharesMathLib} from "../lib/morpho-blue/src/libraries/SharesMathLib.sol";
55

66
import "./helpers/IntegrationTest.sol";
77

‎test/ReallocateWithdrawTest.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity ^0.8.0;
33

4-
import {UtilsLib} from "../../lib/morpho-blue/src/libraries/UtilsLib.sol";
5-
import {SharesMathLib} from "../../lib/morpho-blue/src/libraries/SharesMathLib.sol";
4+
import {UtilsLib} from "../lib/morpho-blue/src/libraries/UtilsLib.sol";
5+
import {SharesMathLib} from "../lib/morpho-blue/src/libraries/SharesMathLib.sol";
66

77
import "./helpers/IntegrationTest.sol";
88

‎test/ReentrancyTest.sol‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity ^0.8.0;
33

4-
import {IMetaMorpho} from "../../src/interfaces/IMetaMorpho.sol";
4+
import {IMetaMorpho} from "../src/interfaces/IMetaMorpho.sol";
55

6-
import {ERC1820Registry} from "../../src/mocks/ERC1820Registry.sol";
7-
import {ERC777Mock, IERC1820Registry} from "../../src/mocks/ERC777Mock.sol";
8-
import {IERC1820Implementer} from "../../lib/openzeppelin-contracts/contracts/interfaces/IERC1820Implementer.sol";
6+
import {ERC1820Registry} from "../src/mocks/ERC1820Registry.sol";
7+
import {ERC777Mock, IERC1820Registry} from "../src/mocks/ERC777Mock.sol";
8+
import {IERC1820Implementer} from "../lib/openzeppelin-contracts/contracts/interfaces/IERC1820Implementer.sol";
99

10-
import "../../src/MetaMorphoFactory.sol";
10+
import "../src/MetaMorphoFactory.sol";
1111
import "./helpers/IntegrationTest.sol";
1212

1313
uint256 constant FEE = 0.1 ether; // 50%

‎test/UrdTest.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity ^0.8.0;
33

4-
import {UtilsLib} from "../../lib/morpho-blue/src/libraries/UtilsLib.sol";
4+
import {UtilsLib} from "../lib/morpho-blue/src/libraries/UtilsLib.sol";
55

66
import "./helpers/IntegrationTest.sol";
77

‎test/helpers/BaseTest.sol‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity ^0.8.0;
33

4-
import "../../../lib/morpho-blue/src/interfaces/IMorpho.sol";
4+
import "../../lib/morpho-blue/src/interfaces/IMorpho.sol";
55

6-
import {WAD, MathLib} from "../../../lib/morpho-blue/src/libraries/MathLib.sol";
7-
import {Math} from "../../../lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
8-
import {MarketParamsLib} from "../../../lib/morpho-blue/src/libraries/MarketParamsLib.sol";
9-
import {MorphoLib} from "../../../lib/morpho-blue/src/libraries/periphery/MorphoLib.sol";
10-
import {MorphoBalancesLib} from "../../../lib/morpho-blue/src/libraries/periphery/MorphoBalancesLib.sol";
6+
import {WAD, MathLib} from "../../lib/morpho-blue/src/libraries/MathLib.sol";
7+
import {Math} from "../../lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
8+
import {MarketParamsLib} from "../../lib/morpho-blue/src/libraries/MarketParamsLib.sol";
9+
import {MorphoLib} from "../../lib/morpho-blue/src/libraries/periphery/MorphoLib.sol";
10+
import {MorphoBalancesLib} from "../../lib/morpho-blue/src/libraries/periphery/MorphoBalancesLib.sol";
1111

12-
import "../../../src/interfaces/IMetaMorpho.sol";
12+
import "../../src/interfaces/IMetaMorpho.sol";
1313

14-
import "../../../src/libraries/ConstantsLib.sol";
15-
import {ErrorsLib} from "../../../src/libraries/ErrorsLib.sol";
16-
import {EventsLib} from "../../../src/libraries/EventsLib.sol";
17-
import {ORACLE_PRICE_SCALE} from "../../../lib/morpho-blue/src/libraries/ConstantsLib.sol";
14+
import "../../src/libraries/ConstantsLib.sol";
15+
import {ErrorsLib} from "../../src/libraries/ErrorsLib.sol";
16+
import {EventsLib} from "../../src/libraries/EventsLib.sol";
17+
import {ORACLE_PRICE_SCALE} from "../../lib/morpho-blue/src/libraries/ConstantsLib.sol";
1818

19-
import {IrmMock} from "../../../src/mocks/IrmMock.sol";
20-
import {ERC20Mock} from "../../../src/mocks/ERC20Mock.sol";
21-
import {OracleMock} from "../../../src/mocks/OracleMock.sol";
19+
import {IrmMock} from "../../src/mocks/IrmMock.sol";
20+
import {ERC20Mock} from "../../src/mocks/ERC20Mock.sol";
21+
import {OracleMock} from "../../src/mocks/OracleMock.sol";
2222

23-
import {Ownable} from "../../../lib/openzeppelin-contracts/contracts/access/Ownable.sol";
23+
import {Ownable} from "../../lib/openzeppelin-contracts/contracts/access/Ownable.sol";
2424

25-
import {IERC20, ERC20} from "../../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC4626.sol";
25+
import {IERC20, ERC20} from "../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC4626.sol";
2626

27-
import "../../../lib/forge-std/src/Test.sol";
28-
import "../../../lib/forge-std/src/console2.sol";
27+
import "../../lib/forge-std/src/Test.sol";
28+
import "../../lib/forge-std/src/console2.sol";
2929

3030
uint256 constant BLOCK_TIME = 1;
3131
uint256 constant MIN_TEST_ASSETS = 1e8;

0 commit comments

Comments
 (0)