chore: submodules

morpho-org · Oct 4, 2023 · ca38c55 · ca38c55
1 parent b1bd24d
commit ca38c55
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/chainlink"]
-	path = lib/chainlink
-	url = https://github.com/smartcontractkit/chainlink
 [submodule "lib/morpho-blue"]
 	path = lib/morpho-blue
 	url = https://github.com/morpho-labs/morpho-blue
diff --git a/lib/chainlink b/lib/chainlink
diff --git a/lib/morpho-blue b/lib/morpho-blue
diff --git a/src/chainlink/interfaces/AggregatorV3Interface.sol b/src/chainlink/interfaces/AggregatorV3Interface.sol
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+/// @dev From
+/// https://github.com/smartcontractkit/chainlink/blob/develop/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol.
+interface AggregatorV3Interface {
+    function decimals() external view returns (uint8);
+
+    function description() external view returns (string memory);
+
+    function version() external view returns (uint256);
+
+    function getRoundData(uint80 _roundId)
+        external
+        view
+        returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound);
+
+    function latestRoundData()
+        external
+        view
+        returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound);
+}
diff --git a/src/chainlink/libraries/DataFeedLib.sol b/src/chainlink/libraries/DataFeedLib.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {ErrorsLib} from "./ErrorsLib.sol";
-import {AggregatorV3Interface} from "chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
+import {AggregatorV3Interface} from "../interfaces/AggregatorV3Interface.sol";
 
 library DataFeedLib {
     /// @dev Performing some security checks and returns the latest price of a feed.

diff --git a/test/chainlink/OracleTwoFeedsTest.sol b/test/chainlink/OracleTwoFeedsTest.sol
@@ -68,7 +68,7 @@ contract OracleTwoFeedsTest is Test {
     }
 
     function testNegativeAnswer(int256 price) public {
-        vm.assume(price < 0);
+        price = bound(price, type(int256).min, -1);
         FakeAggregator aggregator = new FakeAggregator();
         OracleTwoFeeds oracle =
             new OracleTwoFeeds(AggregatorV3Interface(address(aggregator)), AggregatorV3Interface(address(0)), 18, 0);