Merge pull request #16 from gnosis/fix/continuous-periods

Remove block where neither executeNext() nor skipExpired() could be c…
gnosisguild · Sep 9, 2021 · b7f89a1 · b7f89a1
2 parents baa4fb4 + 0f5d0dd
commit b7f89a1
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/contracts/Delay.sol b/contracts/Delay.sol
@@ -41,13 +41,8 @@ contract Delay is Modifier {
         uint256 _cooldown,
         uint256 _expiration
     ) {
-        bytes memory initParams = abi.encode(
-            _owner,
-            _avatar,
-            _target,
-            _cooldown,
-            _expiration
-        );
+        bytes memory initParams =
+            abi.encode(_owner, _avatar, _target, _cooldown, _expiration);
         setUp(initParams);
     }
 
@@ -58,7 +53,8 @@ contract Delay is Modifier {
             address _target,
             uint256 _cooldown,
             uint256 _expiration
-        ) = abi.decode(
+        ) =
+            abi.decode(
                 initParams,
                 (address, address, address, uint256, uint256)
             );
@@ -167,7 +163,7 @@ contract Delay is Modifier {
         );
         if (txExpiration != 0) {
             require(
-                txCreatedAt[txNonce] + txCooldown + txExpiration >
+                txCreatedAt[txNonce] + txCooldown + txExpiration >=
                     block.timestamp,
                 "Transaction expired"
             );