Migrate functionality from setProtocolFeeController to testPoolManage…

…rFeeControllerSet (#354) * finish porting functionality from setProtocolFeeController * specify emitting contract in expect statement
Uniswap · Sep 11, 2023 · bc94eb0 · bc94eb0
1 parent e112589
commit bc94eb0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/test/PoolManager.spec.ts b/test/PoolManager.spec.ts
@@ -107,17 +107,6 @@ describe('PoolManager', () => {
     expect(((await waffle.provider.getCode(manager.address)).length - 2) / 2).to.matchSnapshot()
   })
 
-  describe('#setProtocolFeeController', () => {
-    it('allows the owner to set a fee controller', async () => {
-      expect(await manager.protocolFeeController()).to.be.eq(ADDRESS_ZERO)
-      await expect(manager.setProtocolFeeController(feeControllerTest.address)).to.emit(
-        manager,
-        'ProtocolFeeControllerUpdated'
-      )
-      expect(await manager.protocolFeeController()).to.be.eq(feeControllerTest.address)
-    })
-  })
-
   describe('#take', () => {
     it('fails if no liquidity', async () => {
       await tokens.currency0.connect(wallet).transfer(ADDRESS_ZERO, constants.MaxUint256.div(2))

diff --git a/test/foundry-tests/PoolManager.t.sol b/test/foundry-tests/PoolManager.t.sol
@@ -38,6 +38,7 @@ contract PoolManagerTest is Test, Deployers, TokenFixture, GasSnapshot, IERC1155
     using CurrencyLibrary for Currency;
 
     event LockAcquired();
+    event ProtocolFeeControllerUpdated(address protocolFeeController);
     event Initialize(
         PoolId indexed poolId,
         Currency indexed currency0,
@@ -340,6 +341,8 @@ contract PoolManagerTest is Test, Deployers, TokenFixture, GasSnapshot, IERC1155
 
     function testPoolManagerFeeControllerSet() public {
         assertEq(address(manager.protocolFeeController()), address(0));
+        vm.expectEmit(false, false, false, true, address(manager));
+        emit ProtocolFeeControllerUpdated(address(protocolFeeController));
         manager.setProtocolFeeController(protocolFeeController);
         assertEq(address(manager.protocolFeeController()), address(protocolFeeController));
     }