test: Refactor names of setters functions

aave · Dec 1, 2021 · 0438cc7 · 0438cc7
1 parent 449f42d
commit 0438cc7
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 41 deletions.
diff --git a/test-suites/configurator-edge.spec.ts b/test-suites/configurator-edge.spec.ts
@@ -286,7 +286,7 @@ makeSuite('PoolConfigurator: Edge cases', (testEnv: TestEnv) => {
     expect(await pool.deposit(dai.address, amountDAItoDeposit, userAddress, '0'));
 
     await expect(
-      configurator.activateReserve(dai.address, false),
+      configurator.setReserveActive(dai.address, false),
       PC_RESERVE_LIQUIDITY_NOT_0
     ).to.be.revertedWith(PC_RESERVE_LIQUIDITY_NOT_0);
   });

diff --git a/test-suites/configurator-modifiers.spec.ts b/test-suites/configurator-modifiers.spec.ts
@@ -76,8 +76,8 @@ makeSuite('PoolConfigurator: Modifiers', (testEnv: TestEnv) => {
       { fn: 'updateAToken', args: [randomUpdateAToken] },
       { fn: 'updateStableDebtToken', args: [randomUpdateDebtToken] },
       { fn: 'updateVariableDebtToken', args: [randomUpdateDebtToken] },
-      { fn: 'activateReserve', args: [randomAddress, true] },
-      { fn: 'activateReserve', args: [randomAddress, false] },
+      { fn: 'setReserveActive', args: [randomAddress, true] },
+      { fn: 'setReserveActive', args: [randomAddress, false] },
       { fn: 'updateFlashloanPremiumTotal', args: [randomNumber] },
       { fn: 'updateFlashloanPremiumToProtocol', args: [randomNumber] },
       { fn: 'updateFlashloanPremiumToProtocol', args: [randomNumber] },
@@ -103,10 +103,10 @@ makeSuite('PoolConfigurator: Modifiers', (testEnv: TestEnv) => {
         fn: 'configureReserveAsCollateral',
         args: [randomAddress, randomNumber, randomNumber, randomNumber],
       },
-      { fn: 'enableStableRateBorrowingReserve', args: [randomAddress, true] },
-      { fn: 'enableStableRateBorrowingReserve', args: [randomAddress, false] },
-      { fn: 'freezeReserve', args: [randomAddress, true] },
-      { fn: 'freezeReserve', args: [randomAddress, false] },
+      { fn: 'setReserveStableRateEnabled', args: [randomAddress, true] },
+      { fn: 'setReserveStableRateEnabled', args: [randomAddress, false] },
+      { fn: 'setReseveFreeze', args: [randomAddress, true] },
+      { fn: 'setReseveFreeze', args: [randomAddress, false] },
       { fn: 'setReserveFactor', args: [randomAddress, randomNumber] },
       { fn: 'setBorrowCap', args: [randomAddress, randomNumber] },
       { fn: 'setSupplyCap', args: [randomAddress, randomNumber] },

diff --git a/test-suites/configurator.spec.ts b/test-suites/configurator.spec.ts
@@ -189,14 +189,14 @@ makeSuite('PoolConfigurator', (testEnv: TestEnv) => {
 
   it('Deactivates the ETH reserve', async () => {
     const { configurator, weth, helpersContract } = testEnv;
-    expect(await configurator.activateReserve(weth.address, false));
+    expect(await configurator.setReserveActive(weth.address, false));
     const { isActive } = await helpersContract.getReserveConfigurationData(weth.address);
     expect(isActive).to.be.equal(false);
   });
 
   it('Reactivates the ETH reserve', async () => {
     const { configurator, weth, helpersContract } = testEnv;
-    expect(await configurator.activateReserve(weth.address, true));
+    expect(await configurator.setReserveActive(weth.address, true));
     const { isActive } = await helpersContract.getReserveConfigurationData(weth.address);
     expect(isActive).to.be.equal(true);
   });
@@ -246,7 +246,7 @@ makeSuite('PoolConfigurator', (testEnv: TestEnv) => {
   it('Freezes the ETH reserve by pool Admin', async () => {
     const { configurator, weth, helpersContract } = testEnv;
 
-    expect(await configurator.freezeReserve(weth.address, true))
+    expect(await configurator.setReseveFreeze(weth.address, true))
       .to.emit(configurator, 'ReserveFrozen')
       .withArgs(weth.address);
 
@@ -258,7 +258,7 @@ makeSuite('PoolConfigurator', (testEnv: TestEnv) => {
 
   it('Unfreezes the ETH reserve by Pool admin', async () => {
     const { configurator, helpersContract, weth } = testEnv;
-    expect(await configurator.freezeReserve(weth.address, false))
+    expect(await configurator.setReseveFreeze(weth.address, false))
       .to.emit(configurator, 'ReserveUnfrozen')
       .withArgs(weth.address);
 
@@ -267,7 +267,7 @@ makeSuite('PoolConfigurator', (testEnv: TestEnv) => {
 
   it('Freezes the ETH reserve by Risk Admin', async () => {
     const { configurator, weth, helpersContract, riskAdmin } = testEnv;
-    expect(await configurator.connect(riskAdmin.signer).freezeReserve(weth.address, true))
+    expect(await configurator.connect(riskAdmin.signer).setReseveFreeze(weth.address, true))
       .to.emit(configurator, 'ReserveFrozen')
       .withArgs(weth.address);
 
@@ -279,7 +279,7 @@ makeSuite('PoolConfigurator', (testEnv: TestEnv) => {
 
   it('Unfreezes the ETH reserve by Risk admin', async () => {
     const { configurator, helpersContract, weth, riskAdmin } = testEnv;
-    expect(await configurator.connect(riskAdmin.signer).freezeReserve(weth.address, false))
+    expect(await configurator.connect(riskAdmin.signer).setReseveFreeze(weth.address, false))
       .to.emit(configurator, 'ReserveUnfrozen')
       .withArgs(weth.address);
 
@@ -408,7 +408,7 @@ makeSuite('PoolConfigurator', (testEnv: TestEnv) => {
 
   it('Disable stable borrow rate on the ETH reserve via pool admin', async () => {
     const { configurator, helpersContract, weth } = testEnv;
-    expect(await configurator.enableStableRateBorrowingReserve(weth.address, false))
+    expect(await configurator.setReserveStableRateEnabled(weth.address, false))
       .to.emit(configurator, 'StableRateDisabledOnReserve')
       .withArgs(weth.address);
 
@@ -420,7 +420,7 @@ makeSuite('PoolConfigurator', (testEnv: TestEnv) => {
 
   it('Enables stable borrow rate on the ETH reserve via pool admin', async () => {
     const { configurator, helpersContract, weth } = testEnv;
-    expect(await configurator.enableStableRateBorrowingReserve(weth.address, true))
+    expect(await configurator.setReserveStableRateEnabled(weth.address, true))
       .to.emit(configurator, 'StableRateEnabledOnReserve')
       .withArgs(weth.address);
 
@@ -432,9 +432,7 @@ makeSuite('PoolConfigurator', (testEnv: TestEnv) => {
   it('Disable stable borrow rate on the ETH reserve risk admin', async () => {
     const { configurator, helpersContract, weth, riskAdmin } = testEnv;
     expect(
-      await configurator
-        .connect(riskAdmin.signer)
-        .enableStableRateBorrowingReserve(weth.address, false)
+      await configurator.connect(riskAdmin.signer).setReserveStableRateEnabled(weth.address, false)
     )
       .to.emit(configurator, 'StableRateDisabledOnReserve')
       .withArgs(weth.address);
@@ -448,9 +446,7 @@ makeSuite('PoolConfigurator', (testEnv: TestEnv) => {
   it('Enables stable borrow rate on the ETH reserve risk admin', async () => {
     const { configurator, helpersContract, weth, riskAdmin } = testEnv;
     expect(
-      await configurator
-        .connect(riskAdmin.signer)
-        .enableStableRateBorrowingReserve(weth.address, true)
+      await configurator.connect(riskAdmin.signer).setReserveStableRateEnabled(weth.address, true)
     )
       .to.emit(configurator, 'StableRateEnabledOnReserve')
       .withArgs(weth.address);

diff --git a/test-suites/liquidation-underlying.spec.ts b/test-suites/liquidation-underlying.spec.ts
@@ -34,21 +34,21 @@ makeSuite('Pool Liquidation: Liquidator receiving the underlying asset', (testEn
       users: [, user],
       dai,
     } = testEnv;
-    await configurator.activateReserve(weth.address, false);
+    await configurator.setReserveActive(weth.address, false);
 
     await expect(
       pool.liquidationCall(weth.address, dai.address, user.address, utils.parseEther('1000'), false)
     ).to.be.revertedWith('2');
 
-    await configurator.activateReserve(weth.address, true);
+    await configurator.setReserveActive(weth.address, true);
 
-    await configurator.activateReserve(dai.address, false);
+    await configurator.setReserveActive(dai.address, false);
 
     await expect(
       pool.liquidationCall(weth.address, dai.address, user.address, utils.parseEther('1000'), false)
     ).to.be.revertedWith('2');
 
-    await configurator.activateReserve(dai.address, true);
+    await configurator.setReserveActive(dai.address, true);
   });
 
   it('Deposits WETH, borrows DAI', async () => {

diff --git a/test-suites/pool-edge.spec.ts b/test-suites/pool-edge.spec.ts
@@ -96,7 +96,7 @@ makeSuite('Pool: Edge cases', (testEnv: TestEnv) => {
     const { pool, poolAdmin, dai, users, configurator } = testEnv;
 
     // Deactivate reserve
-    expect(await configurator.connect(poolAdmin.signer).activateReserve(dai.address, false));
+    expect(await configurator.connect(poolAdmin.signer).setReserveActive(dai.address, false));
 
     // MintToTreasury
     expect(await pool.connect(users[0].signer).mintToTreasury([dai.address]));

diff --git a/test-suites/validation-logic.spec.ts b/test-suites/validation-logic.spec.ts
@@ -57,7 +57,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.isActive).to.be.eq(true);
     expect(configBefore.isFrozen).to.be.eq(false);
 
-    await configurator.connect(poolAdmin.signer).activateReserve(dai.address, false);
+    await configurator.connect(poolAdmin.signer).setReserveActive(dai.address, false);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.isActive).to.be.eq(false);
@@ -78,7 +78,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.isActive).to.be.eq(true);
     expect(configBefore.isFrozen).to.be.eq(false);
 
-    await configurator.connect(poolAdmin.signer).freezeReserve(dai.address, true);
+    await configurator.connect(poolAdmin.signer).setReseveFreeze(dai.address, true);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.isActive).to.be.eq(true);
@@ -111,7 +111,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.isActive).to.be.eq(true);
     expect(configBefore.isFrozen).to.be.eq(false);
 
-    await configurator.connect(poolAdmin.signer).activateReserve(dai.address, false);
+    await configurator.connect(poolAdmin.signer).setReserveActive(dai.address, false);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.isActive).to.be.eq(false);
@@ -146,7 +146,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.isActive).to.be.eq(true);
     expect(configBefore.isFrozen).to.be.eq(false);
 
-    await configurator.connect(poolAdmin.signer).freezeReserve(dai.address, true);
+    await configurator.connect(poolAdmin.signer).setReseveFreeze(dai.address, true);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.isActive).to.be.eq(true);
@@ -210,9 +210,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.stableBorrowRateEnabled).to.be.eq(true);
 
     // Disable borrowing
-    await configurator
-      .connect(poolAdmin.signer)
-      .enableStableRateBorrowingReserve(dai.address, false);
+    await configurator.connect(poolAdmin.signer).setReserveStableRateEnabled(dai.address, false);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.stableBorrowRateEnabled).to.be.eq(false);
@@ -389,7 +387,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.isActive).to.be.eq(true);
     expect(configBefore.isFrozen).to.be.eq(false);
 
-    await configurator.connect(poolAdmin.signer).activateReserve(dai.address, false);
+    await configurator.connect(poolAdmin.signer).setReserveActive(dai.address, false);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.isActive).to.be.eq(false);
@@ -587,7 +585,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.isActive).to.be.eq(true);
     expect(configBefore.isFrozen).to.be.eq(false);
 
-    await configurator.connect(poolAdmin.signer).activateReserve(dai.address, false);
+    await configurator.connect(poolAdmin.signer).setReserveActive(dai.address, false);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.isActive).to.be.eq(false);
@@ -613,7 +611,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.isActive).to.be.eq(true);
     expect(configBefore.isFrozen).to.be.eq(false);
 
-    await configurator.connect(poolAdmin.signer).freezeReserve(dai.address, true);
+    await configurator.connect(poolAdmin.signer).setReseveFreeze(dai.address, true);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.isActive).to.be.eq(true);
@@ -655,9 +653,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.stableBorrowRateEnabled).to.be.eq(true);
 
     // Disable borrowing
-    await configurator
-      .connect(poolAdmin.signer)
-      .enableStableRateBorrowingReserve(dai.address, false);
+    await configurator.connect(poolAdmin.signer).setReserveStableRateEnabled(dai.address, false);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.stableBorrowRateEnabled).to.be.eq(false);
@@ -724,7 +720,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.isActive).to.be.eq(true);
     expect(configBefore.isFrozen).to.be.eq(false);
 
-    await configurator.connect(poolAdmin.signer).activateReserve(dai.address, false);
+    await configurator.connect(poolAdmin.signer).setReserveActive(dai.address, false);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.isActive).to.be.eq(false);
@@ -743,7 +739,7 @@ makeSuite('ValidationLogic: Edge cases', (testEnv: TestEnv) => {
     expect(configBefore.isActive).to.be.eq(true);
     expect(configBefore.isFrozen).to.be.eq(false);
 
-    await configurator.connect(poolAdmin.signer).activateReserve(dai.address, false);
+    await configurator.connect(poolAdmin.signer).setReserveActive(dai.address, false);
 
     const configAfter = await helpersContract.getReserveConfigurationData(dai.address);
     expect(configAfter.isActive).to.be.eq(false);