Skip to content

Commit

Permalink
Use absolute imports (#74)
Browse files Browse the repository at this point in the history
* add absolute imports

* fix reformatting

* remove remappings.txt
  • Loading branch information
mshrieve authored Aug 25, 2023
1 parent dce216a commit 10dd882
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 11 deletions.
4 changes: 0 additions & 4 deletions remappings.txt

This file was deleted.

2 changes: 1 addition & 1 deletion src/UmaCtfAdapter.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;

import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol";
import { IERC20 } from "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";

import { Auth } from "./mixins/Auth.sol";
import { BulletinBoard } from "./mixins/BulletinBoard.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/IConditionalTokens.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;

import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol";
import { IERC20 } from "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";

interface IConditionalTokens {
/// Mapping key is an condition ID. Value represents numerators of the payout vector associated with the condition. This array is initialized with a length equal to the outcome slot count. E.g. Condition with 3 outcomes [A, B, C] and two of those correct [0.5, 0.5, 0]. In Ethereum there are no decimal values, so here, 0.5 is represented by fractions like 1/2 == 0.5. That's why we need numerator and denominator values. Payout numerators are also used as a check of initialization. If the numerators array is empty (has length zero), the condition was not created/prepared. See getOutcomeSlotCount.
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/IOptimisticOracleV2.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;

import "openzeppelin-contracts/token/ERC20/IERC20.sol";
import "lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";

struct RequestSettings {
bool eventBased; // True if the request is set to be event-based.
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/TransferHelper.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;

import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";
import { SafeTransferLib, ERC20 } from "lib/solmate/src/utils/SafeTransferLib.sol";

/// @title TransferHelper
/// @notice Helper library to transfer tokens
Expand Down
2 changes: 1 addition & 1 deletion src/test/dev/AdapterHelper.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;

import { ERC20 } from "openzeppelin-contracts/token/ERC20/ERC20.sol";
import { ERC20 } from "lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";

import { Deployer } from "./Deployer.sol";
import { TestHelper } from "./TestHelper.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/test/dev/MintableERC20.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;

import { ERC20 } from "openzeppelin-contracts/token/ERC20/ERC20.sol";
import { ERC20 } from "lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";

contract MintableERC20 is ERC20 {
constructor(string memory name, string memory symbol) ERC20(name, symbol) { }
Expand Down
2 changes: 1 addition & 1 deletion src/test/dev/TestHelper.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity 0.8.15;

import { Test, console2 as console, stdStorage, StdStorage, stdError } from "forge-std/Test.sol";
import { ERC20 } from "openzeppelin-contracts/token/ERC20/ERC20.sol";
import { ERC20 } from "lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";

abstract contract TestHelper is Test {
mapping(address => mapping(address => uint256)) private balanceCheckpoints;
Expand Down

0 comments on commit 10dd882

Please sign in to comment.