Commit 0f4b1e33 authored by Delweng's avatar Delweng Committed by GitHub

feat(contracts-bedrock): remove old forge-std code (#12378)

* feat(contracts-bedrock): rm assume on precompile
Signed-off-by: default avatarjsvisa <delweng@gmail.com>

* feat(contracts-bedrock): replace vm.keyExists with vm.keyExistsJson
Signed-off-by: default avatarjsvisa <delweng@gmail.com>

* feat(contracts-bedrock): replace _readOr implement
Signed-off-by: default avatarjsvisa <delweng@gmail.com>

---------
Signed-off-by: default avatarjsvisa <delweng@gmail.com>
parent 0466b62d
......@@ -268,7 +268,7 @@ contract DeployConfig is Script {
}
function _readOr(string memory _jsonInp, string memory _key, bool _defaultValue) internal view returns (bool) {
return vm.keyExistsJson(_jsonInp, _key) ? _jsonInp.readBool(_key) : _defaultValue;
return _jsonInp.readBoolOr(_key, _defaultValue);
}
function _readOr(
......@@ -292,7 +292,7 @@ contract DeployConfig is Script {
view
returns (address)
{
return vm.keyExistsJson(_jsonInp, _key) ? _jsonInp.readAddress(_key) : _defaultValue;
return _jsonInp.readAddressOr(_key, _defaultValue);
}
function _isNull(string memory _jsonInp, string memory _key) internal pure returns (bool) {
......@@ -309,6 +309,6 @@ contract DeployConfig is Script {
view
returns (string memory)
{
return vm.keyExists(_jsonInp, _key) ? _jsonInp.readString(_key) : _defaultValue;
return _jsonInp.readStringOr(_key, _defaultValue);
}
}
......@@ -13,8 +13,6 @@ contract SafeCall_Test is Test {
function assumeNot(address _addr) internal {
vm.assume(_addr.balance == 0);
vm.assume(_addr != address(this));
vm.assume(uint256(uint160(_addr)) > uint256(256)); // TODO temp fix until new forge-std release with modern
// precompiles: https://github.com/foundry-rs/forge-std/pull/594
assumeAddressIsNot(_addr, StdCheatsSafe.AddressType.ForgeAddress, StdCheatsSafe.AddressType.Precompile);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment