resolve test conflicts

Author: jake-nyquist

src/HookBidPool.sol

@@ -337,7 +337,7 @@ contract HookBidPool is EIP712, ReentrancyGuard, AccessControl {
         emit OrderValidityOracleSignerUpdated(_orderValidityOracleSigner);
     }
 
-    function setFeeBips(uint64 _feeBips) external onlyOwner {
+    function setFeeBips(uint64 _feeBips) external onlyRole(FEES_ROLE) {
         require(_feeBips <= 10000, "Fee bips over 10000");
         feeBips = _feeBips;
         emit FeesUpdated(_feeBips);
@@ -351,7 +351,7 @@ contract HookBidPool is EIP712, ReentrancyGuard, AccessControl {
     /// @dev sets a paused / unpaused state for this bid pool
     /// @param _paused should the bid pool be set to paused?
     function setPoolPaused(bool _paused) external onlyRole(PAUSER_ROLE) {
-        require(paused == !_paused, "sMP-must change");
+        require(paused == !_paused, "cannot set to current state");
         paused = _paused;
         emit PauseUpdated(paused);
     }

src/test/HookBidPoolTest.t.sol

@@ -108,7 +108,9 @@ contract BidPoolTest is HookProtocolTest {
     }
 
     function testSetProtocol() public {
+        vm.startPrank(address(admin));
         // deploy a new protocol
+
         HookProtocol protocol2 = new HookProtocol(
             admin,
             admin,
@@ -137,13 +139,14 @@ contract BidPoolTest is HookProtocolTest {
         );
 
         vm.startPrank(bidder);
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert();
         emit ProtocolAddressSet(address(protocol2));
         bidPool.setProtocol(address(protocol2));
     }
 
     function testSetPriceOracleSigner() public {
         address newSigner = address(0x1234);
+        vm.startPrank(admin);
         vm.expectEmit(true, true, true, true);
         emit PriceOracleSignerUpdated(newSigner);
         bidPool.setPriceOracleSigner(newSigner);
@@ -152,7 +155,7 @@ contract BidPoolTest is HookProtocolTest {
     function testSetPriceOracleSignerNotOwner() public {
         address newSigner = address(0x1234);
         vm.startPrank(bidder);
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert();
         emit PriceOracleSignerUpdated(newSigner);
         bidPool.setPriceOracleSigner(newSigner);
     }
@@ -161,19 +164,21 @@ contract BidPoolTest is HookProtocolTest {
         address newSigner = address(0x1234);
         vm.expectEmit(true, true, true, true);
         emit OrderValidityOracleSignerUpdated(newSigner);
+        vm.startPrank(admin);
         bidPool.setOrderValidityOracleSigner(newSigner);
     }
 
     function testSetOrderValidityOracleSignerNotOwner() public {
         address newSigner = address(0x1234);
         vm.startPrank(bidder);
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert();
         emit OrderValidityOracleSignerUpdated(newSigner);
         bidPool.setOrderValidityOracleSigner(newSigner);
     }
 
     function testSetFeeBips() public {
         uint64 newBips = 3737;
+        vm.prank(address(admin));
         vm.expectEmit(true, true, true, true);
         emit FeesUpdated(newBips);
         bidPool.setFeeBips(newBips);
@@ -182,7 +187,7 @@ contract BidPoolTest is HookProtocolTest {
     function testSetFeeBipsNotOwner() public {
         uint64 newBips = 3737;
         vm.startPrank(bidder);
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert();
         emit FeesUpdated(newBips);
         bidPool.setFeeBips(newBips);
     }
@@ -191,47 +196,52 @@ contract BidPoolTest is HookProtocolTest {
         uint64 newBips = 10001;
         vm.expectRevert("Fee bips over 10000");
         emit FeesUpdated(newBips);
+        vm.prank(address(admin));
         bidPool.setFeeBips(newBips);
     }
 
     function testSetFeeRecipient() public {
         address newRecipient = address(0x1234);
         vm.expectEmit(true, true, true, true);
         emit ProtocolFeeRecipientUpdated(newRecipient);
+        vm.prank(address(admin));
         bidPool.setFeeRecipient(newRecipient);
     }
 
     function testSetFeeRecipientNotOwner() public {
         address newRecipient = address(0x1234);
         vm.startPrank(bidder);
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert();
         emit ProtocolFeeRecipientUpdated(newRecipient);
         bidPool.setFeeRecipient(newRecipient);
     }
 
     function testSetProtocolPaused() public {
+        vm.startPrank(address(admin));
         vm.expectEmit(true, true, true, true);
         emit PauseUpdated(true);
         bidPool.setPoolPaused(true);
     }
 
     function testSetProtocolPausedNotOwner() public {
         vm.startPrank(bidder);
-        vm.expectRevert("Ownable: caller is not the owner");
+        vm.expectRevert();
         emit PauseUpdated(true);
         bidPool.setPoolPaused(true);
     }
 
     function testSetProtocolPausedAlreadyPaused() public {
+        vm.startPrank(address(admin));
         vm.expectEmit(true, true, true, true);
         emit PauseUpdated(true);
         bidPool.setPoolPaused(true);
-        vm.expectRevert("sMP-must change");
+        vm.expectRevert("cannot set to current state");
         bidPool.setPoolPaused(true);
     }
 
     function testSetProtocolPausedAlreadyNotPaused() public {
-        vm.expectRevert("sMP-must change");
+        vm.expectRevert("cannot set to current state");
+        vm.prank(address(admin));
         bidPool.setPoolPaused(false);
     }