test: update tests to pass

defientco · Aug 6, 2023 · 826e927 · 826e927
1 parent 627a251
commit 826e927
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/test/hooks/OwnerOfHook.t.sol b/test/hooks/OwnerOfHook.t.sol
@@ -44,10 +44,10 @@ contract OwnerOfHookTest is DSTest {
 
         test_setOwnerOfHook();
         erc721Mock.mint(DEFAULT_BUYER_ADDRESS, tokenId);
-
         assertEq(DEFAULT_BUYER_ADDRESS, erc721Mock.ownerOf(tokenId));
 
         hookMock.setHooksEnabled(true);
+        hookMock.setRevertOwnerOfOverrideHook(true);
         vm.expectRevert(OwnerOfHookMock.OwnerOfHook_Executed.selector);
         erc721Mock.ownerOf(tokenId);
     }

diff --git a/test/utils/hooks/OwnerOfHookMock.sol b/test/utils/hooks/OwnerOfHookMock.sol
@@ -7,9 +7,14 @@ contract OwnerOfHookMock is IOwnerOfHook {
     /// @notice hook was executed
     error OwnerOfHook_Executed();
 
+    bool public revertOwnerOfOverrideHook;
     bool public hooksEnabled;
     address public fixedOwner;
 
+    function setRevertOwnerOfOverrideHook(bool _enabled) public {
+        revertOwnerOfOverrideHook = _enabled;
+    }
+
     /// @notice toggle ownerOf hook.
     function setHooksEnabled(bool _enabled) public {
         hooksEnabled = _enabled;
@@ -31,7 +36,8 @@ contract OwnerOfHookMock is IOwnerOfHook {
     /// @notice custom implementation for ownerOf Hook.
     function ownerOfOverrideHook(
         uint256
-    ) external view override returns (address) {
-        revert OwnerOfHook_Executed();
+    ) external view override returns (address, bool) {
+        if (revertOwnerOfOverrideHook) revert OwnerOfHook_Executed();
+        return (address(0), true); // run super
     }
 }