fix: remove psp leftovers

Author: sakulstra

src/contracts/extensions/paraswap-adapters/AaveParaSwapFeeClaimer.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.0;
 import {ParaSwapLiquiditySwapAdapter, IParaSwapAugustusRegistry} from '../../../contracts/extensions/paraswap-adapters/ParaSwapLiquiditySwapAdapter.sol';
 import {ParaSwapRepayAdapter} from '../../../contracts/extensions/paraswap-adapters/ParaSwapRepayAdapter.sol';
 import {ParaSwapWithdrawSwapAdapter} from '../../../contracts/extensions/paraswap-adapters/ParaSwapWithdrawSwapAdapter.sol';
-import {IFeeClaimer} from '../../../contracts/extensions/paraswap-adapters/interfaces/IFeeClaimer.sol';
 import {IPoolAddressesProvider} from '../../../contracts/interfaces/IPoolAddressesProvider.sol';
 
 contract AaveV3ParaswapProcedure {
@@ -16,13 +15,11 @@ contract AaveV3ParaswapProcedure {
 
   function _deployAaveV3ParaswapAdapters(
     address paraswapAugustusRegistry,
-    address paraswapFeeClaimer,
     address poolAddressesProvider,
     address poolAdmin
   ) internal returns (ParaswapAdapters memory) {
     ParaswapAdapters memory report = _deployParaswapAdapters(
       paraswapAugustusRegistry,
-      paraswapFeeClaimer,
       poolAddressesProvider,
       poolAdmin
     );
@@ -32,13 +29,12 @@ contract AaveV3ParaswapProcedure {
 
   function _deployParaswapAdapters(
     address paraswapAugustusRegistry,
-    address paraswapFeeClaimer,
     address poolAddressesProvider,
     address poolAdmin
   ) internal returns (ParaswapAdapters memory) {
     ParaswapAdapters memory report;
 
-    if (paraswapAugustusRegistry != address(0) && paraswapFeeClaimer != address(0)) {
+    if (paraswapAugustusRegistry != address(0)) {
       report.paraSwapLiquiditySwapAdapter = address(
         new ParaSwapLiquiditySwapAdapter(
           IPoolAddressesProvider(poolAddressesProvider),

src/contracts/extensions/paraswap-adapters/interfaces/IFeeClaimer.sol

@@ -112,7 +112,6 @@ struct MarketConfig {
   string marketId;
   uint8 oracleDecimals;
   address paraswapAugustusRegistry;
-  address paraswapFeeClaimer;
   address l2SequencerUptimeFeed;
   uint256 l2PriceOracleSentinelGracePeriod;
   uint256 providerId;

src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol

@@ -254,7 +254,7 @@ library AaveV3BatchOrchestration {
     MarketConfig memory config,
     address poolAddressesProvider
   ) internal returns (ParaswapReport memory) {
-    if (config.paraswapAugustusRegistry != address(0) && config.paraswapFeeClaimer != address(0)) {
+    if (config.paraswapAugustusRegistry != address(0)) {
       AaveV3ParaswapBatch parawswapBatch = new AaveV3ParaswapBatch(
         roles.poolAdmin,
         config,

src/deployments/contracts/procedures/AaveV3ParaswapProcedure.sol

@@ -10,7 +10,6 @@ contract AaveV3ParaswapBatch is AaveV3ParaswapProcedure {
   constructor(address poolAdmin, MarketConfig memory config, address poolAddressesProvider) {
     ParaswapAdapters memory adaptersReport = _deployAaveV3ParaswapAdapters(
       config.paraswapAugustusRegistry,
-      config.paraswapFeeClaimer,
       poolAddressesProvider,
       poolAdmin
     );

src/deployments/interfaces/IMarketReportTypes.sol

@@ -5,7 +5,6 @@ import 'forge-std/Test.sol';
 import '../../src/deployments/interfaces/IMarketReportTypes.sol';
 
 import {AugustusRegistryMock} from '../mocks/AugustusRegistryMock.sol';
-import {MockParaSwapFeeClaimer} from '../../src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
 import {BatchTestProcedures} from '../utils/BatchTestProcedures.sol';
 import {AaveV3TestListing} from '../mocks/AaveV3TestListing.sol';
 import {ACLManager} from '../../src/contracts/protocol/configuration/ACLManager.sol';
@@ -46,7 +45,6 @@ contract AaveV3BatchDeployment is BatchTestProcedures {
       'Testnet Market',
       8,
       address(new AugustusRegistryMock()),
-      address(new MockParaSwapFeeClaimer()),
       address(0), // l2SequencerUptimeFeed
       0, // l2PriceOracleSentinelGracePeriod
       8080,

src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol

@@ -16,7 +16,6 @@ import {AaveV3HelpersBatchOne} from '../../src/deployments/projects/aave-v3-batc
 import {AaveV3HelpersBatchTwo} from '../../src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchTwo.sol';
 import {WETH9} from '../../src/contracts/dependencies/weth/WETH9.sol';
 import {AugustusRegistryMock} from '../mocks/AugustusRegistryMock.sol';
-import {MockParaSwapFeeClaimer} from '../../src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
 import {BatchTestProcedures} from '../utils/BatchTestProcedures.sol';
 import {AaveV3BatchOrchestration} from '../../src/deployments/projects/aave-v3-batched/AaveV3BatchOrchestration.sol';
 
@@ -60,7 +59,6 @@ contract AaveV3BatchTests is BatchTestProcedures {
       'Testnet Market',
       8,
       address(new AugustusRegistryMock()),
-      address(new MockParaSwapFeeClaimer()),
       address(0), // l2SequencerUptimeFeed
       0, // l2PriceOracleSentinelGracePeriod
       8080,

src/deployments/projects/aave-v3-batched/batches/AaveV3ParaswapBatch.sol

@@ -9,7 +9,6 @@ import {ACLManager} from '../../src/contracts/protocol/configuration/ACLManager.
 import {RewardsController} from '../../src/contracts/rewards/RewardsController.sol';
 import {EmissionManager} from '../../src/contracts/rewards/EmissionManager.sol';
 import {AugustusRegistryMock} from '../mocks/AugustusRegistryMock.sol';
-import {MockParaSwapFeeClaimer} from '../../src/contracts/mocks/swap/MockParaSwapFeeClaimer.sol';
 import {WETH9} from '../../src/contracts/dependencies/weth/WETH9.sol';
 import {BatchTestProcedures} from '../utils/BatchTestProcedures.sol';
 import {IRevenueSplitter} from '../../src/contracts/treasury/IRevenueSplitter.sol';
@@ -40,7 +39,6 @@ contract AaveV3PermissionsTest is BatchTestProcedures {
     roles.poolAdmin = poolAdmin;
 
     config.paraswapAugustusRegistry = address(new AugustusRegistryMock());
-    config.paraswapFeeClaimer = address(new MockParaSwapFeeClaimer());
     config.wrappedNativeToken = address(new WETH9());
 
     MarketReport memory report = deployAaveV3Testnet(
@@ -187,7 +185,6 @@ contract AaveV3PermissionsTest is BatchTestProcedures {
     roles.poolAdmin = poolAdmin;
 
     config.paraswapAugustusRegistry = address(new AugustusRegistryMock());
-    config.paraswapFeeClaimer = address(new MockParaSwapFeeClaimer());
     config.wrappedNativeToken = address(new WETH9());
     config.treasuryPartner = treasuryPartner;
     config.treasurySplitPercent = 5000;