From a693e0b767d7c69257dabed341de64f673db52f7 Mon Sep 17 00:00:00 2001
From: David Racero <canillas.mail@gmail.com>
Date: Fri, 18 Jun 2021 10:29:57 +0200
Subject: [PATCH] wip: tests changes due new curve treasury

---
 tasks/deployments/deploy-CurveTreasury.ts     | 12 +++----
 .../mainnet/atoken-curve-rewards.main.ts      | 33 ++++++++++++++++---
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/tasks/deployments/deploy-CurveTreasury.ts b/tasks/deployments/deploy-CurveTreasury.ts
index df6cc303..89eda48d 100644
--- a/tasks/deployments/deploy-CurveTreasury.ts
+++ b/tasks/deployments/deploy-CurveTreasury.ts
@@ -10,18 +10,14 @@ import { waitForTx } from '../../helpers/misc-utils';
 task(`deploy-curve-treasury`, `Deploys the CurveTreasury contract`)
   .addParam('proxyAdmin')
   .addParam('treasuryAdmin')
-  .addOptionalParam('pool')
+  .addOptionalParam('collector')
   .addFlag('verify', `Verify contract via Etherscan API.`)
-  .setAction(async ({ verify, proxyAdmin, treasuryAdmin, pool }, localBRE) => {
+  .setAction(async ({ verify, proxyAdmin, treasuryAdmin, collector }, localBRE) => {
     await localBRE.run('set-DRE');
 
     const net = localBRE.network.name;
     console.log(`\n- Curve Treasury deployment`);
-    let aaveCollector = ZERO_ADDRESS;
-
-    if (pool) {
-      aaveCollector = loadPoolConfig(pool).ReserveFactorTreasuryAddress[net];
-    }
+    const aaveCollector = collector || ZERO_ADDRESS;
 
     // Deploy implementation
     const implementation = await deployCurveTreasury(
@@ -50,4 +46,6 @@ task(`deploy-curve-treasury`, `Deploys the CurveTreasury contract`)
     console.log(`\tFinished CurveTreasury deployment`);
     console.log(`\tProxy:`, proxy.address);
     console.log(`\tImpl:`, implementation.address);
+
+    return { implementation: implementation.address, proxy: proxy.address };
   });
diff --git a/test-suites/test-aave/mainnet/atoken-curve-rewards.main.ts b/test-suites/test-aave/mainnet/atoken-curve-rewards.main.ts
index 09407bb4..52508175 100644
--- a/test-suites/test-aave/mainnet/atoken-curve-rewards.main.ts
+++ b/test-suites/test-aave/mainnet/atoken-curve-rewards.main.ts
@@ -2,6 +2,7 @@ import { ZERO_ADDRESS } from '../../../helpers/constants';
 import { makeSuite, SignerWithAddress, TestEnv } from '../helpers/make-suite';
 import {
   advanceTimeAndBlock,
+  DRE,
   evmRevert,
   evmSnapshot,
   impersonateAddress,
@@ -46,6 +47,12 @@ const USER_ADDRESS = '0x9c5083dd4838E120Dbeac44C052179692Aa5dAC5';
 const CRV_TOKEN = '0xd533a949740bb3306d119cc777fa900ba034cd52';
 const SNX_TOKEN = '0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f';
 
+const GAUGE_3POOL: GaugeInfo = {
+  address: '0xbFcF63294aD7105dEa65aA58F8AE5BE2D9d0952A',
+  name: 'aToken 3pool Gauge Deposit',
+  rewardTokens: [],
+};
+
 const GAUGE_AAVE3: GaugeInfo = {
   address: '0xd662908ADA2Ea1916B3318327A97eB18aD588b5d',
   name: 'aToken a3CRV Gauge Deposit',
@@ -70,7 +77,7 @@ const GAUGE_ANKR: GaugeInfo = {
   ],
 };
 
-const listGauge = async (gauge: GaugeInfo) => {
+const listCurveLPToken = async (gauge: GaugeInfo, curveTreasury: tEthereumAddress) => {
   const { symbol } = gauge;
   const poolConfig = loadPoolConfig(ConfigNames.Aave);
   const {
@@ -86,8 +93,12 @@ const listGauge = async (gauge: GaugeInfo) => {
     poolConfig.ReserveFactorTreasuryAddress,
     eEthereumNetwork.main
   );
+
   const aTokenImpl = (
-    await new CurveGaugeRewardsAwareATokenFactory(await getFirstSigner()).deploy(CRV_TOKEN)
+    await new CurveGaugeRewardsAwareATokenFactory(await getFirstSigner()).deploy(
+      CRV_TOKEN,
+      curveTreasury
+    )
   ).address;
   const stableDebtTokenImpl = await getContractAddressWithJsonFallback(
     eContractid.StableDebtToken,
@@ -240,10 +251,22 @@ makeSuite('Curve Rewards Aware aToken', (testEnv: TestEnv) => {
     expect(gaugeAave3Balance).to.be.gt('0');
     expect(gaugeAnkrBalance).to.be.gt('0');
 
+    // Deploy Curve Treasury
+    const poolConfig = loadPoolConfig(ConfigNames.Aave);
+    const collector = await getParamPerNetwork(
+      poolConfig.ReserveFactorTreasuryAddress,
+      eEthereumNetwork.main
+    );
+
+    const { proxy: curveTreasury } = await DRE.run('deploy-curve-treasury', {
+      proxyAdmin: ZERO_ADDRESS,
+      treasuryAdmin: ZERO_ADDRESS,
+      collector,
+    });
     // Gauge tokens should be listed at Aave test deployment
-    await listGauge(GAUGE_EURS);
-    await listGauge(GAUGE_AAVE3);
-    await listGauge(GAUGE_ANKR);
+    await listCurveLPToken(GAUGE_EURS, curveTreasury);
+    await listCurveLPToken(GAUGE_AAVE3, curveTreasury);
+    await listCurveLPToken(GAUGE_ANKR, curveTreasury);
 
     const allTokens = await testEnv.helpersContract.getAllATokens();