test: modernize test dependancies

Author: MathisGD

test-foundry/TestCommonHeapOrdering.t.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 import "forge-std/Test.sol";
-import "forge-std/Vm.sol";
 import "forge-std/console.sol";
 
 import "@contracts/HeapOrdering.sol";
@@ -11,8 +10,6 @@ import "./helpers/IConcreteHeapOrdering.sol";
 abstract contract TestCommonHeapOrdering is Test {
     IConcreteHeapOrdering internal heap;
 
-    Vm public hevm = Vm(HEVM_ADDRESS);
-
     address[] public accounts;
     uint256 public NB_ACCOUNTS = 50;
     uint256 public MAX_SORTED_USERS = 50;
@@ -65,7 +62,7 @@ abstract contract TestCommonHeapOrdering is Test {
     }
 
     function testShouldNotInsertZeroAddress() public {
-        hevm.expectRevert(abi.encodeWithSignature("AddressIsZero()"));
+        vm.expectRevert(abi.encodeWithSignature("AddressIsZero()"));
         update(address(0), 0, 10);
     }
 
@@ -340,12 +337,12 @@ abstract contract TestCommonHeapOrdering is Test {
     }
 
     function testOverflowNewValue() public {
-        hevm.expectRevert("SafeCast: value doesn't fit in 96 bits");
+        vm.expectRevert("SafeCast: value doesn't fit in 96 bits");
         update(accounts[0], 0, uint256(type(uint128).max));
     }
 
     function testOverflowFormerValue() public {
-        hevm.expectRevert("SafeCast: value doesn't fit in 96 bits");
+        vm.expectRevert("SafeCast: value doesn't fit in 96 bits");
         update(accounts[0], uint256(type(uint128).max), 0);
     }
 }

test-foundry/TestDoubleLinkedList.t.sol

@@ -7,8 +7,6 @@ import "@contracts/DoubleLinkedList.sol";
 contract TestDoubleLinkedList is Test {
     using DoubleLinkedList for DoubleLinkedList.List;
 
-    Vm public hevm = Vm(HEVM_ADDRESS);
-
     uint256 public NDS = 50;
     address[] public accounts;
     address public ADDR_ZERO = address(0);
@@ -34,23 +32,23 @@ contract TestDoubleLinkedList is Test {
     }
 
     function testShouldNotInsertAccountWithZeroValue() public {
-        hevm.expectRevert(abi.encodeWithSignature("ValueIsZero()"));
+        vm.expectRevert(abi.encodeWithSignature("ValueIsZero()"));
         list.insertSorted(accounts[0], 0, NDS);
     }
 
     function testShouldNotInsertZeroAddress() public {
-        hevm.expectRevert(abi.encodeWithSignature("AddressIsZero()"));
+        vm.expectRevert(abi.encodeWithSignature("AddressIsZero()"));
         list.insertSorted(address(0), 10, NDS);
     }
 
     function testShouldNotRemoveAccountThatDoesNotExist() public {
-        hevm.expectRevert(abi.encodeWithSignature("AccountDoesNotExist()"));
+        vm.expectRevert(abi.encodeWithSignature("AccountDoesNotExist()"));
         list.remove(accounts[0]);
     }
 
     function testShouldInsertSeveralTimesTheSameAccount() public {
         list.insertSorted(accounts[0], 1, NDS);
-        hevm.expectRevert(abi.encodeWithSignature("AccountAlreadyInserted()"));
+        vm.expectRevert(abi.encodeWithSignature("AccountAlreadyInserted()"));
         list.insertSorted(accounts[0], 2, NDS);
     }
 

test-foundry/TestHeap.t.sol

@@ -1,16 +1,13 @@
 // SPDX-License-Identifier: GNU AGPLv3
 pragma solidity ^0.8.0;
 
-import "ds-test/test.sol";
-import "forge-std/Vm.sol";
+import "forge-std/Test.sol";
 
 import "@contracts/Heap.sol";
 
-contract TestHeap is DSTest {
+contract TestHeap is Test {
     using BasicHeap for BasicHeap.Heap;
 
-    Vm public hevm = Vm(HEVM_ADDRESS);
-
     uint256 public TESTED_SIZE = 50;
     address[] public accounts;
     address public ADDR_ZERO = address(0);
@@ -36,25 +33,25 @@ contract TestHeap is DSTest {
     }
 
     function testShouldNotInsertAccountWithZeroValue() public {
-        hevm.expectRevert(abi.encodeWithSignature("WrongValue()"));
+        vm.expectRevert(abi.encodeWithSignature("WrongValue()"));
         heap.insert(accounts[0], 0);
 
         assertEq(heap.getSize(), 0);
     }
 
     function testShouldNotInsertZeroAddress() public {
-        hevm.expectRevert(abi.encodeWithSignature("AddressIsZero()"));
+        vm.expectRevert(abi.encodeWithSignature("AddressIsZero()"));
         heap.insert(address(0), 10);
     }
 
     function testShouldInsertSeveralTimesTheSameAccount() public {
         heap.insert(accounts[0], 1);
-        hevm.expectRevert(abi.encodeWithSignature("AccountAlreadyInserted()"));
+        vm.expectRevert(abi.encodeWithSignature("AccountAlreadyInserted()"));
         heap.insert(accounts[0], 2);
     }
 
     function testShouldNotRemoveAccountThatDoesNotExist() public {
-        hevm.expectRevert(abi.encodeWithSignature("AccountDoesNotExist()"));
+        vm.expectRevert(abi.encodeWithSignature("AccountDoesNotExist()"));
         heap.remove(accounts[0]);
     }
 

test-foundry/TestHeapOrdering.t.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GNU AGPLv3
 pragma solidity ^0.8.0;
 
-import "ds-test/test.sol";
-import "forge-std/Vm.sol";
 import "forge-std/console.sol";
 
 import "./TestCommonHeapOrdering.t.sol";

test-foundry/TestInvariantHeapOrdering.t.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: GNU AGPLv3
 pragma solidity ^0.8.0;
 
-import "ds-test/test.sol";
-import "forge-std/Vm.sol";
+import "forge-std/Test.sol";
 import "forge-std/console.sol";
 
 import "./helpers/ConcreteHeapOrdering.sol";
@@ -21,7 +20,7 @@ contract Heap is ConcreteHeapOrdering {
     }
 }
 
-contract TestHeapInvariant is DSTest {
+contract TestHeapInvariant is Test {
     Heap public heap;
 
     function setUp() public {

test-foundry/TestInvariantThreeHeapOrdering.t.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: GNU AGPLv3
 pragma solidity ^0.8.0;
 
-import "ds-test/test.sol";
-import "forge-std/Vm.sol";
+import "forge-std/Test.sol";
 import "forge-std/console.sol";
 
 import "./helpers/ConcreteThreeHeapOrdering.sol";
@@ -21,7 +20,7 @@ contract Heap is ConcreteThreeHeapOrdering {
     }
 }
 
-contract TestHeapInvariant is DSTest {
+contract TestHeapInvariant is Test {
     Heap public heap;
 
     function setUp() public {

test-foundry/TestStressHeap.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GNU AGPLv3
 pragma solidity ^0.8.0;
 
-import "ds-test/test.sol";
+import "forge-std/Test.sol";
 
 import "@contracts/Heap.sol";