Remove redundant variables and checking

Author: rustboyar

security/sigmap/tests/dependencies/proposal/ProposalPayloadProofOfReserve.sol

@@ -8,7 +8,7 @@ import {ILendingPoolAddressesProvider} from 'aave-address-book/AaveV2.sol';
 import {IACLManager} from 'aave-address-book/AaveV3.sol';
 import {IProofOfReserveAggregator} from '../interfaces/IProofOfReserveAggregator.sol';
 import {IProofOfReserveExecutor} from '../interfaces/IProofOfReserveExecutor.sol';
-import {ICollectorController} from '../dependencies/ICollectorController.sol';
+import {ICollectorController} from '../ICollectorController.sol';
 import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
 import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
 import {AaveV2Avalanche, AaveV3Avalanche} from 'aave-address-book/AaveAddressBook.sol';

src/contracts/ProofOfReserveExecutorV2.sol

@@ -12,8 +12,6 @@ import {ReserveConfiguration} from '../helpers/ReserveConfiguration.sol';
  * - Disables borrowing of every asset on the market, when any of them is not backed
  */
 contract ProofOfReserveExecutorV2 is ProofOfReserveExecutorBase {
-  // AAVE v2 pool addresses provider
-  ILendingPoolAddressesProvider internal immutable _addressesProvider;
   // AAVE v2 pool
   ILendingPool internal immutable _pool;
   // AAVE v2 pool configurator
@@ -28,12 +26,12 @@ contract ProofOfReserveExecutorV2 is ProofOfReserveExecutorBase {
     address poolAddressesProviderAddress,
     address proofOfReserveAggregatorAddress
   ) ProofOfReserveExecutorBase(proofOfReserveAggregatorAddress) {
-    _addressesProvider = ILendingPoolAddressesProvider(
-      poolAddressesProviderAddress
-    );
-    _pool = ILendingPool(_addressesProvider.getLendingPool());
+    ILendingPoolAddressesProvider addressesProvider = ILendingPoolAddressesProvider(
+        poolAddressesProviderAddress
+      );
+    _pool = ILendingPool(addressesProvider.getLendingPool());
     _configurator = ILendingPoolConfigurator(
-      _addressesProvider.getLendingPoolConfigurator()
+      addressesProvider.getLendingPoolConfigurator()
     );
   }
 
@@ -55,7 +53,7 @@ contract ProofOfReserveExecutorV2 is ProofOfReserveExecutorBase {
       }
     }
 
-    // check if any of the reserves is not backed
+    // check if borrowing is enabled for any of the reserves
     for (uint256 i; i < allAssets.length; ++i) {
       DataTypes.ReserveConfigurationMap memory configuration = _pool
         .getConfiguration(allAssets[i]);

src/contracts/ProofOfReserveExecutorV3.sol

@@ -12,8 +12,6 @@ import {ReserveConfiguration} from '../helpers/ReserveConfiguration.sol';
  * - Sets LTV to 0 for the every asset, which is not backed
  */
 contract ProofOfReserveExecutorV3 is ProofOfReserveExecutorBase {
-  // AAVE v3 pool addresses provider
-  IPoolAddressesProvider internal immutable _addressesProvider;
   // AAVE v3 pool
   IPool internal immutable _pool;
   // AAVE v3 pool configurator
@@ -28,35 +26,31 @@ contract ProofOfReserveExecutorV3 is ProofOfReserveExecutorBase {
     address poolAddressesProviderAddress,
     address proofOfReserveAggregatorAddress
   ) ProofOfReserveExecutorBase(proofOfReserveAggregatorAddress) {
-    _addressesProvider = IPoolAddressesProvider(poolAddressesProviderAddress);
-    _pool = IPool(_addressesProvider.getPool());
-    _configurator = IPoolConfigurator(_addressesProvider.getPoolConfigurator());
+    IPoolAddressesProvider addressesProvider = IPoolAddressesProvider(
+      poolAddressesProviderAddress
+    );
+    _pool = IPool(addressesProvider.getPool());
+    _configurator = IPoolConfigurator(addressesProvider.getPoolConfigurator());
   }
 
   /// @inheritdoc IProofOfReserveExecutor
   function isEmergencyActionPossible() external view override returns (bool) {
-    (
-      bool areReservesBacked,
-      bool[] memory unbackedAssetsFlags
-    ) = _proofOfReserveAggregator.areAllReservesBacked(_assets);
+    (, bool[] memory unbackedAssetsFlags) = _proofOfReserveAggregator
+      .areAllReservesBacked(_assets);
 
-    if (!areReservesBacked) {
-      uint256 assetsLength = _assets.length;
+    uint256 assetsLength = _assets.length;
 
-      for (uint256 i = 0; i < assetsLength; ++i) {
-        if (unbackedAssetsFlags[i]) {
-          address asset = _assets[i];
-
-          DataTypes.ReserveConfigurationMap memory configuration = _pool
-            .getConfiguration(asset);
+    for (uint256 i = 0; i < assetsLength; ++i) {
+      if (unbackedAssetsFlags[i]) {
+        DataTypes.ReserveConfigurationMap memory configuration = _pool
+          .getConfiguration(_assets[i]);
 
-          (uint256 ltv, , ) = ReserveConfiguration.getLtvAndLiquidationParams(
-            configuration
-          );
+        (uint256 ltv, , ) = ReserveConfiguration.getLtvAndLiquidationParams(
+          configuration
+        );
 
-          if (ltv > 0) {
-            return true;
-          }
+        if (ltv > 0) {
+          return true;
         }
       }
     }