test_collectProtocolFees_unlocked_revertsWithProtocolFeeCurrencySynced

src/test/ActionsRouter.sol

@@ -24,7 +24,8 @@ enum Actions {
     ASSERT_RESERVES_EQUALS,
     ASSERT_DELTA_EQUALS,
     ASSERT_NONZERO_DELTA_COUNT_EQUALS,
-    TRANSFER_FROM
+    TRANSFER_FROM,
+    COLLECT_PROTOCOL_FEES
 }
 // TODO: Add other actions as needed.
 // BURN,
@@ -81,6 +82,8 @@ contract ActionsRouter is IUnlockCallback, Test, GasSnapshot {
                 _assertNonzeroDeltaCountEquals(param);
             } else if (action == Actions.TRANSFER_FROM) {
                 _transferFrom(param);
+            } else if (action == Actions.COLLECT_PROTOCOL_FEES) {
+                _collectProtocolFees(param);
             }
         }
         return "";
@@ -160,4 +163,9 @@ contract ActionsRouter is IUnlockCallback, Test, GasSnapshot {
             abi.decode(params, (Currency, address, address, uint256));
         MockERC20(Currency.unwrap(currency)).transferFrom(from, recipient, uint256(amount));
     }
+
+    function _collectProtocolFees(bytes memory params) internal {
+        (address to, Currency currency, uint256 amount) = abi.decode(params, (address, Currency, uint256));
+        manager.collectProtocolFees(to, currency, amount);
+    }
 }

test/PoolManager.t.sol

@@ -31,7 +31,6 @@ import {AmountHelpers} from "./utils/AmountHelpers.sol";
 import {ProtocolFeeLibrary} from "../src/libraries/ProtocolFeeLibrary.sol";
 import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
 import {StateLibrary} from "../src/libraries/StateLibrary.sol";
-import {TransientStateLibrary} from "../src/libraries/TransientStateLibrary.sol";
 import {Actions} from "../src/test/ActionsRouter.sol";
 
 contract PoolManagerTest is Test, Deployers, GasSnapshot {
@@ -40,7 +39,6 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
     using SafeCast for *;
     using ProtocolFeeLibrary for uint24;
     using StateLibrary for IPoolManager;
-    using TransientStateLibrary for IPoolManager;
 
     event UnlockCallback();
     event ProtocolFeeControllerUpdated(address feeController);
@@ -985,13 +983,20 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         manager.burn(address(this), key.currency0.toId(), 1);
     }
 
-    function test_collectProtocolFees_locked_revertsWithProtocolFeeCurrencySynced() public {
-        assertNotEq(Currency.unwrap(key.currency1), address(0));
-        manager.sync(key.currency1);
-        assertEq(Currency.unwrap(key.currency1), Currency.unwrap(manager.getSyncedCurrency()));
-        vm.prank(feeController);
+    function test_collectProtocolFees_unlocked_revertsWithProtocolFeeCurrencySynced() public {
+        manager.setProtocolFeeController(address(actionsRouter));
+
+        Actions[] memory actions = new Actions[](2);
+        bytes[] memory params = new bytes[](2);
+
+        actions[0] = Actions.SYNC;
+        params[0] = abi.encode(key.currency1);
+
+        actions[1] = Actions.COLLECT_PROTOCOL_FEES;
+        params[1] = abi.encode(address(this), key.currency1, 1);
+
         vm.expectRevert(IProtocolFees.ProtocolFeeCurrencySynced.selector);
-        manager.collectProtocolFees(address(this), key.currency1, 1);
+        actionsRouter.executeActions(actions, params);
     }
 
     function test_collectProtocolFees_ERC20_accumulateFees_gas() public {