T

Vectorized · Aug 31, 2024 · c0417f4 · c0417f4
1 parent 33b3e62
commit c0417f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -1043,15 +1043,15 @@ MinHeapLibTest:test__codesize() (gas: 14576)
 MulticallableTest:testMulticallableBenchmark() (gas: 30291)
 MulticallableTest:testMulticallableOriginalBenchmark() (gas: 38715)
 MulticallableTest:testMulticallablePreservesMsgSender() (gas: 11413)
-MulticallableTest:testMulticallableReturnDataIsProperlyEncoded() (gas: 397027)
-MulticallableTest:testMulticallableReturnDataIsProperlyEncoded(string,string,uint256) (runs: 317, μ: 241178, ~: 43841)
-MulticallableTest:testMulticallableReturnDataIsProperlyEncoded(uint256,uint256,uint256,uint256) (runs: 317, μ: 250280, ~: 393867)
+MulticallableTest:testMulticallableReturnDataIsProperlyEncoded() (gas: 398368)
+MulticallableTest:testMulticallableReturnDataIsProperlyEncoded(string,string,uint256) (runs: 317, μ: 250587, ~: 390621)
+MulticallableTest:testMulticallableReturnDataIsProperlyEncoded(uint256,uint256,uint256,uint256) (runs: 317, μ: 249928, ~: 34427)
 MulticallableTest:testMulticallableRevertWithCustomError() (gas: 11859)
 MulticallableTest:testMulticallableRevertWithMessage() (gas: 13509)
 MulticallableTest:testMulticallableRevertWithMessage(string) (runs: 317, μ: 14121, ~: 13970)
 MulticallableTest:testMulticallableRevertWithNothing() (gas: 11766)
 MulticallableTest:testMulticallableWithNoData() (gas: 6361)
-MulticallableTest:test__codesize() (gas: 9846)
+MulticallableTest:test__codesize() (gas: 9857)
 OwnableRolesTest:testBytecodeSize() (gas: 350635)
 OwnableRolesTest:testGrantAndRemoveRolesDirect(address,uint256,uint256) (runs: 317, μ: 41493, ~: 42162)
 OwnableRolesTest:testGrantAndRevokeOrRenounceRoles(address,bool,bool,bool,uint256,uint256) (runs: 317, μ: 27815, ~: 20899)

diff --git a/test/utils/mocks/MockMulticallable.sol b/test/utils/mocks/MockMulticallable.sol
@@ -64,10 +64,11 @@ contract MockMulticallable is Multicallable, Brutalizer {
         return msg.sender;
     }
 
-    function multicallBrutalized(bytes[] calldata data) public returns (bytes[] memory results) {
+    function multicallBrutalized(bytes[] calldata data) public returns (bytes[] memory) {
         _brutalizeMemory();
-        results = _multicallInner(data);
+        bytes[] memory results = _multicallInner(data);
         _checkMemory();
+        _multicallDirectReturn(results);
     }
 
     function multicallOriginal(bytes[] calldata data)