feat(apps): Remove exports from app modules and remove old helper cla… (

#2055)

src/apps/aave-amm/aave-amm.module.ts

@@ -20,6 +20,5 @@ import { EthereumAaveAmmVariableDebtTokenFetcher } from './ethereum/aave-amm.var
     EthereumAaveAmmSupplyTokenFetcher,
     EthereumAaveAmmVariableDebtTokenFetcher,
   ],
-  exports: [AaveAmmAppDefinition, AaveAmmContractFactory],
 })
 export class AaveAmmAppModule extends AbstractApp() {}

src/apps/aave-amm/ethereum/aave-amm.stable-debt.token-fetcher.ts

@@ -3,7 +3,7 @@ import {
   AaveV2LendingTokenDataProps,
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-} from '~apps/aave-v2/helpers/aave-v2.lending.template.token-fetcher';
+} from '~apps/aave-v2/common/aave-v2.lending.token-fetcher';
 import { GetDisplayPropsParams } from '~position/template/app-token.template.types';
 
 import { AaveAmmAToken } from '../contracts';

src/apps/aave-amm/ethereum/aave-amm.supply.token-fetcher.ts

@@ -3,7 +3,7 @@ import {
   AaveV2LendingTokenDataProps,
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-} from '~apps/aave-v2/helpers/aave-v2.lending.template.token-fetcher';
+} from '~apps/aave-v2/common/aave-v2.lending.token-fetcher';
 import { GetDisplayPropsParams } from '~position/template/app-token.template.types';
 
 import { AaveAmmAToken } from '../contracts';

src/apps/aave-amm/ethereum/aave-amm.variable-debt.token-fetcher.ts

@@ -3,7 +3,7 @@ import {
   AaveV2LendingTokenDataProps,
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-} from '~apps/aave-v2/helpers/aave-v2.lending.template.token-fetcher';
+} from '~apps/aave-v2/common/aave-v2.lending.token-fetcher';
 import { GetDisplayPropsParams } from '~position/template/app-token.template.types';
 
 import { AaveAmmAToken } from '../contracts';

src/apps/aave-amm/helpers/aave-amm.lending.template.token-fetcher.ts

@@ -6,7 +6,7 @@ import {
   AaveV2LendingTokenDataProps,
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-} from '~apps/aave-v2/helpers/aave-v2.lending.template.token-fetcher';
+} from '~apps/aave-v2/common/aave-v2.lending.token-fetcher';
 import { AppTokenTemplatePositionFetcher } from '~position/template/app-token.template.position-fetcher';
 import {
   GetDataPropsParams,

src/apps/aave-v2/aave-v2.module.ts

@@ -14,8 +14,6 @@ import { EthereumAaveV2PositionPresenter } from './ethereum/aave-v2.position-pre
 import { EthereumAaveV2StableDebtTokenFetcher } from './ethereum/aave-v2.stable-debt.token-fetcher';
 import { EthereumAaveV2SupplyTokenFetcher } from './ethereum/aave-v2.supply.token-fetcher';
 import { EthereumAaveV2VariableDebtTokenFetcher } from './ethereum/aave-v2.variable-debt.token-fetcher';
-import { AaveV2ClaimableBalanceHelper } from './helpers/aave-v2.claimable.balance-helper';
-import { AaveV2ClaimableContractPositionHelper } from './helpers/aave-v2.claimable.contract-position-helper';
 import { PolygonAaveV2ClaimableContractPositionFetcher } from './polygon/aave-v2.claimable.contract-position-fetcher';
 import { PolygonAaveV2PositionPresenter } from './polygon/aave-v2.position-presenter';
 import { PolygonAaveV2StableDebtTokenFetcher } from './polygon/aave-v2.stable-debt.token-fetcher';
@@ -25,8 +23,6 @@ import { PolygonAaveV2VariableDebtTokenFetcher } from './polygon/aave-v2.variabl
 @Module({
   providers: [
     AaveV2AppDefinition,
-    AaveV2ClaimableBalanceHelper,
-    AaveV2ClaimableContractPositionHelper,
     AaveV2ContractFactory,
     AvalancheAaveV2ClaimableContractPositionFetcher,
     AvalancheAaveV2PositionPresenter,
@@ -44,6 +40,5 @@ import { PolygonAaveV2VariableDebtTokenFetcher } from './polygon/aave-v2.variabl
     PolygonAaveV2SupplyTokenFetcher,
     PolygonAaveV2VariableDebtTokenFetcher,
   ],
-  exports: [AaveV2ClaimableBalanceHelper, AaveV2ClaimableContractPositionHelper, AaveV2ContractFactory],
 })
 export class AaveV2AppModule extends AbstractApp() {}

src/apps/aave-v2/avalanche/aave-v2.claimable.contract-position-fetcher.ts

@@ -1,9 +1,9 @@
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 
-import { AaveV2ClaimableTemplatePositionFetcher } from '../helpers/aave-v2.claimable.template.contract-position-fetcher';
+import { AaveV2ClaimablePositionFetcher } from '../common/aave-v2.claimable.contract-position-fetcher';
 
 @PositionTemplate()
-export class AvalancheAaveV2ClaimableContractPositionFetcher extends AaveV2ClaimableTemplatePositionFetcher {
+export class AvalancheAaveV2ClaimableContractPositionFetcher extends AaveV2ClaimablePositionFetcher {
   groupLabel = 'Rewards';
   isExcludedFromExplore = true;
   isExcludedFromTvl = true;

src/apps/aave-v2/avalanche/aave-v2.stable-debt.token-fetcher.ts

@@ -1,16 +1,16 @@
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 import { GetDisplayPropsParams } from '~position/template/app-token.template.types';
 
-import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 import {
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-  AaveV2LendingTemplateTokenFetcher,
+  AaveV2LendingTokenFetcher,
   AaveV2LendingTokenDataProps,
-} from '../helpers/aave-v2.lending.template.token-fetcher';
+} from '../common/aave-v2.lending.token-fetcher';
+import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 
 @PositionTemplate()
-export class AvalancheAaveV2StableDebtTokenFetcher extends AaveV2LendingTemplateTokenFetcher {
+export class AvalancheAaveV2StableDebtTokenFetcher extends AaveV2LendingTokenFetcher {
   groupLabel = 'Lending';
   providerAddress = '0x65285e9dfab318f57051ab2b139cccf232945451';
   isDebt = true;

src/apps/aave-v2/avalanche/aave-v2.supply.token-fetcher.ts

@@ -1,16 +1,15 @@
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 import { GetDisplayPropsParams } from '~position/template/app-token.template.types';
 
-import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 import {
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-  AaveV2LendingTemplateTokenFetcher,
+  AaveV2LendingTokenFetcher,
   AaveV2LendingTokenDataProps,
-} from '../helpers/aave-v2.lending.template.token-fetcher';
-
+} from '../common/aave-v2.lending.token-fetcher';
+import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 @PositionTemplate()
-export class AvalancheAaveV2SupplyTokenFetcher extends AaveV2LendingTemplateTokenFetcher {
+export class AvalancheAaveV2SupplyTokenFetcher extends AaveV2LendingTokenFetcher {
   groupLabel = 'Lending';
   providerAddress = '0x65285e9dfab318f57051ab2b139cccf232945451';
   isDebt = false;

src/apps/aave-v2/avalanche/aave-v2.variable-debt.token-fetcher.ts

@@ -1,16 +1,16 @@
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 import { GetDisplayPropsParams } from '~position/template/app-token.template.types';
 
-import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 import {
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-  AaveV2LendingTemplateTokenFetcher,
+  AaveV2LendingTokenFetcher,
   AaveV2LendingTokenDataProps,
-} from '../helpers/aave-v2.lending.template.token-fetcher';
+} from '../common/aave-v2.lending.token-fetcher';
+import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 
 @PositionTemplate()
-export class AvalancheAaveV2VariableDebtTokenFetcher extends AaveV2LendingTemplateTokenFetcher {
+export class AvalancheAaveV2VariableDebtTokenFetcher extends AaveV2LendingTokenFetcher {
   groupLabel = 'Lending';
   providerAddress = '0x65285e9dfab318f57051ab2b139cccf232945451';
   isDebt = true;

src/apps/aave-v2/helpers/aave-v2.claimable.template.contract-position-fetcher.ts → src/apps/aave-v2/common/aave-v2.claimable.contract-position-fetcher.ts

@@ -15,7 +15,7 @@ export type AaveV2ClaimableDataProps = {
   protocolDataProviderAddress: string;
 };
 
-export abstract class AaveV2ClaimableTemplatePositionFetcher extends ContractPositionTemplatePositionFetcher<
+export abstract class AaveV2ClaimablePositionFetcher extends ContractPositionTemplatePositionFetcher<
   AaveStakedTokenIncentivesController,
   AaveV2ClaimableDataProps
 > {

src/apps/aave-v2/helpers/aave-v2.lending.template.token-fetcher.ts → src/apps/aave-v2/common/aave-v2.lending.token-fetcher.ts

@@ -13,7 +13,7 @@ import {
 import { AaveV2ContractFactory } from '../contracts';
 import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 
-export type AaveV2TemplateTokenDataProps = {
+export type AaveV2TokenDataProps = {
   apy: number;
   enabledAsCollateral: boolean;
   liquidity: number;
@@ -43,7 +43,7 @@ export type AaveV2LendingTokenDataProps = DefaultAppTokenDataProps & {
   liquidationThreshold: number;
 };
 
-export abstract class AaveV2LendingTemplateTokenFetcher extends AppTokenTemplatePositionFetcher<
+export abstract class AaveV2LendingTokenFetcher extends AppTokenTemplatePositionFetcher<
   AaveV2AToken,
   AaveV2LendingTokenDataProps
 > {
@@ -91,7 +91,7 @@ export abstract class AaveV2LendingTemplateTokenFetcher extends AppTokenTemplate
   async getReserveConfigDataProps({
     appToken,
     multicall,
-  }: GetDataPropsParams<AaveV2AToken, AaveV2TemplateTokenDataProps>): Promise<AaveV2ReserveConfigurationData> {
+  }: GetDataPropsParams<AaveV2AToken, AaveV2TokenDataProps>): Promise<AaveV2ReserveConfigurationData> {
     const pool = multicall.wrap(
       this.contractFactory.aaveProtocolDataProvider({
         network: this.network,

src/apps/aave-v2/ethereum/aave-v2.claimable.contract-position-fetcher.ts

@@ -1,9 +1,9 @@
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 
-import { AaveV2ClaimableTemplatePositionFetcher } from '../helpers/aave-v2.claimable.template.contract-position-fetcher';
+import { AaveV2ClaimablePositionFetcher } from '../common/aave-v2.claimable.contract-position-fetcher';
 
 @PositionTemplate()
-export class EthereumAaveV2ClaimableContractPositionFetcher extends AaveV2ClaimableTemplatePositionFetcher {
+export class EthereumAaveV2ClaimableContractPositionFetcher extends AaveV2ClaimablePositionFetcher {
   groupLabel = 'Rewards';
   isExcludedFromExplore = true;
   isExcludedFromTvl = true;

src/apps/aave-v2/ethereum/aave-v2.stable-debt.token-fetcher.ts

@@ -1,16 +1,16 @@
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 import { GetDisplayPropsParams } from '~position/template/app-token.template.types';
 
-import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 import {
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-  AaveV2LendingTemplateTokenFetcher,
+  AaveV2LendingTokenFetcher,
   AaveV2LendingTokenDataProps,
-} from '../helpers/aave-v2.lending.template.token-fetcher';
+} from '../common/aave-v2.lending.token-fetcher';
+import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 
 @PositionTemplate()
-export class EthereumAaveV2StableDebtTokenFetcher extends AaveV2LendingTemplateTokenFetcher {
+export class EthereumAaveV2StableDebtTokenFetcher extends AaveV2LendingTokenFetcher {
   groupLabel = 'Lending';
   providerAddress = '0x057835ad21a177dbdd3090bb1cae03eacf78fc6d';
   isDebt = true;

src/apps/aave-v2/ethereum/aave-v2.supply.token-fetcher.ts

@@ -1,16 +1,16 @@
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 import { GetDisplayPropsParams } from '~position/template/app-token.template.types';
 
-import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 import {
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-  AaveV2LendingTemplateTokenFetcher,
+  AaveV2LendingTokenFetcher,
   AaveV2LendingTokenDataProps,
-} from '../helpers/aave-v2.lending.template.token-fetcher';
+} from '../common/aave-v2.lending.token-fetcher';
+import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 
 @PositionTemplate()
-export class EthereumAaveV2SupplyTokenFetcher extends AaveV2LendingTemplateTokenFetcher {
+export class EthereumAaveV2SupplyTokenFetcher extends AaveV2LendingTokenFetcher {
   groupLabel = 'Lending';
   providerAddress = '0x057835ad21a177dbdd3090bb1cae03eacf78fc6d';
   isDebt = false;

src/apps/aave-v2/ethereum/aave-v2.variable-debt.token-fetcher.ts

@@ -1,16 +1,16 @@
 import { PositionTemplate } from '~app-toolkit/decorators/position-template.decorator';
 import { GetDisplayPropsParams } from '~position/template/app-token.template.types';
 
-import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 import {
   AaveV2ReserveApyData,
   AaveV2ReserveTokenAddressesData,
-  AaveV2LendingTemplateTokenFetcher,
+  AaveV2LendingTokenFetcher,
   AaveV2LendingTokenDataProps,
-} from '../helpers/aave-v2.lending.template.token-fetcher';
+} from '../common/aave-v2.lending.token-fetcher';
+import { AaveV2AToken } from '../contracts/ethers/AaveV2AToken';
 
 @PositionTemplate()
-export class EthereumAaveV2VariableDebtTokenFetcher extends AaveV2LendingTemplateTokenFetcher {
+export class EthereumAaveV2VariableDebtTokenFetcher extends AaveV2LendingTokenFetcher {
   groupLabel = 'Lending';
   providerAddress = '0x057835ad21a177dbdd3090bb1cae03eacf78fc6d';
   isDebt = true;