fix: cotroller timelock test fix

Gearbox-protocol · May 14, 2023 · 7bedd08 · 7bedd08
1 parent 146b6d0
commit 7bedd08
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/contracts/test/mocks/GeneralMock.sol b/contracts/test/mocks/GeneralMock.sol
@@ -9,4 +9,6 @@ contract GeneralMock {
     fallback() external {
         data = msg.data;
     }
+
+    receive() external payable {}
 }
diff --git a/contracts/test/unit/support/ControllerTimelock.t.sol b/contracts/test/unit/support/ControllerTimelock.t.sol
@@ -684,10 +684,12 @@ contract ControllerTimelockTest is Test, IControllerTimelockEvents, IControllerT
             pool, abi.encodeWithSelector(IPool4626.creditManagerBorrowed.selector, creditManager), abi.encode(0)
         );
 
+        uint40 expirationDate = uint40(block.timestamp + 2 days);
+
         Policy memory policy = Policy({
             enabled: false,
             flags: 1,
-            exactValue: block.timestamp + 5,
+            exactValue: expirationDate,
             minValue: 0,
             maxValue: 0,
             referencePoint: 0,
@@ -702,15 +704,15 @@ contract ControllerTimelockTest is Test, IControllerTimelockEvents, IControllerT
         vm.prank(CONFIGURATOR);
         controllerTimelock.setPolicy(POLICY_CODE, policy);
 
-        uint40 expirationDate = uint40(block.timestamp + 1 days);
-
         // VERIFY THAT THE FUNCTION IS QUEUED AND EXECUTED CORRECTLY
         bytes32 txHash = keccak256(
-            abi.encode(creditConfigurator, "setExpirationDate(uint40)", abi.encode(block.timestamp + 5), expirationDate)
+            abi.encode(
+                creditConfigurator, "setExpirationDate(uint40)", abi.encode(expirationDate), block.timestamp + 1 days
+            )
         );
 
         vm.prank(admin);
-        controllerTimelock.setExpirationDate(creditManager, uint40(block.timestamp + 5));
+        controllerTimelock.setExpirationDate(creditManager, expirationDate);
 
         vm.expectRevert(CallerNotAdminException.selector);
 
@@ -729,20 +731,17 @@ contract ControllerTimelockTest is Test, IControllerTimelockEvents, IControllerT
 
         vm.warp(block.timestamp - 10 days);
 
-        // vm.mockCallRevert(
-        //     creditConfigurator,
-        //     abi.encodeWithSelector(
-        //         ICreditConfigurator.setExpirationDate.selector,
-        //         expirationDate
-        //     ),
-        //     abi.encode("error")
-        // );
+        vm.mockCallRevert(
+            creditConfigurator,
+            abi.encodeWithSelector(ICreditConfigurator.setExpirationDate.selector, expirationDate),
+            abi.encode("error")
+        );
 
-        // vm.expectRevert(TxExecutionRevertedException.selector);
-        // vm.prank(admin);
-        // controllerTimelock.executeTransaction(txHash);
+        vm.expectRevert(TxExecutionRevertedException.selector);
+        vm.prank(admin);
+        controllerTimelock.executeTransaction(txHash);
 
-        // vm.clearMockedCalls();
+        vm.clearMockedCalls();
 
         vm.expectEmit(true, false, false, false);
         emit ExecuteTransaction(txHash);

diff --git a/lib/forge-std b/lib/forge-std
+29 −0		.github/workflows/sync.yml
+1 −1		foundry.toml
+1 −1		lib/ds-test
+2 −2		package.json
+8 −8		src/StdAssertions.sol
+17 −19		src/StdChains.sol
+10 −0		src/StdCheats.sol
+6 −3		src/StdUtils.sol
+82 −11		src/Vm.sol
+58 −13		test/StdAssertions.t.sol
+20 −20		test/StdChains.t.sol
+7 −0		test/StdCheats.t.sol