From 7ae4193d13d7c2e74d08b563d60d646c41f66dc6 Mon Sep 17 00:00:00 2001 From: Rubilmax Date: Mon, 16 Oct 2023 12:25:28 +0200 Subject: [PATCH 1/2] refactor(remappings): remove remappings --- src/ChainlinkOracle.sol | 2 +- test/ChainlinkOracleTest.sol | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ChainlinkOracle.sol b/src/ChainlinkOracle.sol index b82d67e..7ca4f5f 100644 --- 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 index 1a727fa..02d91ee 100644 --- 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)); From 34606b12cf21f971665e9bab283d4b534eaefd70 Mon Sep 17 00:00:00 2001 From: Rubilmax Date: Mon, 16 Oct 2023 14:03:34 +0200 Subject: [PATCH 2/2] build(morpho-blue): update submodule --- lib/morpho-blue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/morpho-blue b/lib/morpho-blue index fa7e34b..82884a6 160000 --- a/lib/morpho-blue +++ b/lib/morpho-blue @@ -1 +1 @@ -Subproject commit fa7e34bbc0d80c24143ceb416d831cc6311859ca +Subproject commit 82884a63c6a108b69f2617dbc01be8d09ba2924d