Upgrade forge-std + Extend checkModifier + Fix tests for Optimism Mai…

…n after Bedrock
makerdao · Jul 21, 2023 · 3939ae1 · 3939ae1
1 parent 754d7ab
commit 3939ae1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 27 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/DssTest.sol b/src/DssTest.sol
@@ -425,9 +425,9 @@ abstract contract DssTest is Test {
     function checkModifier(address _base, string memory _revertMsg, bytes4[] memory _fsigs) internal {
         for (uint256 i = 0; i < _fsigs.length; i++) {
             bytes4 fsig = _fsigs[i];
-            uint256 p = 0;
+            uint256[] memory p = new uint256[](20);
             // Pad the abi call with 0s to fill all the args (it's okay to supply more than the function requires)
-            assertRevert(_base, abi.encodePacked(fsig, p, p, p, p, p, p), _revertMsg);
+            assertRevert(_base, abi.encodePacked(fsig, p), _revertMsg);
         }
     }
     function checkModifier(address _base, string memory _revertMsg, bytes4[1] memory _fsigs) internal {

diff --git a/src/domains/Domain.sol b/src/domains/Domain.sol
@@ -39,23 +39,23 @@ contract Domain {
         vm.makePersistent(address(this));
     }
 
-    function readConfigString(string memory key) public view returns (string memory) {
+    function readConfigString(string memory key) public returns (string memory) {
         return config.readString(string.concat(".domains.", _details.chainAlias, ".", key));
     }
 
-    function readConfigAddress(string memory key) public view returns (address) {
+    function readConfigAddress(string memory key) public returns (address) {
         return config.readAddress(string.concat(".domains.", _details.chainAlias, ".", key));
     }
 
-    function readConfigUint(string memory key) public view returns (uint256) {
+    function readConfigUint(string memory key) public returns (uint256) {
         return config.readUint(string.concat(".domains.", _details.chainAlias, ".", key));
     }
 
-    function readConfigInt(string memory key) public view returns (int256) {
+    function readConfigInt(string memory key) public returns (int256) {
         return config.readInt(string.concat(".domains.", _details.chainAlias, ".", key));
     }
 
-    function readConfigBytes32(string memory key) public view returns (bytes32) {
+    function readConfigBytes32(string memory key) public returns (bytes32) {
         return config.readBytes32(string.concat(".domains.", _details.chainAlias, ".", key));
     }
 
@@ -67,7 +67,7 @@ contract Domain {
         return out;
     }
 
-    function readConfigBytes32FromString(string memory key) public view returns (bytes32) {
+    function readConfigBytes32FromString(string memory key) public returns (bytes32) {
         return bytesToBytes32(bytes(readConfigString(key)));
     }
 

diff --git a/src/domains/OptimismDomain.sol b/src/domains/OptimismDomain.sol
@@ -27,15 +27,6 @@ interface MessengerLike {
         bytes memory message,
         uint32 gasLimit
     ) external;
-    function relayMessage(
-        address _target,
-        address _sender,
-        bytes memory _message,
-        uint256 _messageNonce
-    ) external;
-}
-
-interface BedrockMessengerLike {
     function relayMessage(
         uint256 _nonce,
         address _sender,
@@ -81,14 +72,8 @@ contract OptimismDomain is BridgedDomain {
             if (log.topics[0] == SENT_MESSAGE_TOPIC && log.emitter == address(l1Messenger)) {
                 address target = address(uint160(uint256(log.topics[1])));
                 (address sender, bytes memory message, uint256 nonce, uint256 gasLimit) = abi.decode(log.data, (address, bytes, uint256, uint256));
-                vm.startPrank(malias);
-                if (isGoerli()) {
-                    // Goerli has been upgraded to bedrock which has a new relay interface
-                    BedrockMessengerLike(address(l2Messenger)).relayMessage(nonce, sender, target, 0, gasLimit, message);
-                } else {
-                    l2Messenger.relayMessage(target, sender, message, nonce);
-                }
-                vm.stopPrank();
+                vm.prank(malias);
+                l2Messenger.relayMessage(nonce, sender, target, 0, gasLimit, message);
             }
         }
 

diff --git a/test.sh b/test.sh
@@ -22,5 +22,5 @@ export FOUNDRY_ROOT_CHAINID
 if [[ -z "$1" ]]; then
     forge test
 else
-    forge test --match "$1" -vvvvv
+    forge test --match-test "$1" -vvvvv
 fi
+48 −6		.github/workflows/ci.yml
+29 −0		.github/workflows/sync.yml
+1 −1		foundry.toml
+1 −1		lib/ds-test
+2 −2		package.json
+5 −3		src/Base.sol
+3 −2		src/Script.sol
+91 −40		src/StdAssertions.sol
+30 −24		src/StdChains.sol
+274 −34		src/StdCheats.sol
+5 −5		src/StdInvariant.sol
+28 −28		src/StdJson.sol
+4 −0		src/StdStorage.sol
+333 −0		src/StdStyle.sol
+83 −8		src/StdUtils.sol
+8 −2		src/Test.sol
+120 −11		src/Vm.sol
+394 −382		src/console2.sol
+73 −0		src/interfaces/IMulticall3.sol
+13,248 −0		src/safeconsole.sol
+176 −0		test/StdAssertions.t.sol
+101 −33		test/StdChains.t.sol
+302 −5		test/StdCheats.t.sol
+17 −2		test/StdMath.t.sol
+10 −0		test/StdStorage.t.sol
+110 −0		test/StdStyle.t.sol
+168 −17		test/StdUtils.t.sol