Apply suggestions from code review

OpenZeppelin · Jun 20, 2023 · 830920a · 830920a
1 parent 8e6d187
commit 830920a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/contracts/governance/extensions/GovernorTimelockControl.sol b/contracts/governance/extensions/GovernorTimelockControl.sol
@@ -125,10 +125,10 @@ abstract contract GovernorTimelockControl is IGovernorTimelock, Governor {
         bytes[] memory calldatas,
         bytes32 descriptionHash
     ) internal virtual override {
-        // cleanup for refund
-        delete _timelockIds[proposalId];
         // execute
         _timelock.executeBatch{value: msg.value}(targets, values, calldatas, 0, descriptionHash);
+        // cleanup for refund
+        delete _timelockIds[proposalId];
     }
 
     /**
@@ -148,10 +148,10 @@ abstract contract GovernorTimelockControl is IGovernorTimelock, Governor {
         bytes32 timelockId = _timelockIds[proposalId];
 
         if (timelockId != 0) {
-            // cleanup
-            delete _timelockIds[proposalId];
             // cancel
             _timelock.cancel(timelockId);
+            // cleanup
+            delete _timelockIds[proposalId];
         }
 
         return proposalId;