chore: bump forge-std and remove ds-test dependency (#227)

stevennevins · web-flow · commit f224cf971eaf · 2024-04-12T20:11:28.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -5,9 +5,6 @@
 	path = lib/eigenlayer-contracts
 	url = https://github.com/Layr-labs/eigenlayer-contracts
 	branch = dev
-[submodule "lib/ds-test"]
-	path = lib/ds-test
-	url = https://github.com/dapphub/ds-test
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/Openzeppelin/openzeppelin-contracts
diff --git a/lib/ds-test b/lib/ds-test
diff --git a/lib/forge-std b/lib/forge-std
@@ -1 +1 @@
-Subproject commit f73c73d2018eb6a111f35e4dae7b4f27401e9421
+Subproject commit bb4ceea94d6f10eeb5b41dc2391c6c8bf8e734ef
diff --git a/test/ffi/BLSPubKeyCompendiumFFI.t.sol b/test/ffi/BLSPubKeyCompendiumFFI.t.sol
@@ -9,7 +9,7 @@ contract BLSApkRegistryFFITests is G2Operations {
     using BN254 for BN254.G1Point;
     using Strings for uint256;
 
-    Vm cheats = Vm(HEVM_ADDRESS);
+    Vm cheats = Vm(VM_ADDRESS);
 
     BLSApkRegistry blsApkRegistry;
     IRegistryCoordinator registryCoordinator;
diff --git a/test/integration/IntegrationDeployer.t.sol b/test/integration/IntegrationDeployer.t.sol
@@ -45,7 +45,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
 
     using Strings for *;
 
-    Vm cheats = Vm(HEVM_ADDRESS);
+    Vm cheats = Vm(VM_ADDRESS);
 
     // Core contracts to deploy
     DelegationManager delegationManager;
diff --git a/test/integration/TimeMachine.t.sol b/test/integration/TimeMachine.t.sol
@@ -5,7 +5,7 @@ import "forge-std/Test.sol";
 
 contract TimeMachine is Test {
 
-    Vm cheats = Vm(HEVM_ADDRESS);
+    Vm cheats = Vm(VM_ADDRESS);
 
     bool pastExists = false;
     uint lastSnapshot;
diff --git a/test/integration/User.t.sol b/test/integration/User.t.sol
@@ -43,7 +43,7 @@ contract User is Test {
     using BitmapStrings for *;
     using BitmapUtils for *;
 
-    Vm cheats = Vm(HEVM_ADDRESS);
+    Vm cheats = Vm(VM_ADDRESS);
 
     // Core contracts
     DelegationManager delegationManager;
diff --git a/test/unit/BitmapUtils.t.sol b/test/unit/BitmapUtils.t.sol
@@ -7,7 +7,7 @@ import "../harnesses/BitmapUtilsWrapper.sol";
 import "forge-std/Test.sol";
 
 contract BitmapUtilsUnitTests is Test {
-    Vm cheats = Vm(HEVM_ADDRESS);
+    Vm cheats = Vm(VM_ADDRESS);
 
     BitmapUtilsWrapper public bitmapUtilsWrapper;
 
diff --git a/test/utils/MockAVSDeployer.sol b/test/utils/MockAVSDeployer.sol
@@ -44,7 +44,7 @@ import "forge-std/Test.sol";
 contract MockAVSDeployer is Test {
     using BN254 for BN254.G1Point;
 
-    Vm cheats = Vm(HEVM_ADDRESS);
+    Vm cheats = Vm(VM_ADDRESS);
 
     ProxyAdmin public proxyAdmin;
     PauserRegistry public pauserRegistry;
