Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 13, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/ds-test
Open in desktop
Submodule ds-test deleted from e28215
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 32 files
+1 −0 .gitattributes
+0 −3 .gitmodules
+1 −1 README.md
+1 −1 foundry.toml
+0 −1 lib/ds-test
+1 −1 package.json
+635 −0 scripts/vm.py
+518 −225 src/StdAssertions.sol
+19 −5 src/StdChains.sol
+2 −2 src/StdCheats.sol
+7 −11 src/StdJson.sol
+201 −106 src/StdStorage.sol
+179 −0 src/StdToml.sol
+61 −33 src/StdUtils.sol
+4 −4 src/Test.sol
+1,357 −462 src/Vm.sol
+234 −0 src/mocks/MockERC20.sol
+235 −0 src/mocks/MockERC721.sol
+39 −909 test/StdAssertions.t.sol
+31 −30 test/StdChains.t.sol
+19 −11 test/StdCheats.t.sol
+3 −1 test/StdError.t.sol
+49 −0 test/StdJson.t.sol
+8 −8 test/StdMath.t.sol
+159 −11 test/StdStorage.t.sol
+49 −0 test/StdToml.t.sol
+20 −20 test/StdUtils.t.sol
+3 −3 test/Vm.t.sol
+8 −0 test/fixtures/test.json
+6 −0 test/fixtures/test.toml
+441 −0 test/mocks/MockERC20.t.sol
+721 −0 test/mocks/MockERC721.t.sol
2 changes: 1 addition & 1 deletion test/ffi/BLSPubKeyCompendiumFFI.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/IntegrationDeployer.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/TimeMachine.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/User.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/unit/BitmapUtils.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion test/utils/MockAVSDeployer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading