From 64d9a2ed787e07c74115b266821bcb70d486a3f9 Mon Sep 17 00:00:00 2001 From: steven Date: Fri, 12 Apr 2024 14:49:16 -0400 Subject: [PATCH] chore: bump forge-std and remove ds-test dependency --- .gitmodules | 3 --- lib/ds-test | 1 - lib/forge-std | 2 +- test/ffi/BLSPubKeyCompendiumFFI.t.sol | 2 +- test/integration/IntegrationDeployer.t.sol | 2 +- test/integration/TimeMachine.t.sol | 2 +- test/integration/User.t.sol | 2 +- test/unit/BitmapUtils.t.sol | 2 +- test/utils/MockAVSDeployer.sol | 2 +- 9 files changed, 7 insertions(+), 11 deletions(-) delete mode 160000 lib/ds-test diff --git a/.gitmodules b/.gitmodules index 961c5645..43ea590c 100644 --- 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 deleted file mode 160000 index e282159d..00000000 --- a/lib/ds-test +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e282159d5170298eb2455a6c05280ab5a73a4ef0 diff --git a/lib/forge-std b/lib/forge-std index f73c73d2..bb4ceea9 160000 --- 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 index 4034749f..18d49a17 100644 --- 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 index a80bfedb..7bdd9204 100644 --- 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 index 129c9892..b1df82d5 100644 --- 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 index ef6557e5..a94e5f6e 100644 --- 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 index 9de0df75..fd51298d 100644 --- 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 index 631a74b7..a4936c52 100644 --- 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;