From 830920a9c22086a4957ee410a6894c4475231bb7 Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Tue, 20 Jun 2023 10:10:07 +0200
Subject: [PATCH] Apply suggestions from code review

---
 .../governance/extensions/GovernorTimelockControl.sol     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contracts/governance/extensions/GovernorTimelockControl.sol b/contracts/governance/extensions/GovernorTimelockControl.sol
index 3c67d771808..fadbcc70152 100644
--- 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;