Merge pull request #118 from aave/fix/117-rewards-distributor-constru…

…ctor Fix/117 Remove constructor of RewardsDistributor and RewardsController
aave · Nov 18, 2022 · 133d29e · 133d29e
2 parents d8d853f + 1c01600
commit 133d29e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.20.2](https://github.com/aave/aave-v3-periphery/compare/v1.20.1...v1.20.2) (2022-11-17)
+
+
+### Miscellaneous Chores
+
+* release 1.20.2 ([28ec2ad](https://github.com/aave/aave-v3-periphery/commit/28ec2adb46d0230265192b3dc86e64c62cea935f))
+
 ## [1.20.1](https://github.com/aave/aave-v3-periphery/compare/v1.20.0...v1.20.1) (2022-11-09)
 
 

diff --git a/contracts/rewards/RewardsController.sol b/contracts/rewards/RewardsController.sol
@@ -41,8 +41,6 @@ contract RewardsController is RewardsDistributor, VersionedInitializable, IRewar
     _;
   }
 
-  constructor(address emissionManager) RewardsDistributor(emissionManager) {}
-
   /**
    * @dev Initialize for RewardsController
    * @param emissionManager address of the EmissionManager

diff --git a/contracts/rewards/RewardsDistributor.sol b/contracts/rewards/RewardsDistributor.sol
@@ -34,10 +34,6 @@ abstract contract RewardsDistributor is IRewardsDistributor {
     _;
   }
 
-  constructor(address emissionManager) {
-    _setEmissionManager(emissionManager);
-  }
-
   /// @inheritdoc IRewardsDistributor
   function getRewardsData(address asset, address reward)
     public

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aave/periphery-v3",
-  "version": "1.20.0-beta.1",
+  "version": "1.20.2",
   "description": "Aave Protocol V3 periphery smart contracts",
   "files": [
     "contracts",
@@ -32,7 +32,7 @@
   },
   "license": "AGPLv3",
   "devDependencies": {
-    "@aave/deploy-v3": "1.27.0-beta.9",
+    "@aave/deploy-v3": "1.30.0-beta-rewards.1",
     "@ethersproject/abi": "^5.1.0",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.2",
     "@nomiclabs/hardhat-ethers": "^2.1.0",

diff --git a/test/rewards/misc.spec.ts b/test/rewards/misc.spec.ts
@@ -10,8 +10,8 @@ import { makeSuite } from '../helpers/make-suite';
 import { RANDOM_ADDRESSES } from '../helpers/constants';
 import hre from 'hardhat';
 
-makeSuite('AaveIncentivesController misc tests', (testEnv) => {
-  it('constructor should assign correct params', async () => {
+makeSuite('RewardsController misc tests', (testEnv) => {
+  it('Deployment should pass', async () => {
     const peiEmissionManager = RANDOM_ADDRESSES[1];
     const { deployer } = await hre.getNamedAccounts();
 
@@ -21,14 +21,14 @@ makeSuite('AaveIncentivesController misc tests', (testEnv) => {
     }
     const artifact = await hre.deployments.deploy('RewardsController', {
       from: deployer,
-      args: [peiEmissionManager],
+      args: [],
     });
     const rewardsController = (await hre.ethers.getContractAt(
       artifact.abi,
       artifact.address
     )) as RewardsController;
     await expect((await rewardsController.getEmissionManager()).toString()).to.be.equal(
-      peiEmissionManager
+      ZERO_ADDRESS
     );
   });
-Original file line number
+Diff line change
@@ Expand Up @@
         _;
       }
-      constructor(address emissionManager) RewardsDistributor(emissionManager) {}
       /**
        * @dev Initialize for RewardsController
        * @param emissionManager address of the EmissionManager
@@ Expand Down @@