Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: imports #253

Merged
merged 2 commits into from
Apr 17, 2024
Merged

fix: imports #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59e1649
fix: imports
GuillaumeNervoXS Apr 17, 2024
19544b6
fix: replace imports
GuillaumeNervoXS Apr 17, 2024
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
2 changes: 1 addition & 1 deletion contracts/interfaces/external/morpho/IMorphoChainlinkOracleV2.sol
View file
Open in desktop
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.5.0;

import { IERC4626 } from "contracts/interfaces/external/IERC4626.sol";
import { IERC4626 } from "../IERC4626.sol";
import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";

/// @title IOracle
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/external/morpho/IMorphoChainlinkOracleV2Factory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity >=0.5.0;

import { IMorphoChainlinkOracleV2 } from "./IMorphoChainlinkOracleV2.sol";
import { IERC4626 } from "contracts/interfaces/external/IERC4626.sol";
import { IERC4626 } from "../IERC4626.sol";
import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";

/// @title IMorphoChainlinkOracleV2Factory
Expand Down
2 changes: 1 addition & 1 deletion contracts/oracle/BaseFeedPTPendle.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";

import "contracts/utils/AccessControlManager.sol";
import "../utils/AccessControlManager.sol";
import "./BaseOraclePTPendle.sol";

/// @title BaseFeedPtPendle
Expand Down Expand Up @@ -75,7 +75,7 @@

/// @inheritdoc AggregatorV3Interface
function getRoundData(
uint80 _roundId

Check warning on line 78 in contracts/oracle/BaseFeedPTPendle.sol

View workflow job for this annotation

GitHub Actions / lint 

Variable "_roundId" is unused
)
external
view
Expand Down
2 changes: 1 addition & 1 deletion contracts/oracle/BaseOraclePTPendle.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity ^0.8.12;
import { UNIT, UD60x18, ud } from "prb/math/UD60x18.sol";
import "pendle/interfaces/IPMarket.sol";
import { PendlePtOracleLib } from "pendle/oracles/PendlePtOracleLib.sol";
import "contracts/utils/Errors.sol";
import "../utils/Errors.sol";

/// @title BaseOraclePTPendle
/// @author Angle Labs, Inc.
Expand Down
2 changes: 1 addition & 1 deletion contracts/oracle/morpho/mainnet/MorphoFeedPTweETH.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";

import "contracts/oracle/BaseFeedPTPendle.sol";
import "../../BaseFeedPTPendle.sol";

/// @title MorphoFeedPTweETH
/// @author Angle Labs, Inc.
/// @notice Gives the price of PT-weETH in ETH in base 18
contract MorphoFeedPTweETH is BaseFeedPTPendle {
string public constant description = "PT-weETH/weETH Oracle";

Check warning on line 13 in contracts/oracle/morpho/mainnet/MorphoFeedPTweETH.sol

View workflow job for this annotation

GitHub Actions / lint 

Constant name must be in capitalized SNAKE_CASE

constructor(
IAccessControlManager accessControlManager,
Expand Down
2 changes: 1 addition & 1 deletion contracts/utils/AccessControlManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.19;

import { IAccessControlManager } from "contracts/interfaces/IAccessControlManager.sol";
import { IAccessControlManager } from "../interfaces/IAccessControlManager.sol";

import "./Errors.sol";

Expand Down
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 6 files
+1 −1 package.json
+17 −48 scripts/vm.py
+5 −1 src/StdChains.sol
+34 −9 src/Vm.sol
+2 −2 test/StdUtils.t.sol
+2 −2 test/Vm.t.sol
Loading