Updated tests

This commit is contained in:
The3D 2021-02-26 19:18:38 +01:00
parent 77fab5d3bb
commit 682a7d13fe
4 changed files with 32 additions and 7 deletions

View File

@ -411,7 +411,8 @@ export const deployDelegationAwareAToken = async (
incentivesController, incentivesController,
'18', '18',
name, name,
symbol symbol,
'0x10'
); );
return instance; return instance;
@ -504,7 +505,7 @@ export const authorizeWETHGateway = async (
.authorizeLendingPool(lendingPool); .authorizeLendingPool(lendingPool);
export const deployMockStableDebtToken = async ( export const deployMockStableDebtToken = async (
args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string], args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string, string],
verify?: boolean verify?: boolean
) => { ) => {
const instance = await withSaveAndVerify( const instance = await withSaveAndVerify(
@ -514,7 +515,7 @@ export const deployMockStableDebtToken = async (
verify verify
); );
await instance.initialize(args[0], args[1], args[2], '18', args[3], args[4]); await instance.initialize(args[0], args[1], args[2], '18', args[3], args[4], args[5]);
return instance; return instance;
}; };
@ -528,7 +529,7 @@ export const deployWETHMocked = async (verify?: boolean) =>
); );
export const deployMockVariableDebtToken = async ( export const deployMockVariableDebtToken = async (
args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string], args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string, string],
verify?: boolean verify?: boolean
) => { ) => {
const instance = await withSaveAndVerify( const instance = await withSaveAndVerify(
@ -538,13 +539,13 @@ export const deployMockVariableDebtToken = async (
verify verify
); );
await instance.initialize(args[0], args[1], args[2], '18', args[3], args[4]); await instance.initialize(args[0], args[1], args[2], '18', args[3], args[4], args[5]);
return instance; return instance;
}; };
export const deployMockAToken = async ( export const deployMockAToken = async (
args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string], args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string, string],
verify?: boolean verify?: boolean
) => { ) => {
const instance = await withSaveAndVerify( const instance = await withSaveAndVerify(
@ -554,7 +555,7 @@ export const deployMockAToken = async (
verify verify
); );
await instance.initialize(args[0], args[2], args[1], args[3], '18', args[4], args[5]); await instance.initialize(args[0], args[2], args[1], args[3], '18', args[4], args[5], args[6]);
return instance; return instance;
}; };

View File

@ -85,6 +85,7 @@ export const initReservesByHelper = async (
variableDebtTokenSymbol: string; variableDebtTokenSymbol: string;
stableDebtTokenName: string; stableDebtTokenName: string;
stableDebtTokenSymbol: string; stableDebtTokenSymbol: string;
params: string;
}[] = []; }[] = [];
let strategyRates: [ let strategyRates: [
@ -208,6 +209,7 @@ export const initReservesByHelper = async (
variableDebtTokenSymbol: `variableDebt${symbolPrefix}${reserveSymbols[i]}`, variableDebtTokenSymbol: `variableDebt${symbolPrefix}${reserveSymbols[i]}`,
stableDebtTokenName: `${stableDebtTokenNamePrefix} ${reserveSymbols[i]}`, stableDebtTokenName: `${stableDebtTokenNamePrefix} ${reserveSymbols[i]}`,
stableDebtTokenSymbol: `stableDebt${symbolPrefix}${reserveSymbols[i]}`, stableDebtTokenSymbol: `stableDebt${symbolPrefix}${reserveSymbols[i]}`,
params: '0x10'
}); });
} }
@ -416,6 +418,7 @@ export const initTokenReservesByHelper = async (
variableDebtTokenSymbol: string; variableDebtTokenSymbol: string;
stableDebtTokenName: string; stableDebtTokenName: string;
stableDebtTokenSymbol: string; stableDebtTokenSymbol: string;
params: string;
}[] = []; }[] = [];
const network = const network =
@ -554,6 +557,7 @@ export const initTokenReservesByHelper = async (
variableDebtTokenSymbol: `variableDebt${reserveSymbols[i]}`, variableDebtTokenSymbol: `variableDebt${reserveSymbols[i]}`,
stableDebtTokenName: `Aave stable debt bearing ${reserveSymbols[i]}`, stableDebtTokenName: `Aave stable debt bearing ${reserveSymbols[i]}`,
stableDebtTokenSymbol: `stableDebt${reserveSymbols[i]}`, stableDebtTokenSymbol: `stableDebt${reserveSymbols[i]}`,
params: '0x10'
}); });
} }

View File

@ -34,6 +34,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
ZERO_ADDRESS, ZERO_ADDRESS,
'Aave Interest bearing DAI updated', 'Aave Interest bearing DAI updated',
'aDAI', 'aDAI',
'0x10'
]); ]);
const stableDebtTokenInstance = await deployMockStableDebtToken([ const stableDebtTokenInstance = await deployMockStableDebtToken([
@ -42,6 +43,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
ZERO_ADDRESS, ZERO_ADDRESS,
'Aave stable debt bearing DAI updated', 'Aave stable debt bearing DAI updated',
'stableDebtDAI', 'stableDebtDAI',
'0x10'
]); ]);
const variableDebtTokenInstance = await deployMockVariableDebtToken([ const variableDebtTokenInstance = await deployMockVariableDebtToken([
@ -50,6 +52,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
ZERO_ADDRESS, ZERO_ADDRESS,
'Aave variable debt bearing DAI updated', 'Aave variable debt bearing DAI updated',
'variableDebtDAI', 'variableDebtDAI',
'0x10'
]); ]);
newATokenAddress = aTokenInstance.address; newATokenAddress = aTokenInstance.address;
@ -70,6 +73,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: string; name: string;
symbol: string; symbol: string;
implementation: string; implementation: string;
params: string
} = { } = {
asset: dai.address, asset: dai.address,
treasury: ZERO_ADDRESS, treasury: ZERO_ADDRESS,
@ -77,6 +81,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: name, name: name,
symbol: symbol, symbol: symbol,
implementation: newATokenAddress, implementation: newATokenAddress,
params: "0x10"
}; };
await expect( await expect(
configurator.connect(users[1].signer).updateAToken(updateATokenInputParams) configurator.connect(users[1].signer).updateAToken(updateATokenInputParams)
@ -96,6 +101,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: string; name: string;
symbol: string; symbol: string;
implementation: string; implementation: string;
params: string
} = { } = {
asset: dai.address, asset: dai.address,
treasury: ZERO_ADDRESS, treasury: ZERO_ADDRESS,
@ -103,6 +109,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: name, name: name,
symbol: symbol, symbol: symbol,
implementation: newATokenAddress, implementation: newATokenAddress,
params: "0x10"
}; };
await configurator.updateAToken(updateATokenInputParams); await configurator.updateAToken(updateATokenInputParams);
@ -124,12 +131,14 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: string; name: string;
symbol: string; symbol: string;
implementation: string; implementation: string;
params: string;
} = { } = {
asset: dai.address, asset: dai.address,
incentivesController: ZERO_ADDRESS, incentivesController: ZERO_ADDRESS,
name: name, name: name,
symbol: symbol, symbol: symbol,
implementation: newStableTokenAddress, implementation: newStableTokenAddress,
params: '0x10'
} }
await expect( await expect(
@ -152,12 +161,14 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: string; name: string;
symbol: string; symbol: string;
implementation: string; implementation: string;
params: string;
} = { } = {
asset: dai.address, asset: dai.address,
incentivesController: ZERO_ADDRESS, incentivesController: ZERO_ADDRESS,
name: name, name: name,
symbol: symbol, symbol: symbol,
implementation: newStableTokenAddress, implementation: newStableTokenAddress,
params: '0x10'
} }
await configurator.updateStableDebtToken(updateDebtTokenInput); await configurator.updateStableDebtToken(updateDebtTokenInput);
@ -183,12 +194,14 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: string; name: string;
symbol: string; symbol: string;
implementation: string; implementation: string;
params: string;
} = { } = {
asset: dai.address, asset: dai.address,
incentivesController: ZERO_ADDRESS, incentivesController: ZERO_ADDRESS,
name: name, name: name,
symbol: symbol, symbol: symbol,
implementation: newVariableTokenAddress, implementation: newVariableTokenAddress,
params: '0x10'
} }
await expect( await expect(
@ -210,12 +223,14 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: string; name: string;
symbol: string; symbol: string;
implementation: string; implementation: string;
params: string;
} = { } = {
asset: dai.address, asset: dai.address,
incentivesController: ZERO_ADDRESS, incentivesController: ZERO_ADDRESS,
name: name, name: name,
symbol: symbol, symbol: symbol,
implementation: newVariableTokenAddress, implementation: newVariableTokenAddress,
params: '0x10'
} }
//const name = await (await getAToken(newATokenAddress)).name(); //const name = await (await getAToken(newATokenAddress)).name();

View File

@ -34,6 +34,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
ZERO_ADDRESS, ZERO_ADDRESS,
'Aave AMM Market DAI updated', 'Aave AMM Market DAI updated',
'aAmmDAI', 'aAmmDAI',
'0x10'
]); ]);
const stableDebtTokenInstance = await deployMockStableDebtToken([ const stableDebtTokenInstance = await deployMockStableDebtToken([
@ -42,6 +43,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
ZERO_ADDRESS, ZERO_ADDRESS,
'Aave AMM Market stable debt DAI updated', 'Aave AMM Market stable debt DAI updated',
'stableDebtAmmDAI', 'stableDebtAmmDAI',
'0x10'
]); ]);
const variableDebtTokenInstance = await deployMockVariableDebtToken([ const variableDebtTokenInstance = await deployMockVariableDebtToken([
@ -50,6 +52,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
ZERO_ADDRESS, ZERO_ADDRESS,
'Aave AMM Market variable debt DAI updated', 'Aave AMM Market variable debt DAI updated',
'variableDebtAmmDAI', 'variableDebtAmmDAI',
'0x10'
]); ]);
newATokenAddress = aTokenInstance.address; newATokenAddress = aTokenInstance.address;
@ -70,6 +73,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: string; name: string;
symbol: string; symbol: string;
implementation: string; implementation: string;
params: string;
} = { } = {
asset: dai.address, asset: dai.address,
treasury: ZERO_ADDRESS, treasury: ZERO_ADDRESS,
@ -77,6 +81,7 @@ makeSuite('Upgradeability', (testEnv: TestEnv) => {
name: name, name: name,
symbol: symbol, symbol: symbol,
implementation: newATokenAddress, implementation: newATokenAddress,
params: '0x10'
}; };
await expect( await expect(
configurator.connect(users[1].signer).updateAToken(updateATokenInputParams) configurator.connect(users[1].signer).updateAToken(updateATokenInputParams)