From 8aa46e9c4f519f1bc990ed96298cb6adb44001ec Mon Sep 17 00:00:00 2001 From: The3D Date: Thu, 19 Nov 2020 19:24:41 +0100 Subject: [PATCH] Fixes tests --- helpers/constants.ts | 1 - test/atoken-transfer.spec.ts | 4 +--- test/configurator.spec.ts | 6 +----- test/liquidation-atoken.spec.ts | 6 +----- test/liquidation-underlying.spec.ts | 4 +--- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/helpers/constants.ts b/helpers/constants.ts index a962d925..ea2ab8bc 100644 --- a/helpers/constants.ts +++ b/helpers/constants.ts @@ -16,7 +16,6 @@ export const MAX_UINT_AMOUNT = export const ONE_YEAR = '31536000'; export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; export const ONE_ADDRESS = '0x0000000000000000000000000000000000000001'; - // ---------------- // PROTOCOL GLOBAL PARAMS // ---------------- diff --git a/test/atoken-transfer.spec.ts b/test/atoken-transfer.spec.ts index db57bd24..bba0da59 100644 --- a/test/atoken-transfer.spec.ts +++ b/test/atoken-transfer.spec.ts @@ -1,4 +1,4 @@ -import {MAX_UINT_AMOUNT, ZERO_ADDRESS} from '../helpers/constants'; +import {APPROVAL_AMOUNT_LENDING_POOL, MAX_UINT_AMOUNT, ZERO_ADDRESS} from '../helpers/constants'; import {convertToCurrencyDecimals} from '../helpers/contracts-helpers'; import {expect} from 'chai'; import {ethers} from 'ethers'; @@ -6,8 +6,6 @@ import {RateMode, ProtocolErrors} from '../helpers/types'; import {makeSuite, TestEnv} from './helpers/make-suite'; import {CommonsConfig} from '../markets/aave/commons'; -const APPROVAL_AMOUNT_LENDING_POOL = - CommonsConfig.ProtocolGlobalParams.ApprovalAmountLendingPoolCore; const AAVE_REFERRAL = CommonsConfig.ProtocolGlobalParams.AaveReferral; makeSuite('AToken: Transfer', (testEnv: TestEnv) => { diff --git a/test/configurator.spec.ts b/test/configurator.spec.ts index 76f9ca39..7d8a64d4 100644 --- a/test/configurator.spec.ts +++ b/test/configurator.spec.ts @@ -1,11 +1,7 @@ import {TestEnv, makeSuite} from './helpers/make-suite'; -import {RAY} from '../helpers/constants'; +import {APPROVAL_AMOUNT_LENDING_POOL, RAY} from '../helpers/constants'; import {convertToCurrencyDecimals} from '../helpers/contracts-helpers'; import {ProtocolErrors} from '../helpers/types'; -import {CommonsConfig} from '../markets/aave/commons'; - -const APPROVAL_AMOUNT_LENDING_POOL = - CommonsConfig.ProtocolGlobalParams.ApprovalAmountLendingPoolCore; const {expect} = require('chai'); diff --git a/test/liquidation-atoken.spec.ts b/test/liquidation-atoken.spec.ts index 32c4a2b2..9593fb52 100644 --- a/test/liquidation-atoken.spec.ts +++ b/test/liquidation-atoken.spec.ts @@ -1,16 +1,12 @@ import BigNumber from 'bignumber.js'; import {DRE} from '../helpers/misc-utils'; -import {oneEther} from '../helpers/constants'; +import {APPROVAL_AMOUNT_LENDING_POOL, oneEther} from '../helpers/constants'; import {convertToCurrencyDecimals} from '../helpers/contracts-helpers'; import {makeSuite} from './helpers/make-suite'; import {ProtocolErrors, RateMode} from '../helpers/types'; import {calcExpectedVariableDebtTokenBalance} from './helpers/utils/calculations'; import {getUserData, getReserveData} from './helpers/utils/helpers'; -import {CommonsConfig} from '../markets/aave/commons'; - -const APPROVAL_AMOUNT_LENDING_POOL = - CommonsConfig.ProtocolGlobalParams.ApprovalAmountLendingPoolCore; const chai = require('chai'); const {expect} = chai; diff --git a/test/liquidation-underlying.spec.ts b/test/liquidation-underlying.spec.ts index 39a68d7f..553a574a 100644 --- a/test/liquidation-underlying.spec.ts +++ b/test/liquidation-underlying.spec.ts @@ -1,7 +1,7 @@ import BigNumber from 'bignumber.js'; import {DRE, increaseTime} from '../helpers/misc-utils'; -import {oneEther} from '../helpers/constants'; +import {APPROVAL_AMOUNT_LENDING_POOL, oneEther} from '../helpers/constants'; import {convertToCurrencyDecimals} from '../helpers/contracts-helpers'; import {makeSuite} from './helpers/make-suite'; import {ProtocolErrors, RateMode} from '../helpers/types'; @@ -9,8 +9,6 @@ import {calcExpectedStableDebtTokenBalance} from './helpers/utils/calculations'; import {getUserData} from './helpers/utils/helpers'; import {CommonsConfig} from '../markets/aave/commons'; -const APPROVAL_AMOUNT_LENDING_POOL = - CommonsConfig.ProtocolGlobalParams.ApprovalAmountLendingPoolCore; import {parseEther} from 'ethers/lib/utils'; const chai = require('chai');