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 #697

Merged
merged 3 commits into from
May 12, 2024
Merged

Fix Imports #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
853efb8
cleantree
daopunk May 11, 2024
7aac224
forge install: ds-test
daopunk May 11, 2024
11a7f5a
Merge branch 'dev' into fix-imports
pi0neerpat May 11, 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
11 changes: 2 additions & 9 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
[submodule "lib/ds-test"]
path = lib/ds-test
url = https://github.com/dapphub/ds-test
[submodule "lib/isolmate"]
path = lib/isolmate
url = https://github.com/defi-wonderland/isolmate
[submodule "lib/prb-test"]
path = lib/prb-test
url = https://github.com/paulrberg/prb-test
branch = 0.5.5
path = lib/ds-test
url = https://github.com/dapphub/ds-test
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
1 change: 0 additions & 1 deletion lib/isolmate
Open in desktop
Submodule isolmate deleted from 59e180
1 change: 0 additions & 1 deletion lib/prb-test
Open in desktop
Submodule prb-test deleted from 94b5ef
1 change: 0 additions & 1 deletion remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@openzeppelin/=node_modules/@openzeppelin/contracts/
@openzeppelin-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/

@isolmate/=lib/isolmate/src/
@console2/=forge-std/console2.sol;

@contracts/=src/contracts/
Expand Down
3 changes: 0 additions & 3 deletions script/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import '@script/Registry.s.sol';
import '@script/Params.s.sol';
import 'forge-std/console2.sol';
import {Script, VmSafe} from 'forge-std/Script.sol';
import {FixedPointMathLib} from '@isolmate/utils/FixedPointMathLib.sol';
import {IERC20Metadata} from '@openzeppelin/token/ERC20/extensions/IERC20Metadata.sol';
import {Common} from '@script/Common.s.sol';
import {SepoliaParams} from '@script/SepoliaParams.s.sol';
Expand Down Expand Up @@ -170,8 +169,6 @@ contract DeployMainnet is MainnetParams, Deploy {
}

contract DeploySepolia is SepoliaParams, Deploy {
using FixedPointMathLib for uint256;

IBaseOracle public chainlinkEthUSDPriceFeed;

function setUp() public virtual {
Expand Down
Loading