Skip to content

Commit a4b964c

Browse files
committed
refactor: put oracles in sub folders
1 parent 2c3f9ff commit a4b964c

14 files changed

+22
-17
lines changed

src/ChainlinkOracle.sol renamed to src/morpho-chainlink-v1/ChainlinkOracle.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
pragma solidity 0.8.21;
33

44
import {IChainlinkOracle} from "./interfaces/IChainlinkOracle.sol";
5-
import {IOracle} from "../lib/morpho-blue/src/interfaces/IOracle.sol";
5+
import {IOracle} from "../../lib/morpho-blue/src/interfaces/IOracle.sol";
66

77
import {AggregatorV3Interface, ChainlinkDataFeedLib} from "./libraries/ChainlinkDataFeedLib.sol";
88
import {IERC4626, VaultLib} from "./libraries/VaultLib.sol";
99
import {ErrorsLib} from "./libraries/ErrorsLib.sol";
10-
import {Math} from "../lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
10+
import {Math} from "../../lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
1111

1212
/// @title ChainlinkOracle
1313
/// @author Morpho Labs

src/interfaces/IChainlinkOracle.sol renamed to src/morpho-chainlink-v1/interfaces/IChainlinkOracle.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity >=0.5.0;
33

44
import {IERC4626} from "./IERC4626.sol";
55
import {AggregatorV3Interface} from "./AggregatorV3Interface.sol";
6-
import {IOracle} from "../../lib/morpho-blue/src/interfaces/IOracle.sol";
6+
import {IOracle} from "../../../lib/morpho-blue/src/interfaces/IOracle.sol";
77

88
/// @title IChainlinkOracle
99
/// @author Morpho Labs

src/libraries/ErrorsLib.sol renamed to src/morpho-chainlink-v1/libraries/ErrorsLib.sol

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,4 @@ library ErrorsLib {
1414

1515
/// @notice Thrown when the vault conversion sample is not 1 while vault = address(0).
1616
string constant VAULT_CONVERSION_SAMPLE_IS_NOT_ONE = "vault conversion sample is not one";
17-
18-
/// @notice Thrown when the zero address is passed as argument.
19-
string constant ZERO_ADDRESS = "zero address";
2017
}

src/adapters/WstEthEthExchangeRateChainlinkAdapter.sol renamed to src/wsteth-exchange-rate-adapter/WstEthEthExchangeRateChainlinkAdapter.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity 0.8.21;
33

4-
import {IWstEth} from "../interfaces/IWstEth.sol";
5-
import {MinimalAggregatorV3Interface} from "../interfaces/MinimalAggregatorV3Interface.sol";
4+
import {IWstEth} from "./interfaces/IWstEth.sol";
5+
import {MinimalAggregatorV3Interface} from "./interfaces/MinimalAggregatorV3Interface.sol";
66

7-
import {ErrorsLib} from "../libraries/ErrorsLib.sol";
7+
import {ErrorsLib} from "./libraries/ErrorsLib.sol";
88

99
/// @title WstEthEthExchangeRateChainlinkAdapter
1010
/// @author Morpho Labs

0 commit comments

Comments
 (0)