Merge pull request #29 from morpho-labs/refactor/remappings

refactor(remappings): remove remappings
morpho-org · Oct 16, 2023 · 081af65 · 081af65
2 parents 62556bc + 34606b1
commit 081af65
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/morpho-blue b/lib/morpho-blue
diff --git a/src/ChainlinkOracle.sol b/src/ChainlinkOracle.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity 0.8.19;
 
-import {IOracle} from "morpho-blue/interfaces/IOracle.sol";
+import {IOracle} from "../lib/morpho-blue/src/interfaces/IOracle.sol";
 
 import {AggregatorV3Interface, ChainlinkDataFeedLib} from "./libraries/ChainlinkDataFeedLib.sol";
 import {IERC4626, VaultLib} from "./libraries/VaultLib.sol";

diff --git a/test/ChainlinkOracleTest.sol b/test/ChainlinkOracleTest.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import "forge-std/Test.sol";
-import "src/ChainlinkOracle.sol";
-import "src/libraries/ErrorsLib.sol";
+import "../lib/forge-std/src/Test.sol";
+import "../src/ChainlinkOracle.sol";
+import "../src/libraries/ErrorsLib.sol";
 import "./mocks/ChainlinkAggregatorMock.sol";
 
 AggregatorV3Interface constant feedZero = AggregatorV3Interface(address(0));
+36 −8		README.md
+ −		morpho-blue-whitepaper.pdf
+0 −1		remappings.txt
+1 −1		src/Morpho.sol
+1 −1		src/interfaces/IIrm.sol
+1 −1		src/interfaces/IMorpho.sol
+26 −30		test/forge/BaseTest.sol
+8 −8		test/forge/InvariantTest.sol
+2 −2		test/forge/MarketParamsLibTest.sol
+2 −2		test/forge/helpers/SigUtils.sol
+1 −2		test/forge/integration/BorrowIntegrationTest.sol
+3 −2		test/forge/integration/LiquidateIntegrationTest.sol
+0 −1		test/forge/integration/RepayIntegrationTest.sol
+1 −1		test/forge/invariant/MorphoInvariantTest.sol
+3 −3		test/forge/libraries/MathLibTest.sol
+3 −3		test/forge/libraries/SafeTransferLibTest.sol
+3 −3		test/forge/libraries/UtilsLibTest.sol
+1 −1		test/forge/libraries/periphery/MorphoLibTest.sol
+2 −3		test/forge/libraries/periphery/MorphoStorageLibTest.sol