Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions test/forge/BaseTest.sol → test/BaseTest.sol
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity ^0.8.0;

import "../../lib/forge-std/src/Test.sol";
import "../../lib/forge-std/src/console.sol";
import "../lib/forge-std/src/Test.sol";
import "../lib/forge-std/src/console.sol";

import {IMorpho} from "../../src/interfaces/IMorpho.sol";
import "../../src/interfaces/IMorphoCallbacks.sol";
import {IrmMock} from "../../src/mocks/IrmMock.sol";
import {ERC20Mock} from "../../src/mocks/ERC20Mock.sol";
import {OracleMock} from "../../src/mocks/OracleMock.sol";
import {IMorpho} from "../src/interfaces/IMorpho.sol";
import "../src/interfaces/IMorphoCallbacks.sol";
import {IrmMock} from "../src/mocks/IrmMock.sol";
import {ERC20Mock} from "../src/mocks/ERC20Mock.sol";
import {OracleMock} from "../src/mocks/OracleMock.sol";

import "../../src/Morpho.sol";
import "../src/Morpho.sol";
import {Math} from "./helpers/Math.sol";
import {SigUtils} from "./helpers/SigUtils.sol";
import {ArrayLib} from "./helpers/ArrayLib.sol";
import {MorphoLib} from "../../src/libraries/periphery/MorphoLib.sol";
import {MorphoBalancesLib} from "../../src/libraries/periphery/MorphoBalancesLib.sol";
import {MorphoLib} from "../src/libraries/periphery/MorphoLib.sol";
import {MorphoBalancesLib} from "../src/libraries/periphery/MorphoBalancesLib.sol";

contract BaseTest is Test {
using Math for uint256;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity ^0.8.0;

import "../../lib/forge-std/src/Test.sol";
import "../lib/forge-std/src/Test.sol";

import {MarketParamsLib, MarketParams, Id} from "../../src/libraries/MarketParamsLib.sol";
import {MarketParamsLib, MarketParams, Id} from "../src/libraries/MarketParamsLib.sol";

contract MarketParamsLibTest is Test {
using MarketParamsLib for MarketParams;
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions test/forge/helpers/SigUtils.sol → test/helpers/SigUtils.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity ^0.8.0;

import {AUTHORIZATION_TYPEHASH} from "../../../src/libraries/ConstantsLib.sol";
import {AUTHORIZATION_TYPEHASH} from "../../src/libraries/ConstantsLib.sol";

import {Authorization} from "../../../src/interfaces/IMorpho.sol";
import {Authorization} from "../../src/interfaces/IMorpho.sol";

library SigUtils {
/// @dev Computes the hash of the EIP-712 encoded data.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity ^0.8.0;

import "../../../lib/forge-std/src/Test.sol";
import "../../lib/forge-std/src/Test.sol";

import "../../../src/libraries/MathLib.sol";
import "../../src/libraries/MathLib.sol";
import "../helpers/WadMath.sol";

contract MathLibTest is Test {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity ^0.8.0;

import "../../../lib/forge-std/src/Test.sol";
import "../../lib/forge-std/src/Test.sol";

import "../../../src/libraries/ErrorsLib.sol";
import {IERC20, SafeTransferLib} from "../../../src/libraries/SafeTransferLib.sol";
import "../../src/libraries/ErrorsLib.sol";
import {IERC20, SafeTransferLib} from "../../src/libraries/SafeTransferLib.sol";

/// @dev Token not returning any boolean on transfer and transferFrom.
contract ERC20WithoutBoolean {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity ^0.8.0;

import "../../../lib/forge-std/src/Test.sol";
import "../../lib/forge-std/src/Test.sol";

import "../../../src/libraries/ErrorsLib.sol";
import "../../../src/libraries/UtilsLib.sol";
import "../../src/libraries/ErrorsLib.sol";
import "../../src/libraries/UtilsLib.sol";

contract UtilsLibTest is Test {
using UtilsLib for uint256;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity ^0.8.0;

import {MorphoStorageLib} from "../../../../src/libraries/periphery/MorphoStorageLib.sol";
import {MorphoStorageLib} from "../../../src/libraries/periphery/MorphoStorageLib.sol";
import {SigUtils} from "../../helpers/SigUtils.sol";

import "../../BaseTest.sol";
Expand Down