Merge pull request #697 from open-dollar/fix-imports

Fix Imports
open-dollar · May 12, 2024 · 7321f6b · 7321f6b
2 parents b7575ae + 11a7f5a
commit 7321f6b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -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
diff --git a/lib/isolmate b/lib/isolmate
diff --git a/lib/prb-test b/lib/prb-test
diff --git a/remappings.txt b/remappings.txt
@@ -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/

diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -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';
@@ -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 {