fix test

cowdao-grants · May 25, 2024 · 3efb119 · 3efb119
1 parent 34afe51
commit 3efb119
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/COWShed.sol b/src/COWShed.sol
@@ -9,7 +9,6 @@ import { LibBitmap } from "solady/utils/LibBitmap.sol";
 
 contract COWShed is ICOWAuthHook, COWShedStorage {
     error InvalidSignature();
-    error NonceAlreadyUsed();
     error OnlyTrustedExecutor();
     error OnlySelf();
     error AlreadyInitialized();

diff --git a/src/COWShedStorage.sol b/src/COWShedStorage.sol
@@ -13,6 +13,8 @@ interface IAdminView {
 contract COWShedStorage {
     using LibBitmap for LibBitmap.Bitmap;
 
+    error NonceAlreadyUsed();
+
     struct State {
         bool initialized;
         address trustedExecutor;
@@ -33,6 +35,7 @@ contract COWShedStorage {
     }
 
     function _useNonce(bytes32 _nonce) internal {
+        if (_isNonceUsed(_nonce)) revert NonceAlreadyUsed();
         _state().nonces.set(uint256(_nonce));
     }
 

diff --git a/test/COWShed.t.sol b/test/COWShed.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.25;
 
-import { COWShed, Call } from "src/COWShed.sol";
+import { COWShedStorage, COWShed, Call } from "src/COWShed.sol";
 import { Test, Vm } from "forge-std/Test.sol";
 import { COWShedFactory, COWShedProxy } from "src/COWShedFactory.sol";
 import { BaseTest } from "./BaseTest.sol";
@@ -121,7 +121,7 @@ contract COWShedTest is BaseTest {
         userProxy.revokeNonce(nonce);
         assertTrue(userProxy.nonces(nonce), "nonce is not used yet");
 
-        vm.expectRevert(COWShed.NonceAlreadyUsed.selector);
+        vm.expectRevert(COWShedStorage.NonceAlreadyUsed.selector);
         userProxy.executeHooks(calls, nonce, _deadline(), signature);
     }