feat: update to forge test

nomad-xyz · Oct 4, 2023 · 0724fc3 · 0724fc3
1 parent ddf202f
commit 0724fc3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "lib/ds-test"]
-	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/foundry.toml b/foundry.toml
@@ -2,4 +2,3 @@
 src = 'src'
 out = 'out'
 libs = ['lib']
-remappings = ['ds-test/=lib/ds-test/src/']
diff --git a/lib/ds-test b/lib/ds-test
diff --git a/src/test/ExcessivelySafeCall.t.sol b/src/test/ExcessivelySafeCall.t.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.7.6;
 
-import "ds-test/test.sol";
+import {Test} from "forge-std/Test.sol";
 import "src/ExcessivelySafeCall.sol";
 
-contract ContractTest is DSTest {
+contract ContractTest is Test {
     using ExcessivelySafeCall for address;
 
     address target;
@@ -180,6 +180,7 @@ contract ContractTest is DSTest {
     }
 
     function test_drain() public {
+        vm.expectRevert();
         intermediary.getDrained{gas: 1_000_000}(target, 10_000);
     }